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

This commit is contained in:
William Cheng
2022-01-02 15:41:37 +08:00
2007 changed files with 39758 additions and 48375 deletions

View File

@@ -101,7 +101,7 @@ ext {
swagger_annotations_version = "1.6.3"
jackson_version = "2.13.0"
jackson_databind_version = "2.13.0"
jackson_databind_nullable_version = "0.2.1"
jackson_databind_nullable_version = "0.2.2"
jakarta_annotation_version = "1.3.5"
jersey_version = "2.35"
junit_version = "4.13.2"

View File

@@ -20,7 +20,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.0" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.12.5" % "compile",
"org.openapitools" % "jackson-databind-nullable" % "0.2.1" % "compile",
"org.openapitools" % "jackson-databind-nullable" % "0.2.2" % "compile",
"com.brsanthu" % "migbase64" % "2.2",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"junit" % "junit" % "4.13.2" % "test",

View File

@@ -342,7 +342,7 @@
<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>
<jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
<threetenbp-version>2.9.10</threetenbp-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>