From 0ce5403999195ad9d893f068581f5e99b1d22e57 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Jun 2022 15:10:08 +0800 Subject: [PATCH 1/4] update jackson databind to newer version --- .../Java/libraries/feign/build.gradle.mustache | 4 ++-- .../Java/libraries/feign/build.sbt.mustache | 6 +++--- .../main/resources/Java/libraries/feign/pom.mustache | 4 ++-- .../google-api-client/build.gradle.mustache | 2 +- .../libraries/google-api-client/build.sbt.mustache | 4 ++-- .../Java/libraries/google-api-client/pom.mustache | 4 ++-- .../libraries/rest-assured/build.gradle.mustache | 4 ++-- .../Java/libraries/rest-assured/build.sbt.mustache | 12 ++++++------ .../Java/libraries/rest-assured/pom.mustache | 2 +- .../Java/libraries/resteasy/build.gradle.mustache | 2 +- .../Java/libraries/resteasy/build.sbt.mustache | 2 +- .../resources/Java/libraries/resteasy/pom.mustache | 2 +- .../libraries/resttemplate/build.gradle.mustache | 2 +- .../Java/libraries/resttemplate/pom.mustache | 2 +- .../Java/libraries/retrofit2/build.gradle.mustache | 2 +- .../Java/libraries/retrofit2/build.sbt.mustache | 2 +- .../resources/Java/libraries/retrofit2/pom.mustache | 2 +- .../Java/libraries/vertx/build.gradle.mustache | 2 +- .../main/resources/Java/libraries/vertx/pom.mustache | 2 +- .../petstore/java/feign-no-nullable/build.gradle | 4 ++-- .../client/petstore/java/feign-no-nullable/build.sbt | 6 +++--- .../client/petstore/java/feign-no-nullable/pom.xml | 4 ++-- samples/client/petstore/java/feign/build.gradle | 4 ++-- samples/client/petstore/java/feign/build.sbt | 6 +++--- samples/client/petstore/java/feign/pom.xml | 4 ++-- .../petstore/java/google-api-client/build.gradle | 2 +- .../client/petstore/java/google-api-client/build.sbt | 4 ++-- .../client/petstore/java/google-api-client/pom.xml | 4 ++-- .../petstore/java/rest-assured-jackson/build.gradle | 4 ++-- .../petstore/java/rest-assured-jackson/build.sbt | 8 ++++---- .../petstore/java/rest-assured-jackson/pom.xml | 2 +- samples/client/petstore/java/resteasy/build.gradle | 2 +- samples/client/petstore/java/resteasy/build.sbt | 2 +- samples/client/petstore/java/resteasy/pom.xml | 2 +- .../petstore/java/resttemplate-withXml/build.gradle | 2 +- .../petstore/java/resttemplate-withXml/pom.xml | 2 +- .../client/petstore/java/resttemplate/build.gradle | 2 +- samples/client/petstore/java/resttemplate/pom.xml | 2 +- .../petstore/java/retrofit2-play26/build.gradle | 2 +- .../client/petstore/java/retrofit2-play26/build.sbt | 2 +- .../client/petstore/java/retrofit2-play26/pom.xml | 2 +- .../petstore/java/vertx-no-nullable/build.gradle | 2 +- .../client/petstore/java/vertx-no-nullable/pom.xml | 2 +- samples/client/petstore/java/vertx/build.gradle | 2 +- samples/client/petstore/java/vertx/pom.xml | 2 +- 45 files changed, 71 insertions(+), 71 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index ffa3852d7f12..6d320edcc9a5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -102,8 +102,8 @@ test { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.3" - jackson_databind_version = "2.10.3" + jackson_version = "2.12.6.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache index 47952761808b..065280d08d80 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache @@ -16,9 +16,9 @@ lazy val root = (project in file(".")). "io.github.openfeign" % "feign-slf4j" % "10.11" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", "io.github.openfeign" % "feign-okhttp" % "10.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index 6ae6e4343208..a7442d1b4592 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -354,11 +354,11 @@ 1.5.24 10.11 3.8.0 - 2.10.3 + 2.12.6.1 {{#openApiNullable}} 0.2.3 {{/openApiNullable}} - 2.10.3 + 2.12.6.1 1.3.5 5.7.0 1.0.0 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 6b5289abd120..629facf25820 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.6.3" jackson_version = "2.12.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache index 8fc95eb5d242..c08c686ca6b6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache @@ -12,9 +12,9 @@ lazy val root = (project in file(".")). "io.swagger" % "swagger-annotations" % "1.5.22", "com.google.api-client" % "google-api-client" % "1.23.0", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", {{#withXml}} "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.10" % "compile", {{/withXml}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index acae3522764f..b83cb5cee5c6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -297,8 +297,8 @@ 1.5.22 1.32.2 2.25.1 - 2.12.1 - 2.10.5.1 + 2.12.6.1 + 2.12.6.1 {{#openApiNullable}} 0.2.3 {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index 9184dbb54d28..2ec99dd9953b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -101,8 +101,8 @@ ext { rest_assured_version = "4.5.1" junit_version = "4.13.2" {{#jackson}} - jackson_version = "2.10.3" - jackson_databind_version = "2.10.3" + jackson_version = "2.12.6.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index f2a483c92050..c812f8b1c1b4 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -14,19 +14,19 @@ lazy val root = (project in file(".")). "io.rest-assured" % "scala-support" % "4.5.1", "com.google.code.findbugs" % "jsr305" % "3.0.2", {{#jackson}} - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1", {{#openApiNullable}} "org.openapitools" % "jackson-databind-nullable" % "0.2.3", {{/openApiNullable}} {{#withXml}} - "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.10.3", + "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.12.6.1", {{/withXml}} {{#joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.12.6.1", {{/joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.12.6.1", {{/jackson}} {{#gson}} "com.google.code.gson" % "gson" % "2.8.9", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index 9c34325ff9c3..0a461906b97c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -338,7 +338,7 @@ 2.10.5 {{/joda}} {{#jackson}} - 2.10.3 + 2.12.6.1 0.2.3 {{/jackson}} 1.3.5 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index 236117f78ebc..1ab85d705566 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.6.3" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index 957990ebf217..97d330b7da05 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -15,7 +15,7 @@ lazy val root = (project in file(".")). "org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index 386ecd15f39c..16507d2f22ca 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -275,7 +275,7 @@ 1.6.3 4.7.6.Final 2.10.5 - 2.10.5.1 + 2.12.6.1 {{#openApiNullable}} 0.2.3 {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 759851a15558..edf70a6237a6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 8eceda2ac213..827af06c9d48 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -303,7 +303,7 @@ 1.5.22 5.3.18 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 {{#joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 7b1c39d85c59..e57138fc96f6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -101,7 +101,7 @@ ext { retrofit_version = "2.3.0" {{#usePlayWS}} jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index 9a977d16a45e..086278551aea 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -20,7 +20,7 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", {{/usePlayWS}} {{#useRxJava2}} "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 94f1306572ba..461acb037e8a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -363,7 +363,7 @@ 1.8.3 1.6.3 {{#usePlayWS}} - 2.12.1 + 2.12.6.1 2.6.7 {{#openApiNullable}} 0.2.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index b563392530d9..8e8a20e422d3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -31,7 +31,7 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.21" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" vertx_version = "3.4.2" junit_version = "4.13.2" {{#openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index 830349d8f7bf..c32d11524048 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -293,7 +293,7 @@ 3.4.2 1.5.22 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 4.13.2 diff --git a/samples/client/petstore/java/feign-no-nullable/build.gradle b/samples/client/petstore/java/feign-no-nullable/build.gradle index b00f511b7fb9..634a6cc1f8eb 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.gradle +++ b/samples/client/petstore/java/feign-no-nullable/build.gradle @@ -102,8 +102,8 @@ test { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.3" - jackson_databind_version = "2.10.3" + jackson_version = "2.12.6.1" + jackson_databind_version = "2.12.6.1" jakarta_annotation_version = "1.3.5" feign_version = "10.11" feign_form_version = "3.8.0" diff --git a/samples/client/petstore/java/feign-no-nullable/build.sbt b/samples/client/petstore/java/feign-no-nullable/build.sbt index e258c3ef068f..2f34b92238d0 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.sbt +++ b/samples/client/petstore/java/feign-no-nullable/build.sbt @@ -16,9 +16,9 @@ lazy val root = (project in file(".")). "io.github.openfeign" % "feign-slf4j" % "10.11" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", "io.github.openfeign" % "feign-okhttp" % "10.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", diff --git a/samples/client/petstore/java/feign-no-nullable/pom.xml b/samples/client/petstore/java/feign-no-nullable/pom.xml index edae353eddcc..1988ff178db3 100644 --- a/samples/client/petstore/java/feign-no-nullable/pom.xml +++ b/samples/client/petstore/java/feign-no-nullable/pom.xml @@ -325,8 +325,8 @@ 1.5.24 10.11 3.8.0 - 2.10.3 - 2.10.3 + 2.12.6.1 + 2.12.6.1 1.3.5 5.7.0 1.0.0 diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index bb47f891b0c0..92180313221f 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -102,8 +102,8 @@ test { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.3" - jackson_databind_version = "2.10.3" + jackson_version = "2.12.6.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" feign_version = "10.11" diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt index c7f4cdfc834b..5cb2a0ada75b 100644 --- a/samples/client/petstore/java/feign/build.sbt +++ b/samples/client/petstore/java/feign/build.sbt @@ -16,9 +16,9 @@ lazy val root = (project in file(".")). "io.github.openfeign" % "feign-slf4j" % "10.11" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", "io.github.openfeign" % "feign-okhttp" % "10.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 5774b9d6aef4..4fc9e1a90f77 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -330,9 +330,9 @@ 1.5.24 10.11 3.8.0 - 2.10.3 + 2.12.6.1 0.2.3 - 2.10.3 + 2.12.6.1 1.3.5 5.7.0 1.0.0 diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index d3036a78644c..7654b26933e8 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.6.3" jackson_version = "2.12.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" google_api_client_version = "1.32.2" diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt index 582cd77e8d41..90d48775fa76 100644 --- a/samples/client/petstore/java/google-api-client/build.sbt +++ b/samples/client/petstore/java/google-api-client/build.sbt @@ -12,9 +12,9 @@ lazy val root = (project in file(".")). "io.swagger" % "swagger-annotations" % "1.5.22", "com.google.api-client" % "google-api-client" % "1.23.0", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.2" % "test", diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml index 18de26c3b489..5b2ee50a5e4c 100644 --- a/samples/client/petstore/java/google-api-client/pom.xml +++ b/samples/client/petstore/java/google-api-client/pom.xml @@ -268,8 +268,8 @@ 1.5.22 1.32.2 2.25.1 - 2.12.1 - 2.10.5.1 + 2.12.6.1 + 2.12.6.1 0.2.3 1.3.5 1.0.0 diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index fa74eacfec6f..3cc0205e1f52 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.gradle +++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle @@ -100,8 +100,8 @@ ext { swagger_annotations_version = "1.6.6" rest_assured_version = "4.5.1" junit_version = "4.13.2" - jackson_version = "2.10.3" - jackson_databind_version = "2.10.3" + jackson_version = "2.12.6.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" okio_version = "1.17.5" diff --git a/samples/client/petstore/java/rest-assured-jackson/build.sbt b/samples/client/petstore/java/rest-assured-jackson/build.sbt index 5d0e1d03eaa8..1b948f5f942e 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.sbt +++ b/samples/client/petstore/java/rest-assured-jackson/build.sbt @@ -13,11 +13,11 @@ lazy val root = (project in file(".")). "io.rest-assured" % "rest-assured" % "4.5.1", "io.rest-assured" % "scala-support" % "4.5.1", "com.google.code.findbugs" % "jsr305" % "3.0.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1", "org.openapitools" % "jackson-databind-nullable" % "0.2.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.12.6.1", "com.squareup.okio" % "okio" % "1.17.5" % "compile", "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml index 35baa60bdb3e..149e772ce5a7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -286,7 +286,7 @@ 4.5.1 2.8.9 1.8.5 - 2.10.3 + 2.12.6.1 0.2.3 1.3.5 2.0.2 diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index 0fec20f57b79..086b59a06034 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.6.3" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" threetenbp_version = "2.9.10" diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index 915c8f011898..69842e1cffef 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -15,7 +15,7 @@ lazy val root = (project in file(".")). "org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index 5de2b772abff..81448545a7fe 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -256,7 +256,7 @@ 1.6.3 4.7.6.Final 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 2.9.10 diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index 9be26d88385c..63ba5cd31628 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" spring_web_version = "5.3.18" diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index 9e84a81c470c..a21b2285ce28 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -282,7 +282,7 @@ 1.5.22 5.3.18 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 1.0.0 diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 3eb7a5291dc2..c26b802d2c05 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" spring_web_version = "5.3.18" diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index da01c14bd5c9..759cb086f967 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -274,7 +274,7 @@ 1.5.22 5.3.18 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 1.0.0 diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index d1b5577ea911..1a986189c933 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -100,7 +100,7 @@ ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" play_version = "2.6.7" diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt index 3f458ba08717..c9c15be52901 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.sbt +++ b/samples/client/petstore/java/retrofit2-play26/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index f22b91a601eb..1882a55cc01a 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -303,7 +303,7 @@ ${java.version} 1.8.3 1.6.3 - 2.12.1 + 2.12.6.1 2.6.7 0.2.3 2.5.0 diff --git a/samples/client/petstore/java/vertx-no-nullable/build.gradle b/samples/client/petstore/java/vertx-no-nullable/build.gradle index f6e37992287e..13bb5dcb7121 100644 --- a/samples/client/petstore/java/vertx-no-nullable/build.gradle +++ b/samples/client/petstore/java/vertx-no-nullable/build.gradle @@ -31,7 +31,7 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.21" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" vertx_version = "3.4.2" junit_version = "4.13.2" jakarta_annotation_version = "1.3.5" diff --git a/samples/client/petstore/java/vertx-no-nullable/pom.xml b/samples/client/petstore/java/vertx-no-nullable/pom.xml index 27b3a16ce545..86cfc8a34726 100644 --- a/samples/client/petstore/java/vertx-no-nullable/pom.xml +++ b/samples/client/petstore/java/vertx-no-nullable/pom.xml @@ -272,7 +272,7 @@ 3.4.2 1.5.22 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 4.13.2 diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index 8d0f35d175ee..74389c8993c7 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -31,7 +31,7 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.21" jackson_version = "2.10.5" - jackson_databind_version = "2.10.5.1" + jackson_databind_version = "2.12.6.1" vertx_version = "3.4.2" junit_version = "4.13.2" jackson_databind_nullable_version = "0.2.3" diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml index 28ee89f3bb18..00c432c9ca11 100644 --- a/samples/client/petstore/java/vertx/pom.xml +++ b/samples/client/petstore/java/vertx/pom.xml @@ -277,7 +277,7 @@ 3.4.2 1.5.22 2.10.5 - 2.10.5.1 + 2.12.6.1 0.2.3 1.3.5 4.13.2 From aeacd4c24811886747b33710cc73facc16c4d048 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Jun 2022 17:30:41 +0800 Subject: [PATCH 2/4] update version --- .../src/main/resources/Java/libraries/feign/pom.mustache | 2 +- .../resources/Java/libraries/google-api-client/pom.mustache | 4 ++-- .../main/resources/Java/libraries/resttemplate/pom.mustache | 2 +- samples/client/petstore/java/feign-no-nullable/pom.xml | 2 +- samples/client/petstore/java/feign/pom.xml | 2 +- samples/client/petstore/java/google-api-client/pom.xml | 4 ++-- samples/client/petstore/java/resttemplate-withXml/pom.xml | 2 +- samples/client/petstore/java/resttemplate/pom.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index a7442d1b4592..2e9e1be46a3c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -354,7 +354,7 @@ 1.5.24 10.11 3.8.0 - 2.12.6.1 + 2.12.5 {{#openApiNullable}} 0.2.3 {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index b83cb5cee5c6..e1d06d235e73 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -243,7 +243,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-version} + ${jackson-databind-version} {{#openApiNullable}} @@ -297,7 +297,7 @@ 1.5.22 1.32.2 2.25.1 - 2.12.6.1 + 2.12.5 2.12.6.1 {{#openApiNullable}} 0.2.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 827af06c9d48..856ff8ded7bc 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -303,7 +303,7 @@ 1.5.22 5.3.18 2.10.5 - 2.12.6.1 + 2.11.4 0.2.3 1.3.5 {{#joda}} diff --git a/samples/client/petstore/java/feign-no-nullable/pom.xml b/samples/client/petstore/java/feign-no-nullable/pom.xml index 1988ff178db3..7c6b5ebaf3ee 100644 --- a/samples/client/petstore/java/feign-no-nullable/pom.xml +++ b/samples/client/petstore/java/feign-no-nullable/pom.xml @@ -325,7 +325,7 @@ 1.5.24 10.11 3.8.0 - 2.12.6.1 + 2.12.5 2.12.6.1 1.3.5 5.7.0 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 4fc9e1a90f77..76ba9f3e0adb 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -330,7 +330,7 @@ 1.5.24 10.11 3.8.0 - 2.12.6.1 + 2.12.5 0.2.3 2.12.6.1 1.3.5 diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml index 5b2ee50a5e4c..46de162441b4 100644 --- a/samples/client/petstore/java/google-api-client/pom.xml +++ b/samples/client/petstore/java/google-api-client/pom.xml @@ -236,7 +236,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-version} + ${jackson-databind-version} org.openapitools @@ -268,7 +268,7 @@ 1.5.22 1.32.2 2.25.1 - 2.12.6.1 + 2.12.5 2.12.6.1 0.2.3 1.3.5 diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index a21b2285ce28..97d4d4a21bbe 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -282,7 +282,7 @@ 1.5.22 5.3.18 2.10.5 - 2.12.6.1 + 2.11.4 0.2.3 1.3.5 1.0.0 diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 759cb086f967..6bad3bcb6a0f 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -274,7 +274,7 @@ 1.5.22 5.3.18 2.10.5 - 2.12.6.1 + 2.11.4 0.2.3 1.3.5 1.0.0 From 5f51b6611e8e5a8413666c006f4ad08c3f1a3404 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Jun 2022 18:16:35 +0800 Subject: [PATCH 3/4] fix retrofit2 --- .../resources/Java/libraries/retrofit2/build.gradle.mustache | 2 +- .../resources/Java/libraries/retrofit2/build.sbt.mustache | 4 ++-- .../src/main/resources/Java/libraries/retrofit2/pom.mustache | 5 +++-- samples/client/petstore/java/retrofit2-play26/build.gradle | 2 +- samples/client/petstore/java/retrofit2-play26/build.sbt | 4 ++-- samples/client/petstore/java/retrofit2-play26/pom.xml | 5 +++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index e57138fc96f6..a9eb683f60ef 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -100,7 +100,7 @@ ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" {{#usePlayWS}} - jackson_version = "2.10.5" + jackson_version = "2.12.1" jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index 086278551aea..f19624661e5f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -18,8 +18,8 @@ lazy val root = (project in file(".")). "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", {{/usePlayWS}} {{#useRxJava2}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 461acb037e8a..ce5a737fd40c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -299,7 +299,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-version} + ${jackson-databind-version} {{#openApiNullable}} @@ -363,7 +363,8 @@ 1.8.3 1.6.3 {{#usePlayWS}} - 2.12.6.1 + 2.12.1 + 2.12.6.1 2.6.7 {{#openApiNullable}} 0.2.3 diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index 1a986189c933..819ffd78037c 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - jackson_version = "2.10.5" + jackson_version = "2.12.1" jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt index c9c15be52901..df9877da4a98 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.sbt +++ b/samples/client/petstore/java/retrofit2-play26/build.sbt @@ -14,8 +14,8 @@ lazy val root = (project in file(".")). "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index 1882a55cc01a..97caa57d218e 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -260,7 +260,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-version} + ${jackson-databind-version} org.openapitools @@ -303,7 +303,8 @@ ${java.version} 1.8.3 1.6.3 - 2.12.6.1 + 2.12.1 + 2.12.6.1 2.6.7 0.2.3 2.5.0 From 5c49533b36b3e77adfbac2318e53055f0dd642d4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Jun 2022 18:40:06 +0800 Subject: [PATCH 4/4] fix rest assured jackson samples --- .../Java/libraries/rest-assured/build.gradle.mustache | 2 +- .../resources/Java/libraries/rest-assured/build.sbt.mustache | 4 ++-- .../main/resources/Java/libraries/rest-assured/pom.mustache | 3 ++- .../client/petstore/java/rest-assured-jackson/build.gradle | 2 +- samples/client/petstore/java/rest-assured-jackson/build.sbt | 4 ++-- samples/client/petstore/java/rest-assured-jackson/pom.xml | 3 ++- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index 2ec99dd9953b..4c9801cfdc49 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -101,7 +101,7 @@ ext { rest_assured_version = "4.5.1" junit_version = "4.13.2" {{#jackson}} - jackson_version = "2.12.6.1" + jackson_version = "2.12.5" jackson_databind_version = "2.12.6.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.3" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index c812f8b1c1b4..47acb40b9c55 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -14,8 +14,8 @@ lazy val root = (project in file(".")). "io.rest-assured" % "scala-support" % "4.5.1", "com.google.code.findbugs" % "jsr305" % "3.0.2", {{#jackson}} - "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.5", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.5", "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1", {{#openApiNullable}} "org.openapitools" % "jackson-databind-nullable" % "0.2.3", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index 0a461906b97c..b1d15a0dc80d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -338,7 +338,8 @@ 2.10.5 {{/joda}} {{#jackson}} - 2.12.6.1 + 2.12.5 + 2.12.6.1 0.2.3 {{/jackson}} 1.3.5 diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index 3cc0205e1f52..acffdfa15a9d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.gradle +++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle @@ -100,7 +100,7 @@ ext { swagger_annotations_version = "1.6.6" rest_assured_version = "4.5.1" junit_version = "4.13.2" - jackson_version = "2.12.6.1" + jackson_version = "2.12.5" jackson_databind_version = "2.12.6.1" jackson_databind_nullable_version = "0.2.3" jakarta_annotation_version = "1.3.5" diff --git a/samples/client/petstore/java/rest-assured-jackson/build.sbt b/samples/client/petstore/java/rest-assured-jackson/build.sbt index 1b948f5f942e..04546d3d932e 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.sbt +++ b/samples/client/petstore/java/rest-assured-jackson/build.sbt @@ -13,8 +13,8 @@ lazy val root = (project in file(".")). "io.rest-assured" % "rest-assured" % "4.5.1", "io.rest-assured" % "scala-support" % "4.5.1", "com.google.code.findbugs" % "jsr305" % "3.0.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.12.5", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.5", "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1", "org.openapitools" % "jackson-databind-nullable" % "0.2.3", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.12.6.1", diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml index 149e772ce5a7..c37159f4e0b5 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -286,7 +286,8 @@ 4.5.1 2.8.9 1.8.5 - 2.12.6.1 + 2.12.5 + 2.12.6.1 0.2.3 1.3.5 2.0.2