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

This commit is contained in:
William Cheng
2019-12-20 23:21:21 +08:00
92 changed files with 446 additions and 96 deletions

View File

@@ -97,7 +97,7 @@ ext {
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10"
jackson_databind_version = "2.9.10.1"
jackson_databind_nullable_version = "0.2.0"
jackson_databind_nullable_version = "0.2.1"
jersey_version = "2.27"
junit_version = "4.12"
}

View File

@@ -279,7 +279,7 @@
<jersey-version>2.27</jersey-version>
<jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>