Skip to content

Commit 455b3b9

Browse files
frantumafrantuma
authored
Merge pull request #10926 from swagger-api/jackson-update
2 parents 067d980 + 7e66f4c commit 455b3b9

File tree

239 files changed

+1759
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+1759
-703
lines changed

‎modules/swagger-codegen-maven-plugin/examples/java-client.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</build>
4444
<dependencies>
4545
<!-- dependencies are needed for the client being generated -->
46-
46+
4747
<dependency>
4848
<groupId>io.swagger</groupId>
4949
<artifactId>swagger-annotations</artifactId>
@@ -52,7 +52,7 @@
5252

5353
<!-- You can find the dependencies for the library configuation you chose by looking in JavaClientCodegen.
5454
Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->
55-
55+
5656
<!-- HTTP client: jersey-client -->
5757
<dependency>
5858
<groupId>org.glassfish.jersey.core</groupId>
@@ -96,7 +96,7 @@
9696
<artifactId>jackson-jaxrs-json-provider</artifactId>
9797
<version>${jackson-version}</version>
9898
</dependency>
99-
99+
100100
<!-- Joda time: if you use it -->
101101
<dependency>
102102
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -107,20 +107,20 @@
107107
<groupId>joda-time</groupId>
108108
<artifactId>joda-time</artifactId>
109109
<version>${jodatime-version}</version>
110-
</dependency>
110+
</dependency>
111111

112112
<!-- Base64 encoding that works in both JVM and Android -->
113113
<dependency>
114114
<groupId>com.brsanthu</groupId>
115115
<artifactId>migbase64</artifactId>
116116
<version>2.2</version>
117-
</dependency>
117+
</dependency>
118118
</dependencies>
119-
119+
120120
<properties>
121121
<swagger-annotations-version>1.5.21</swagger-annotations-version>
122122
<jersey-version>2.29.1</jersey-version>
123-
<jackson-version>2.10.1</jackson-version>
123+
<jackson-version>2.11.4</jackson-version>
124124
<jodatime-version>2.7</jodatime-version>
125125
<maven-plugin-version>1.0.0</maven-plugin-version>
126126
<junit-version>4.13.1</junit-version>

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

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

77-
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'.");
78-
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
79-
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.29.1. JSON processing: Jackson 2.10.1");
77+
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.11.4. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
78+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.11.4");
79+
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.29.1. JSON processing: Jackson 2.11.4");
8080
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'.");
8181
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.");
8282
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)");
83-
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.10.1");
84-
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.10.1");
85-
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.10.1");
86-
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.10.1");
83+
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.11.4");
84+
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.11.4");
85+
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.11.4");
86+
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.11.4");
8787
supportedLibraries.put("rest-assured", "HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8");
8888

8989
CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");

‎modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repositories {
2424

2525
ext {
2626
swagger_annotations_version = "1.5.8"
27-
jackson_version = "2.10.1"
27+
jackson_version = "2.11.4"
2828
}
2929

3030
dependencies {

‎modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if(hasProperty('target') && target == 'android') {
102102
main = System.getProperty('mainClass')
103103
classpath = sourceSets.main.runtimeClasspath
104104
}
105-
105+
106106
task sourcesJar(type: Jar, dependsOn: classes) {
107107
classifier = 'sources'
108108
from sourceSets.main.allSource
@@ -121,7 +121,7 @@ if(hasProperty('target') && target == 'android') {
121121

122122
ext {
123123
swagger_annotations_version = "1.5.24"
124-
jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
124+
jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
125125
jersey_version = "1.19.4"
126126
jodatime_version = "2.10.5"
127127
junit_version = "4.12"

‎modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ if(hasProperty('target') && target == 'android') {
101101

102102
ext {
103103
swagger_annotations_version = "1.5.9"
104-
jackson_version = "2.10.1"
104+
jackson_version = "2.11.4"
105105
{{#threetenbp}}
106106
threepane_version = "2.6.4"
107107
{{/threetenbp}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
1414
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
1515
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.10.1" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.11.4" % "compile",
2121
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

‎modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
<swagger-core-version>1.5.24</swagger-core-version>
298298
<feign-version>9.4.0</feign-version>
299299
<feign-form-version>2.1.0</feign-form-version>
300-
<jackson-version>2.10.1</jackson-version>
300+
<jackson-version>2.11.4</jackson-version>
301301
{{#threetenbp}}
302302
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
303303
{{/threetenbp}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
2323
2424
apply plugin: 'com.android.library'
2525
apply plugin: 'com.github.dcendents.android-maven'
26-
26+
2727
android {
2828
compileSdkVersion 23
2929
buildToolsVersion '23.0.2'
@@ -41,7 +41,7 @@ if(hasProperty('target') && target == 'android') {
4141
targetCompatibility JavaVersion.VERSION_1_7
4242
{{/java8}}
4343
}
44-
44+
4545
// Rename the aar correctly
4646
libraryVariants.all { variant ->
4747
variant.outputs.each { output ->
@@ -57,7 +57,7 @@ if(hasProperty('target') && target == 'android') {
5757
provided 'javax.annotation:jsr250-api:1.0'
5858
}
5959
}
60-
60+
6161
afterEvaluate {
6262
android.libraryVariants.all { variant ->
6363
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -69,12 +69,12 @@ if(hasProperty('target') && target == 'android') {
6969
artifacts.add('archives', task);
7070
}
7171
}
72-
72+
7373
task sourcesJar(type: Jar) {
7474
from android.sourceSets.main.java.srcDirs
7575
classifier = 'sources'
7676
}
77-
77+
7878
artifacts {
7979
archives sourcesJar
8080
}
@@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
9898
pom.artifactId = '{{artifactId}}'
9999
}
100100
}
101-
101+
102102
task execute(type:JavaExec) {
103103
main = System.getProperty('mainClass')
104104
classpath = sourceSets.main.runtimeClasspath
@@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') {
107107

108108
ext {
109109
swagger_annotations_version = "1.5.24"
110-
jackson_version = "2.10.1"
110+
jackson_version = "2.11.4"
111111
google_api_client_version = "1.23.0"
112112
jersey_common_version = "2.29.1"
113113
jodatime_version = "2.10.5"

‎modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ lazy val root = (project in file(".")).
1212
"io.swagger" % "swagger-annotations" % "1.5.17",
1313
"com.google.api-client" % "google-api-client" % "1.23.0",
1414
"org.glassfish.jersey.core" % "jersey-common" % "2.29.1",
15-
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
16-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
15+
"com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile",
1818
{{#withXml}}
19-
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.10.1" % "compile",
19+
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.11.4" % "compile",
2020
{{/withXml}}
2121
{{#joda}}
22-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile",
22+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4" % "compile",
2323
{{/joda}}
2424
{{#java8}}
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4" % "compile",
2626
{{/java8}}
2727
{{#threetenbp}}
2828
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

‎modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
<swagger-annotations-version>1.5.17</swagger-annotations-version>
287287
<google-api-client-version>1.23.0</google-api-client-version>
288288
<jersey-common-version>2.29.1</jersey-common-version>
289-
<jackson-version>2.10.1</jackson-version>
289+
<jackson-version>2.11.4</jackson-version>
290290
{{#joda}}
291291
<jodatime-version>2.10.5</jodatime-version>
292292
{{/joda}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
106106

107107
ext {
108108
swagger_annotations_version = "1.5.24"
109-
jackson_version = "2.10.1"
109+
jackson_version = "2.11.4"
110110
{{#supportJava6}}
111111
jersey_version = "2.6"
112112
commons_io_version=2.5

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ lazy val root = (project in file(".")).
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.29.1"{{/supportJava6}},
1515
{{^supportJava6}}"org.glassfish.jersey.inject" % "jersey-hk2" % "2.29.1",{{/supportJava6}}
1616
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.29.1"{{/supportJava6}},
17-
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
2020
{{#joda}}
21-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile",
21+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4" % "compile",
2222
{{/joda}}
2323
{{#java8}}
24-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
24+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4" % "compile",
2525
{{/java8}}
2626
{{#threetenbp}}
2727
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
<commons_io_version>2.5</commons_io_version>
328328
<commons_lang3_version>3.6</commons_lang3_version>
329329
{{/supportJava6}}
330-
<jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
330+
<jackson-version>{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
331331
<maven-plugin-version>1.0.0</maven-plugin-version>
332332
<junit-version>4.13.1</junit-version>
333333
</properties>

‎modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
<dependency>
241241
<groupId>com.fasterxml.jackson.core</groupId>
242242
<artifactId>jackson-annotations</artifactId>
243-
<version>2.10.1</version>
243+
<version>2.11.4</version>
244244
</dependency>
245245
{{/notNullJacksonAnnotation}}
246246
{{#performBeanValidation}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
106106

107107
ext {
108108
swagger_annotations_version = "1.5.8"
109-
jackson_version = "2.10.1"
109+
jackson_version = "2.11.4"
110110
threetenbp_version = "2.6.4"
111111
jersey_version = "2.22.2"
112112
resteasy_version = "3.1.3.Final"

‎modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ lazy val root = (project in file(".")).
1313
"org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
1515
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
16-
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1",
17-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1",
18-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1",
16+
"com.fasterxml.jackson.core" % "jackson-core" % "2.11.4",
17+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4",
18+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4",
1919
{{#java8}}
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4",
2121
{{/java8}}
2222
{{^java8}}
23-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1",
23+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4",
2424
"joda-time" % "joda-time" % "2.9.4",
2525
"com.brsanthu" % "migbase64" % "2.2",
2626
{{/java8}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
250250
<swagger-core-version>1.5.24</swagger-core-version>
251251
<resteasy-version>3.1.3.Final</resteasy-version>
252-
<jackson-version>2.10.1</jackson-version>
252+
<jackson-version>2.11.4</jackson-version>
253253
<threetenbp-version>2.6.4</threetenbp-version>
254254
{{^java8}}
255255
<jodatime-version>2.10.5</jodatime-version>

‎modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
2323
2424
apply plugin: 'com.android.library'
2525
apply plugin: 'com.github.dcendents.android-maven'
26-
26+
2727
android {
2828
compileSdkVersion 23
2929
buildToolsVersion '23.0.2'
@@ -41,7 +41,7 @@ if(hasProperty('target') && target == 'android') {
4141
targetCompatibility JavaVersion.VERSION_1_7
4242
{{/java8}}
4343
}
44-
44+
4545
// Rename the aar correctly
4646
libraryVariants.all { variant ->
4747
variant.outputs.each { output ->
@@ -57,7 +57,7 @@ if(hasProperty('target') && target == 'android') {
5757
provided 'javax.annotation:jsr250-api:1.0'
5858
}
5959
}
60-
60+
6161
afterEvaluate {
6262
android.libraryVariants.all { variant ->
6363
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -69,12 +69,12 @@ if(hasProperty('target') && target == 'android') {
6969
artifacts.add('archives', task);
7070
}
7171
}
72-
72+
7373
task sourcesJar(type: Jar) {
7474
from android.sourceSets.main.java.srcDirs
7575
classifier = 'sources'
7676
}
77-
77+
7878
artifacts {
7979
archives sourcesJar
8080
}
@@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
9898
pom.artifactId = '{{artifactId}}'
9999
}
100100
}
101-
101+
102102
task execute(type:JavaExec) {
103103
main = System.getProperty('mainClass')
104104
classpath = sourceSets.main.runtimeClasspath
@@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') {
107107

108108
ext {
109109
swagger_annotations_version = "1.5.24"
110-
jackson_version = "2.10.1"
110+
jackson_version = "2.11.4"
111111
spring_web_version = "4.3.9.RELEASE"
112112
jodatime_version = "2.10.5"
113113
junit_version = "4.12"

‎modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
289289
<swagger-annotations-version>1.5.17</swagger-annotations-version>
290290
<spring-web-version>4.3.9.RELEASE</spring-web-version>
291-
<jackson-version>2.10.1</jackson-version>
291+
<jackson-version>2.11.4</jackson-version>
292292
{{#joda}}
293293
<jodatime-version>2.10.5</jodatime-version>
294294
{{/joda}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ ext {
104104
retrofit_version = "2.7.1"
105105
{{#usePlayWS}}
106106
{{#play24}}
107-
jackson_version = "2.10.1"
107+
jackson_version = "2.11.4"
108108
play_version = "2.4.11"
109109
{{/play24}}
110110
{{#play25}}
111-
jackson_version = "2.10.1"
111+
jackson_version = "2.11.4"
112112
play_version = "2.5.14"
113113
{{/play25}}
114114
{{/usePlayWS}}

0 commit comments

Comments
 (0)