Skip to content

Commit 747cd08

Browse files
wing328wing328
authored
update dependency for java client (#5926)
1 parent 533d686 commit 747cd08

File tree

9 files changed

+72
-72
lines changed

9 files changed

+72
-72
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache

+8-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if(hasProperty('target') && target == 'android') {
6868
}
6969

7070
dependencies {
71-
provided 'javax.annotation:jsr250-api:1.0'
71+
provided 'javax.annotation:javax.annotation-api:1.3.2'
7272
}
7373
}
7474

@@ -126,21 +126,21 @@ if(hasProperty('target') && target == 'android') {
126126
}
127127

128128
dependencies {
129-
compile 'io.swagger:swagger-annotations:1.5.22'
129+
compile 'io.swagger:swagger-annotations:1.5.24'
130130
compile "com.google.code.findbugs:jsr305:3.0.2"
131-
compile 'com.squareup.okhttp3:okhttp:3.14.2'
132-
compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
133-
compile 'com.google.code.gson:gson:2.8.5'
134-
compile 'io.gsonfire:gson-fire:1.8.3'
131+
compile 'com.squareup.okhttp3:okhttp:3.14.7'
132+
compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
133+
compile 'com.google.code.gson:gson:2.8.6'
134+
compile 'io.gsonfire:gson-fire:1.8.4'
135135
{{#hasOAuthMethods}}
136136
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
137137
{{/hasOAuthMethods}}
138-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
138+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
139139
{{#joda}}
140140
compile 'joda-time:joda-time:2.9.9'
141141
{{/joda}}
142142
{{#threetenbp}}
143-
compile 'org.threeten:threetenbp:1.4.0'
143+
compile 'org.threeten:threetenbp:1.4.3'
144144
{{/threetenbp}}
145145
testCompile 'junit:junit:4.13'
146146
}

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache

+8-7
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22",
13-
"com.squareup.okhttp3" % "okhttp" % "3.14.2",
14-
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
15-
"com.google.code.gson" % "gson" % "2.8.5",
16-
"org.apache.commons" % "commons-lang3" % "3.9",
12+
"io.swagger" % "swagger-annotations" % "1.5.24",
13+
"com.squareup.okhttp3" % "okhttp" % "3.14.7",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
15+
"com.google.code.gson" % "gson" % "2.8.6",
16+
"org.apache.commons" % "commons-lang3" % "3.10",
1717
{{#hasOAuthMethods}}
1818
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
1919
{{/hasOAuthMethods}}
2020
{{#joda}}
2121
"joda-time" % "joda-time" % "2.9.9" % "compile",
2222
{{/joda}}
2323
{{#threetenbp}}
24-
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
24+
"org.threeten" % "threetenbp" % "1.4.3" % "compile",
2525
{{/threetenbp}}
2626
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
27-
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
27+
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
28+
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2829
"junit" % "junit" % "4.13" % "test",
2930
"com.novocode" % "junit-interface" % "0.10" % "test"
3031
)

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

+8-9
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
{{/parcelableModel}}
308308
<dependency>
309309
<groupId>javax.annotation</groupId>
310-
<artifactId>jsr250-api</artifactId>
310+
<artifactId>javax.annotation-api</artifactId>
311311
<version>${javax-annotation-version}</version>
312312
</dependency>
313313
<!-- test dependencies -->
@@ -322,19 +322,18 @@
322322
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
323323
<maven.compiler.source>${java.version}</maven.compiler.source>
324324
<maven.compiler.target>${java.version}</maven.compiler.target>
325-
<gson-fire-version>1.8.3</gson-fire-version>
326-
<swagger-core-version>1.5.22</swagger-core-version>
327-
<okhttp-version>3.14.2</okhttp-version>
328-
<gson-version>2.8.5</gson-version>
329-
<commons-lang3-version>3.9</commons-lang3-version>
325+
<gson-fire-version>1.8.4</gson-fire-version>
326+
<swagger-core-version>1.5.24</swagger-core-version>
327+
<okhttp-version>3.14.7</okhttp-version>
328+
<gson-version>2.8.6</gson-version>
329+
<commons-lang3-version>3.10</commons-lang3-version>
330330
{{#joda}}
331331
<jodatime-version>2.9.9</jodatime-version>
332332
{{/joda}}
333333
{{#threetenbp}}
334-
<threetenbp-version>1.4.0</threetenbp-version>
334+
<threetenbp-version>1.4.3</threetenbp-version>
335335
{{/threetenbp}}
336-
<maven-plugin-version>1.0.0</maven-plugin-version>
337-
<javax-annotation-version>1.0</javax-annotation-version>
336+
<javax-annotation-version>1.3.2</javax-annotation-version>
338337
<junit-version>4.13</junit-version>
339338
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
340339
</properties>

‎samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
5252
}
5353

5454
dependencies {
55-
provided 'javax.annotation:jsr250-api:1.0'
55+
provided 'javax.annotation:javax.annotation-api:1.3.2'
5656
}
5757
}
5858

@@ -98,15 +98,15 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
dependencies {
101-
compile 'io.swagger:swagger-annotations:1.5.22'
101+
compile 'io.swagger:swagger-annotations:1.5.24'
102102
compile "com.google.code.findbugs:jsr305:3.0.2"
103-
compile 'com.squareup.okhttp3:okhttp:3.14.2'
104-
compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
105-
compile 'com.google.code.gson:gson:2.8.5'
106-
compile 'io.gsonfire:gson-fire:1.8.3'
103+
compile 'com.squareup.okhttp3:okhttp:3.14.7'
104+
compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
105+
compile 'com.google.code.gson:gson:2.8.6'
106+
compile 'io.gsonfire:gson-fire:1.8.4'
107107
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
108-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
109-
compile 'org.threeten:threetenbp:1.4.0'
108+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
109+
compile 'org.threeten:threetenbp:1.4.3'
110110
testCompile 'junit:junit:4.13'
111111
}
112112

‎samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt

+8-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22",
13-
"com.squareup.okhttp3" % "okhttp" % "3.14.2",
14-
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
15-
"com.google.code.gson" % "gson" % "2.8.5",
16-
"org.apache.commons" % "commons-lang3" % "3.9",
12+
"io.swagger" % "swagger-annotations" % "1.5.24",
13+
"com.squareup.okhttp3" % "okhttp" % "3.14.7",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
15+
"com.google.code.gson" % "gson" % "2.8.6",
16+
"org.apache.commons" % "commons-lang3" % "3.10",
1717
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
18-
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
18+
"org.threeten" % "threetenbp" % "1.4.3" % "compile",
1919
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
20-
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
20+
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
21+
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2122
"junit" % "junit" % "4.13" % "test",
2223
"com.novocode" % "junit-interface" % "0.10" % "test"
2324
)

‎samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
</dependency>
266266
<dependency>
267267
<groupId>javax.annotation</groupId>
268-
<artifactId>jsr250-api</artifactId>
268+
<artifactId>javax.annotation-api</artifactId>
269269
<version>${javax-annotation-version}</version>
270270
</dependency>
271271
<!-- test dependencies -->
@@ -280,14 +280,13 @@
280280
<java.version>1.7</java.version>
281281
<maven.compiler.source>${java.version}</maven.compiler.source>
282282
<maven.compiler.target>${java.version}</maven.compiler.target>
283-
<gson-fire-version>1.8.3</gson-fire-version>
284-
<swagger-core-version>1.5.22</swagger-core-version>
285-
<okhttp-version>3.14.2</okhttp-version>
286-
<gson-version>2.8.5</gson-version>
287-
<commons-lang3-version>3.9</commons-lang3-version>
288-
<threetenbp-version>1.4.0</threetenbp-version>
289-
<maven-plugin-version>1.0.0</maven-plugin-version>
290-
<javax-annotation-version>1.0</javax-annotation-version>
283+
<gson-fire-version>1.8.4</gson-fire-version>
284+
<swagger-core-version>1.5.24</swagger-core-version>
285+
<okhttp-version>3.14.7</okhttp-version>
286+
<gson-version>2.8.6</gson-version>
287+
<commons-lang3-version>3.10</commons-lang3-version>
288+
<threetenbp-version>1.4.3</threetenbp-version>
289+
<javax-annotation-version>1.3.2</javax-annotation-version>
291290
<junit-version>4.13</junit-version>
292291
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
293292
</properties>

‎samples/client/petstore/java/okhttp-gson/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
5252
}
5353

5454
dependencies {
55-
provided 'javax.annotation:jsr250-api:1.0'
55+
provided 'javax.annotation:javax.annotation-api:1.3.2'
5656
}
5757
}
5858

@@ -98,15 +98,15 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
dependencies {
101-
compile 'io.swagger:swagger-annotations:1.5.22'
101+
compile 'io.swagger:swagger-annotations:1.5.24'
102102
compile "com.google.code.findbugs:jsr305:3.0.2"
103-
compile 'com.squareup.okhttp3:okhttp:3.14.2'
104-
compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
105-
compile 'com.google.code.gson:gson:2.8.5'
106-
compile 'io.gsonfire:gson-fire:1.8.3'
103+
compile 'com.squareup.okhttp3:okhttp:3.14.7'
104+
compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
105+
compile 'com.google.code.gson:gson:2.8.6'
106+
compile 'io.gsonfire:gson-fire:1.8.4'
107107
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
108-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
109-
compile 'org.threeten:threetenbp:1.4.0'
108+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
109+
compile 'org.threeten:threetenbp:1.4.3'
110110
testCompile 'junit:junit:4.13'
111111
}
112112

‎samples/client/petstore/java/okhttp-gson/build.sbt

+8-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22",
13-
"com.squareup.okhttp3" % "okhttp" % "3.14.2",
14-
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
15-
"com.google.code.gson" % "gson" % "2.8.5",
16-
"org.apache.commons" % "commons-lang3" % "3.9",
12+
"io.swagger" % "swagger-annotations" % "1.5.24",
13+
"com.squareup.okhttp3" % "okhttp" % "3.14.7",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
15+
"com.google.code.gson" % "gson" % "2.8.6",
16+
"org.apache.commons" % "commons-lang3" % "3.10",
1717
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
18-
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
18+
"org.threeten" % "threetenbp" % "1.4.3" % "compile",
1919
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
20-
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
20+
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
21+
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2122
"junit" % "junit" % "4.13" % "test",
2223
"com.novocode" % "junit-interface" % "0.10" % "test"
2324
)

‎samples/client/petstore/java/okhttp-gson/pom.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
</dependency>
259259
<dependency>
260260
<groupId>javax.annotation</groupId>
261-
<artifactId>jsr250-api</artifactId>
261+
<artifactId>javax.annotation-api</artifactId>
262262
<version>${javax-annotation-version}</version>
263263
</dependency>
264264
<!-- test dependencies -->
@@ -273,14 +273,13 @@
273273
<java.version>1.7</java.version>
274274
<maven.compiler.source>${java.version}</maven.compiler.source>
275275
<maven.compiler.target>${java.version}</maven.compiler.target>
276-
<gson-fire-version>1.8.3</gson-fire-version>
277-
<swagger-core-version>1.5.22</swagger-core-version>
278-
<okhttp-version>3.14.2</okhttp-version>
279-
<gson-version>2.8.5</gson-version>
280-
<commons-lang3-version>3.9</commons-lang3-version>
281-
<threetenbp-version>1.4.0</threetenbp-version>
282-
<maven-plugin-version>1.0.0</maven-plugin-version>
283-
<javax-annotation-version>1.0</javax-annotation-version>
276+
<gson-fire-version>1.8.4</gson-fire-version>
277+
<swagger-core-version>1.5.24</swagger-core-version>
278+
<okhttp-version>3.14.7</okhttp-version>
279+
<gson-version>2.8.6</gson-version>
280+
<commons-lang3-version>3.10</commons-lang3-version>
281+
<threetenbp-version>1.4.3</threetenbp-version>
282+
<javax-annotation-version>1.3.2</javax-annotation-version>
284283
<junit-version>4.13</junit-version>
285284
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
286285
</properties>

0 commit comments

Comments
 (0)