Skip to content

Commit

Permalink
Merge pull request #542 from swagger-api/jackson-bump
Browse files Browse the repository at this point in the history 
bump jackson to 2.10.1
  • Loading branch information
@frantuma
frantuma authored Nov 16, 2019
2 parents cb6d034 + b13c3ee commit d690b89
Show file tree
Hide file tree
Showing 29 changed files with 89 additions and 77 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@
<properties>
<swagger-codegen-version>3.0.14-SNAPSHOT</swagger-codegen-version>
<swagger-parser-version>2.0.16-SNAPSHOT</swagger-parser-version>
<swagger-core-version>2.0.10</swagger-core-version>
<jackson-version>2.9.10</jackson-version>
<swagger-core-version>2.0.11-SNAPSHOT</swagger-core-version>
<jackson-version>2.10.1</jackson-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<commons-io-version>2.4</commons-io-version>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ public JavaClientCodegen() {
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));

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'.");
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.10");
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.10");
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.10.1. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.26. JSON processing: Jackson 2.10.1");
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'.");
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.");
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)");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/handlebars/Java/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ ext {
{{^useOas2}}
swagger_annotations_version = "2.0.0"
{{/useOas2}}
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
junit_version = "4.12"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ext {
{{^useOas2}}
swagger_annotations_version = "2.0.0"
{{/useOas2}}
jackson_version = "2.9.10"
jackson_version = "2.10.1"
{{#threetenbp}}
threepane_version = "2.6.4"
{{/threetenbp}}
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/handlebars/Java/libraries/feign/build.sbt.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ lazy val root = (project in file(".")).
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.10.1" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/handlebars/Java/libraries/feign/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
{{/useOas2}}
<feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.9.10</jackson-version>
<jackson-version>2.10.1</jackson-version>
{{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
{{/threetenbp}}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ ext {
{{^useOas2}}
swagger_annotations_version = "2.0.0"
{{/useOas2}}
jackson_version = "2.9.10"
jersey_version = "2.25.1"
jackson_version = "2.10.1"
jersey_version = "2.26"
{{#supportJava6}}
commons_io_version=2.5
commons_lang3_version=3.6
Expand Down
17 changes: 9 additions & 8 deletions src/main/resources/handlebars/Java/libraries/jersey2/build.sbt.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ lazy val root = (project in file(".")).
{{^useOas2}}
"io.swagger.core.v3" % "swagger-annotations" % "2.0.0",
{{/useOas2}}
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
"org.glassfish.jersey.core" % "jersey-client" % "2.29.1",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.29.1",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.29.1",
"org.glassfish.jersey.inject" % "jersey-hk2" % "2.29.1",
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
{{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile",
{{/joda}}
{{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
{{/java8}}
{{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
Expand Down
9 changes: 7 additions & 2 deletions src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey-version}</version>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
Expand Down Expand Up @@ -307,14 +312,14 @@
<swagger-core-version>2.0.0</swagger-core-version>
{{/useOas2}}
{{^supportJava6}}
<jersey-version>2.25.1</jersey-version>
<jersey-version>2.29.1</jersey-version>
{{/supportJava6}}
{{#supportJava6}}
<jersey-version>2.6</jersey-version>
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.6</commons_lang3_version>
{{/supportJava6}}
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/handlebars/Java/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.6</commons_lang3_version>
{{/supportJava6}}
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/handlebars/JavaJaxRS/resteasy/eap/gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ dependencies {
providedCompile 'javax.validation:validation-api:1.1.0.Final'
{{/useBeanValidation}}
{{^java8}}
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10'
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1'
compile 'joda-time:joda-time:2.7'
{{/java8}}
{{#java8}}
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10'
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1'
{{/java8}}
testCompile 'junit:junit:4.12',
'org.hamcrest:hamcrest-core:1.3'
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/handlebars/JavaJaxRS/resteasy/eap/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,30 +195,30 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
</dependency>
{{/java8}}
{{#java8}}
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
</dependency>
{{/java8}}
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -244,7 +244,7 @@
{{^useOas2}}
<swagger-core-version>2.0.0</swagger-core-version>
{{/useOas2}}
<jetty-version>9.2.9.v20150224</jetty-version>
<jetty-version>9.3.27.v20190418</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
<junit-version>4.8.1</junit-version>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/handlebars/JavaJaxRS/resteasy/gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ dependencies {
providedCompile 'javax.validation:validation-api:1.1.0.Final'
{{/useBeanValidation}}
{{^java8}}
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10'
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1'
compile 'joda-time:joda-time:2.7'
{{/java8}}
{{#java8}}
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10'
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1'
{{/java8}}
//TODO: swaggerFeature
{{#useOas2}}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/handlebars/JavaJaxRS/resteasy/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@
{{^useOas2}}
<swagger-core-version>2.0.9</swagger-core-version>
{{/useOas2}}
<jetty-version>9.2.9.v20150224</jetty-version>
<jetty-version>9.3.27.v20190418</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
<junit-version>4.8.1</junit-version>
<servlet-api-version>2.5</servlet-api-version>
{{#java8}}<jackson-version>2.9.10</jackson-version>{{/java8}}
{{#java8}}<jackson-version>2.10.1</jackson-version>{{/java8}}
</properties>
</project>
2 changes: 1 addition & 1 deletion src/main/resources/mustache/Java/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if(hasProperty('target') && target == 'android') {

ext {
swagger_annotations_version = "1.5.17"
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
junit_version = "4.12"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mustache/Java/libraries/feign/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if(hasProperty('target') && target == 'android') {

ext {
swagger_annotations_version = "1.5.9"
jackson_version = "2.9.10"
jackson_version = "2.10.1"
{{#threetenbp}}
threepane_version = "2.6.4"
{{/threetenbp}}
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/mustache/Java/libraries/feign/build.sbt.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.10.1" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mustache/Java/libraries/feign/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
<swagger-core-version>1.5.18</swagger-core-version>
<feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.9.10</jackson-version>
<jackson-version>2.10.1</jackson-version>
{{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
{{/threetenbp}}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/mustache/Java/libraries/google-api-client/api.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class {{classname}} {
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws IOException {
{{#returnType}}HttpResponse response = {{/returnType}}{{operationId}}ForHttpResponse({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
TypeReference typeRef = new TypeReference<{{{returnType}}}>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);{{/returnType}}
return ({{{returnType}}})apiClient.getObjectMapper().readValue(response.getContent(), typeRef);{{/returnType}}
}

/**{{#summary}}
Expand All @@ -77,7 +77,7 @@ public class {{classname}} {
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#bodyParam}}{{^required}}{{{dataType}}} {{paramName}}, {{/required}}{{/bodyParam}}{{#requiredParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#hasRequiredParams}}, {{/hasRequiredParams}}Map<String, Object> params) throws IOException {
{{#returnType}}HttpResponse response = {{/returnType}}{{operationId}}ForHttpResponse({{#bodyParam}}{{^required}}{{paramName}}, {{/required}}{{/bodyParam}}{{#requiredParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#hasRequiredParams}}, {{/hasRequiredParams}}params);{{#returnType}}
TypeReference typeRef = new TypeReference<{{{returnType}}}>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);{{/returnType}}
return ({{{returnType}}})apiClient.getObjectMapper().readValue(response.getContent(), typeRef);{{/returnType}}
}

public HttpResponse {{operationId}}ForHttpResponse({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws IOException {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mustache/Java/libraries/google-api-client/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') {

ext {
swagger_annotations_version = "1.5.17"
jackson_version = "2.9.10"
jackson_version = "2.10.1"
google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1"
jodatime_version = "2.9.9"
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/mustache/Java/libraries/google-api-client/build.sbt.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ lazy val root = (project in file(".")).
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.17",
"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.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"org.glassfish.jersey.core" % "jersey-common" % "2.26",
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
{{#withXml}}
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.10" % "compile",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.10.1" % "compile",
{{/withXml}}
{{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile",
{{/joda}}
{{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
{{/java8}}
{{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.10" % "compile",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/mustache/Java/libraries/google-api-client/pom.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version>
<google-api-client-version>1.23.0</google-api-client-version>
<jersey-common-version>2.25.1</jersey-common-version>
<jackson-version>2.9.10</jackson-version>
<jersey-common-version>2.26</jersey-common-version>
<jackson-version>2.10.1</jackson-version>
{{#joda}}
<jodatime-version>2.9.9</jodatime-version>
{{/joda}}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mustache/Java/libraries/jersey2/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {

ext {
swagger_annotations_version = "1.5.17"
jackson_version = "2.9.10"
jackson_version = "2.10.1"
{{#supportJava6}}
jersey_version = "2.6"
commons_io_version=2.5
Expand Down
Loading

0 comments on commit d690b89

Please sign in to comment.