Skip to content

Commit d09c70e

Browse files
frantumafrantuma
authored
Merge pull request #483 from swagger-api/update-jackson
update jackson
2 parents 4721fba + f68bcc9 commit d09c70e

File tree

25 files changed

+62
-62
lines changed

25 files changed

+62
-62
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@
248248
<properties>
249249
<swagger-codegen-version>3.0.12-SNAPSHOT</swagger-codegen-version>
250250
<swagger-parser-version>2.0.15-SNAPSHOT</swagger-parser-version>
251-
<swagger-core-version>2.0.9</swagger-core-version>
252-
<jackson-version>2.9.9</jackson-version>
251+
<swagger-core-version>2.0.10-SNAPSHOT</swagger-core-version>
252+
<jackson-version>2.9.10</jackson-version>
253253
<scala-version>2.11.1</scala-version>
254254
<felix-version>3.3.0</felix-version>
255255
<commons-io-version>2.4</commons-io-version>

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ public JavaClientCodegen() {
8383
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
8484
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
8585

86-
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87-
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.9");
88-
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.9");
86+
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.10. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.10");
88+
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.10");
8989
supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
9090
supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
9191
supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
92-
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.9.9");
93-
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.9.9");
94-
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.9.9");
95-
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.9.9");
92+
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.9.10");
93+
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.9.10");
94+
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.9.10");
95+
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.9.10");
9696

9797
CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
9898
libraryOption.setEnum(supportedLibraries);

‎src/main/resources/handlebars/Java/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ext {
112112
{{^useOas2}}
113113
swagger_annotations_version = "2.0.0"
114114
{{/useOas2}}
115-
jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
115+
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
116116
jersey_version = "1.19.4"
117117
jodatime_version = "2.9.9"
118118
junit_version = "4.12"

‎src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ext {
106106
{{^useOas2}}
107107
swagger_annotations_version = "2.0.0"
108108
{{/useOas2}}
109-
jackson_version = "2.9.9"
109+
jackson_version = "2.9.10"
110110
{{#threetenbp}}
111111
threepane_version = "2.6.4"
112112
{{/threetenbp}}

‎src/main/resources/handlebars/Java/libraries/feign/build.sbt.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ lazy val root = (project in file(".")).
1919
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
2020
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
2121
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
23-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
24-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile",
22+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
23+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
24+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
2626
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2727
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2828
"junit" % "junit" % "4.12" % "test",

‎src/main/resources/handlebars/Java/libraries/feign/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
{{/useOas2}}
291291
<feign-version>9.4.0</feign-version>
292292
<feign-form-version>2.1.0</feign-form-version>
293-
<jackson-version>2.9.9</jackson-version>
293+
<jackson-version>2.9.10</jackson-version>
294294
{{#threetenbp}}
295295
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
296296
{{/threetenbp}}

‎src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ ext {
111111
{{^useOas2}}
112112
swagger_annotations_version = "2.0.0"
113113
{{/useOas2}}
114-
jackson_version = "2.9.9"
114+
jackson_version = "2.9.10"
115115
jersey_version = "2.25.1"
116116
{{#supportJava6}}
117117
commons_io_version=2.5

‎src/main/resources/handlebars/Java/libraries/jersey2/build.sbt.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ lazy val root = (project in file(".")).
1818
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
1919
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
2020
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
21-
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
23-
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
21+
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
22+
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
23+
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
2424
{{#joda}}
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
2626
{{/joda}}
2727
{{#java8}}
28-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
28+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
2929
{{/java8}}
3030
{{#threetenbp}}
3131
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

‎src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
<commons_io_version>2.5</commons_io_version>
315315
<commons_lang3_version>3.6</commons_lang3_version>
316316
{{/supportJava6}}
317-
<jackson-version>{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
317+
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
318318
<maven-plugin-version>1.0.0</maven-plugin-version>
319319
<junit-version>4.12</junit-version>
320320
</properties>

‎src/main/resources/handlebars/Java/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<commons_io_version>2.5</commons_io_version>
323323
<commons_lang3_version>3.6</commons_lang3_version>
324324
{{/supportJava6}}
325-
<jackson-version>{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
325+
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
326326
<maven-plugin-version>1.0.0</maven-plugin-version>
327327
<junit-version>4.12</junit-version>
328328
</properties>

0 commit comments

Comments
 (0)