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

This commit is contained in:
WILLIAM CHENG
2021-10-23 10:16:27 +08:00
48 changed files with 336 additions and 329 deletions

View File

@@ -96,13 +96,13 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.22"
jackson_version = "2.10.5"
jackson_databind_version = "2.10.5.1"
swagger_annotations_version = "1.6.3"
jackson_version = "2.13.0"
jackson_databind_version = "2.13.0"
jackson_databind_nullable_version = "0.2.1"
jakarta_annotation_version = "1.3.5"
jersey_version = "2.27"
junit_version = "4.13.1"
jersey_version = "2.35"
junit_version = "4.13.2"
threetenbp_version = "2.9.10"
}

View File

@@ -302,13 +302,13 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.6.1</swagger-annotations-version>
<jersey-version>2.30.1</jersey-version>
<jackson-version>2.10.5</jackson-version>
<jackson-databind-version>2.10.5.1</jackson-databind-version>
<swagger-annotations-version>1.6.3</swagger-annotations-version>
<jersey-version>2.35</jersey-version>
<jackson-version>2.13.0</jackson-version>
<jackson-databind-version>2.13.0</jackson-databind-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<threetenbp-version>2.9.10</threetenbp-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.1</junit-version>
<junit-version>4.13.2</junit-version>
</properties>
</project>