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

2025-12-10 22:22:52 +00:00 · 2019-12-20 23:21:21 +08:00
parent 06d1b99e34 3eaafce569
commit 4fb503bcac
92 changed files with 446 additions and 96 deletions
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -98,7 +98,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"
    jackson_threetenbp_version = "2.9.10"
    feign_version = "9.7.0"
    feign_form_version = "2.1.0"
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -282,7 +282,7 @@
        <feign-version>9.7.0</feign-version>
        <feign-form-version>2.1.0</feign-form-version>
        <jackson-version>2.9.10</jackson-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <jackson-databind-version>2.9.10.1</jackson-databind-version>
        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/feign10x/build.gradle
+++ b/samples/client/petstore/java/feign10x/build.gradle
@@ -98,7 +98,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"
    jackson_threetenbp_version = "2.9.10"
    feign_version = "10.2.3"
    feign_form_version = "2.1.0"
--- a/samples/client/petstore/java/feign10x/pom.xml
+++ b/samples/client/petstore/java/feign10x/pom.xml
@@ -282,7 +282,7 @@
        <feign-version>10.2.3</feign-version>
        <feign-form-version>2.1.0</feign-form-version>
        <jackson-version>2.9.10</jackson-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <jackson-databind-version>2.9.10.1</jackson-databind-version>
        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/google-api-client/build.gradle
+++ b/samples/client/petstore/java/google-api-client/build.gradle
@@ -98,7 +98,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"
    google_api_client_version = "1.23.0"
    jersey_common_version = "2.25.1"
    jodatime_version = "2.9.9"
--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -260,7 +260,7 @@
        <jersey-common-version>2.25.1</jersey-common-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>
        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/jersey1/build.gradle
+++ b/samples/client/petstore/java/jersey1/build.gradle
@@ -114,7 +114,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 = "1.19.4"
    jodatime_version = "2.9.9"
    junit_version = "4.12"
--- a/samples/client/petstore/java/jersey2-java6/pom.xml
+++ b/samples/client/petstore/java/jersey2-java6/pom.xml
@@ -292,7 +292,7 @@
        <commons_lang3_version>3.6</commons_lang3_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>
        <threetenbp-version>2.9.10</threetenbp-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -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"
 }
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -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>
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -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"
    threetenbp_version = "2.9.10"
--- a/samples/client/petstore/java/jersey2/pom.xml
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -285,7 +285,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>
        <threetenbp-version>2.9.10</threetenbp-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/native/pom.xml
+++ b/samples/client/petstore/java/native/pom.xml
@@ -208,7 +208,7 @@
        <maven.compiler.source>11</maven.compiler.source>
        <maven.compiler.target>11</maven.compiler.target>
        <jackson-version>2.9.9</jackson-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <junit-version>4.12</junit-version>
    </properties>
 </project>
--- a/samples/client/petstore/java/resteasy/build.gradle
+++ b/samples/client/petstore/java/resteasy/build.gradle
@@ -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"
    threetenbp_version = "2.9.10"
    resteasy_version = "3.1.3.Final"
    jodatime_version = "2.9.9"
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -245,7 +245,7 @@
        <resteasy-version>3.1.3.Final</resteasy-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>
        <threetenbp-version>2.9.10</threetenbp-version>
        <jodatime-version>2.9.9</jodatime-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -98,7 +98,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"
    spring_web_version = "4.3.9.RELEASE"
    jodatime_version = "2.9.9"
    junit_version = "4.12"
--- a/samples/client/petstore/java/resttemplate-withXml/pom.xml
+++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml
@@ -269,7 +269,7 @@
        <spring-web-version>4.3.9.RELEASE</spring-web-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>
        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -98,7 +98,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"
    spring_web_version = "4.3.9.RELEASE"
    jodatime_version = "2.9.9"
    junit_version = "4.12"
--- a/samples/client/petstore/java/resttemplate/pom.xml
+++ b/samples/client/petstore/java/resttemplate/pom.xml
@@ -261,7 +261,7 @@
        <spring-web-version>4.3.9.RELEASE</spring-web-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>
        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -282,7 +282,7 @@
        <jackson-databind-version>2.9.10.1</jackson-databind-version>
        <jackson-version>2.6.6</jackson-version>
        <play-version>2.4.11</play-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <retrofit-version>2.5.0</retrofit-version>
        <oltu-version>1.0.1</oltu-version>
        <junit-version>4.12</junit-version>
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -287,7 +287,7 @@
        <jackson-databind-version>2.9.10.1</jackson-databind-version>
        <jackson-version>2.9.10</jackson-version>
        <play-version>2.5.15</play-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <retrofit-version>2.5.0</retrofit-version>
        <threetenbp-version>1.4.0</threetenbp-version>
        <oltu-version>1.0.1</oltu-version>
--- a/samples/client/petstore/java/retrofit2-play26/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play26/build.gradle
@@ -99,7 +99,7 @@ ext {
    retrofit_version = "2.3.0"
    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"
    play_version = "2.6.7"
    swagger_annotations_version = "1.5.22"
    junit_version = "4.12"
--- a/samples/client/petstore/java/retrofit2-play26/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -292,7 +292,7 @@
        <jackson-databind-version>2.9.10.1</jackson-databind-version>
        <jackson-version>2.9.10</jackson-version>
        <play-version>2.6.7</play-version>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <retrofit-version>2.5.0</retrofit-version>
        <threetenbp-version>1.4.0</threetenbp-version>
        <oltu-version>1.0.1</oltu-version>
--- a/samples/client/petstore/java/vertx/pom.xml
+++ b/samples/client/petstore/java/vertx/pom.xml
@@ -268,7 +268,7 @@
        <swagger-annotations-version>1.5.22</swagger-annotations-version>
        <jackson-version>2.9.10</jackson-version>
        <jackson-databind>2.9.10.1</jackson-databind>
-        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
        <junit-version>4.12</junit-version>
    </properties>
 </project>
--- a/samples/client/petstore/java/webclient/build.gradle
+++ b/samples/client/petstore/java/webclient/build.gradle
@@ -114,7 +114,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 = "1.19.4"
    jodatime_version = "2.9.9"
    junit_version = "4.12"
--- a/samples/client/petstore/java/webclient/pom.xml
+++ b/samples/client/petstore/java/webclient/pom.xml
@@ -124,7 +124,7 @@
        <spring-web-version>5.0.8.RELEASE</spring-web-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>
        <junit-version>4.12</junit-version>
        <reactor-version>3.1.8.RELEASE</reactor-version>
        <reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>