Skip to content

Commit 2499b92

Browse files
frantumafrantuma
committed
bump jackson to 2.9.9 in retrofit2
1 parent 166a5e0 commit 2499b92

File tree

11 files changed

+141
-141
lines changed

11 files changed

+141
-141
lines changed

‎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.3.0"
105105
{{#usePlayWS}}
106106
{{#play24}}
107-
jackson_version = "2.6.6"
107+
jackson_version = "2.9.9"
108108
play_version = "2.4.11"
109109
{{/play24}}
110110
{{#play25}}
111-
jackson_version = "2.7.8"
111+
jackson_version = "2.9.9"
112112
play_version = "2.5.14"
113113
{{/play25}}
114114
{{/usePlayWS}}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ lazy val root = (project in file(".")).
1717
{{#usePlayWS}}
1818
{{#play24}}
1919
"com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
20-
"com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
21-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
21+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
22+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
2323
{{/play24}}
2424
{{#play25}}
2525
"com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
26-
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.8" % "compile",
27-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile",
28-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile",
26+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
27+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
28+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
2929
{{/play25}}
3030
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
3131
{{/usePlayWS}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,11 @@
334334
<swagger-core-version>1.5.18</swagger-core-version>
335335
{{#usePlayWS}}
336336
{{#play24}}
337-
<jackson-version>2.6.6</jackson-version>
337+
<jackson-version>2.9.9</jackson-version>
338338
<play-version>2.4.11</play-version>
339339
{{/play24}}
340340
{{#play25}}
341-
<jackson-version>2.7.8</jackson-version>
341+
<jackson-version>2.9.9</jackson-version>
342342
<play-version>2.5.15</play-version>
343343
{{/play25}}
344344
{{/usePlayWS}}

‎samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.8-SNAPSHOT

‎samples/client/petstore/java/retrofit2-play24/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ if(hasProperty('target') && target == 'android') {
8888
}
8989

9090
task execute(type:JavaExec) {
91-
main = System.getProperty('mainClass')
92-
classpath = sourceSets.main.runtimeClasspath
91+
main = System.getProperty('mainClass')
92+
classpath = sourceSets.main.runtimeClasspath
9393
}
9494
}
9595

9696
ext {
9797
oltu_version = "1.0.1"
9898
retrofit_version = "2.3.0"
99-
jackson_version = "2.6.6"
99+
jackson_version = "2.9.9"
100100
play_version = "2.4.11"
101101
swagger_annotations_version = "1.5.17"
102102
junit_version = "4.12"

‎samples/client/petstore/java/retrofit2-play24/build.sbt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
lazy val root = (project in file(".")).
2-
settings(
3-
organization := "io.swagger",
4-
name := "swagger-java-client",
5-
version := "1.0.0",
6-
scalaVersion := "2.11.4",
7-
scalacOptions ++= Seq("-feature"),
8-
javacOptions in compile ++= Seq("-Xlint:deprecation"),
9-
publishArtifact in (Compile, packageDoc) := false,
10-
resolvers += Resolver.mavenLocal,
11-
libraryDependencies ++= Seq(
12-
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
13-
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
14-
"com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
15-
"com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
16-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
18-
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
19-
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
20-
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
21-
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
22-
"junit" % "junit" % "4.12" % "test",
23-
"com.novocode" % "junit-interface" % "0.11" % "test"
2+
settings(
3+
organization := "io.swagger",
4+
name := "swagger-java-client",
5+
version := "1.0.0",
6+
scalaVersion := "2.11.4",
7+
scalacOptions ++= Seq("-feature"),
8+
javacOptions in compile ++= Seq("-Xlint:deprecation"),
9+
publishArtifact in (Compile, packageDoc) := false,
10+
resolvers += Resolver.mavenLocal,
11+
libraryDependencies ++= Seq(
12+
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
13+
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
14+
"com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
15+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
18+
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
19+
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
20+
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
21+
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
22+
"junit" % "junit" % "4.12" % "test",
23+
"com.novocode" % "junit-interface" % "0.11" % "test"
24+
)
2425
)
25-
)

‎samples/client/petstore/java/retrofit2-play24/pom.xml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<configuration>
116116
<sources>
117117
<source>
118-
src/main/java</source>
118+
src/main/java</source>
119119
</sources>
120120
</configuration>
121121
</execution>
@@ -128,7 +128,7 @@
128128
<configuration>
129129
<sources>
130130
<source>
131-
src/test/java</source>
131+
src/test/java</source>
132132
</sources>
133133
</configuration>
134134
</execution>
@@ -225,37 +225,37 @@
225225
<version>${gson-fire-version}</version>
226226
</dependency>
227227

228-
<!-- JSON processing: jackson -->
229-
<dependency>
230-
<groupId>com.squareup.retrofit2</groupId>
231-
<artifactId>converter-jackson</artifactId>
232-
<version>${retrofit-version}</version>
233-
</dependency>
234-
<dependency>
235-
<groupId>com.fasterxml.jackson.core</groupId>
236-
<artifactId>jackson-core</artifactId>
237-
<version>${jackson-version}</version>
238-
</dependency>
239-
<dependency>
240-
<groupId>com.fasterxml.jackson.core</groupId>
241-
<artifactId>jackson-annotations</artifactId>
242-
<version>${jackson-version}</version>
243-
</dependency>
244-
<dependency>
245-
<groupId>com.fasterxml.jackson.core</groupId>
246-
<artifactId>jackson-databind</artifactId>
247-
<version>${jackson-version}</version>
248-
</dependency>
249-
<dependency>
250-
<groupId>com.fasterxml.jackson.datatype</groupId>
251-
<artifactId>jackson-datatype-jsr310</artifactId>
252-
<version>${jackson-version}</version>
253-
</dependency>
254-
<dependency>
255-
<groupId>com.typesafe.play</groupId>
256-
<artifactId>play-java-ws_2.11</artifactId>
257-
<version>${play-version}</version>
258-
</dependency>
228+
<!-- JSON processing: jackson -->
229+
<dependency>
230+
<groupId>com.squareup.retrofit2</groupId>
231+
<artifactId>converter-jackson</artifactId>
232+
<version>${retrofit-version}</version>
233+
</dependency>
234+
<dependency>
235+
<groupId>com.fasterxml.jackson.core</groupId>
236+
<artifactId>jackson-core</artifactId>
237+
<version>${jackson-version}</version>
238+
</dependency>
239+
<dependency>
240+
<groupId>com.fasterxml.jackson.core</groupId>
241+
<artifactId>jackson-annotations</artifactId>
242+
<version>${jackson-version}</version>
243+
</dependency>
244+
<dependency>
245+
<groupId>com.fasterxml.jackson.core</groupId>
246+
<artifactId>jackson-databind</artifactId>
247+
<version>${jackson-version}</version>
248+
</dependency>
249+
<dependency>
250+
<groupId>com.fasterxml.jackson.datatype</groupId>
251+
<artifactId>jackson-datatype-jsr310</artifactId>
252+
<version>${jackson-version}</version>
253+
</dependency>
254+
<dependency>
255+
<groupId>com.typesafe.play</groupId>
256+
<artifactId>play-java-ws_2.11</artifactId>
257+
<version>${play-version}</version>
258+
</dependency>
259259

260260

261261
<!-- test dependencies -->
@@ -273,8 +273,8 @@
273273
<maven.compiler.target>${java.version}</maven.compiler.target>
274274
<gson-fire-version>1.8.0</gson-fire-version>
275275
<swagger-core-version>1.5.18</swagger-core-version>
276-
<jackson-version>2.6.6</jackson-version>
277-
<play-version>2.4.11</play-version>
276+
<jackson-version>2.9.9</jackson-version>
277+
<play-version>2.4.11</play-version>
278278
<retrofit-version>2.3.0</retrofit-version>
279279
<oltu-version>1.0.1</oltu-version>
280280
<junit-version>4.12</junit-version>

‎samples/client/petstore/java/retrofit2-play25/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.8-SNAPSHOT

‎samples/client/petstore/java/retrofit2-play25/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ if(hasProperty('target') && target == 'android') {
8888
}
8989

9090
task execute(type:JavaExec) {
91-
main = System.getProperty('mainClass')
92-
classpath = sourceSets.main.runtimeClasspath
91+
main = System.getProperty('mainClass')
92+
classpath = sourceSets.main.runtimeClasspath
9393
}
9494
}
9595

9696
ext {
9797
oltu_version = "1.0.1"
9898
retrofit_version = "2.3.0"
99-
jackson_version = "2.7.8"
99+
jackson_version = "2.9.9"
100100
play_version = "2.5.14"
101101
swagger_annotations_version = "1.5.17"
102102
junit_version = "4.12"

‎samples/client/petstore/java/retrofit2-play25/build.sbt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
lazy val root = (project in file(".")).
2-
settings(
3-
organization := "io.swagger",
4-
name := "swagger-java-client",
5-
version := "1.0.0",
6-
scalaVersion := "2.11.4",
7-
scalacOptions ++= Seq("-feature"),
8-
javacOptions in compile ++= Seq("-Xlint:deprecation"),
9-
publishArtifact in (Compile, packageDoc) := false,
10-
resolvers += Resolver.mavenLocal,
11-
libraryDependencies ++= Seq(
12-
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
13-
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
14-
"com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
15-
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.8" % "compile",
16-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile",
18-
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
19-
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
20-
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
21-
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
22-
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
23-
"junit" % "junit" % "4.12" % "test",
24-
"com.novocode" % "junit-interface" % "0.11" % "test"
2+
settings(
3+
organization := "io.swagger",
4+
name := "swagger-java-client",
5+
version := "1.0.0",
6+
scalaVersion := "2.11.4",
7+
scalacOptions ++= Seq("-feature"),
8+
javacOptions in compile ++= Seq("-Xlint:deprecation"),
9+
publishArtifact in (Compile, packageDoc) := false,
10+
resolvers += Resolver.mavenLocal,
11+
libraryDependencies ++= Seq(
12+
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
13+
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
14+
"com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
15+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
18+
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
19+
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
20+
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
21+
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
22+
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
23+
"junit" % "junit" % "4.12" % "test",
24+
"com.novocode" % "junit-interface" % "0.11" % "test"
25+
)
2526
)
26-
)

0 commit comments

Comments
 (0)