Merge remote-tracking branch 'origin/master' into 7.0.x

This commit is contained in:
William Cheng
2023-04-12 17:51:47 +08:00
5414 changed files with 134722 additions and 66020 deletions

View File

@@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') {
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
archiveClassifier = 'sources'
}
artifacts {
@@ -91,17 +91,17 @@ if(hasProperty('target') && target == 'android') {
}
task execute(type:JavaExec) {
main = System.getProperty('mainClass')
mainClass = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}
@@ -112,20 +112,17 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.6.3"
spring_boot_version = "2.6.6"
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.6"
jakarta_annotation_version = "1.3.5"
reactor_version = "3.4.3"
reactor_netty_version = "1.0.4"
jodatime_version = "2.9.9"
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.6"
junit_version = "4.13.2"
}
dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "io.projectreactor:reactor-core:$reactor_version"
implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"

View File

@@ -203,7 +203,6 @@ public class ByteArrayObject {
this.intField = intField;
}
@Override
public boolean equals(Object o) {
if (this == o) {