Skip to content

Commit b8db2af

Browse files
wing328wing328
authored
Update swagger annotation version in Java clients (#915)
* update swagger annotation version in java client * add java retrofit2 play 2.6 to java petstore all bin script * remove empty line in pom.xml
1 parent 8e1e05e commit b8db2af

Some content is hidden

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

71 files changed

+189
-279
lines changed

‎bin/java-petstore-all.sh

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
./bin/java8-petstore-jersey2.sh
1414
./bin/java-petstore-retrofit2-play24.sh
1515
./bin/java-petstore-retrofit2-play25.sh
16+
./bin/java-petstore-retrofit2-play26.sh
1617
./bin/java-petstore-jersey2-java6.sh
1718
./bin/java-petstore-resttemplate.sh
1819
./bin/java-petstore-resttemplate-withxml.sh

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
118118
}
119119

120120
ext {
121-
swagger_annotations_version = "1.5.9"
121+
swagger_annotations_version = "1.5.21"
122122
jackson_version = "2.8.7"
123123
{{#threetenbp}}
124124
threepane_version = "2.6.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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.9" % "compile",
12+
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
1313
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
1414
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
1515
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
</goals>
115115
<configuration>
116116
<sources>
117-
<source>
118-
src/main/java</source>
117+
<source>src/main/java</source>
119118
</sources>
120119
</configuration>
121120
</execution>
@@ -127,8 +126,7 @@
127126
</goals>
128127
<configuration>
129128
<sources>
130-
<source>
131-
src/test/java</source>
129+
<source>src/test/java</source>
132130
</sources>
133131
</configuration>
134132
</execution>
@@ -191,7 +189,7 @@
191189
<dependency>
192190
<groupId>io.swagger</groupId>
193191
<artifactId>swagger-annotations</artifactId>
194-
<version>${swagger-core-version}</version>
192+
<version>${swagger-annotations-version}</version>
195193
</dependency>
196194

197195
<!-- HTTP client: Netflix Feign -->
@@ -294,12 +292,12 @@
294292
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
295293
<maven.compiler.source>${java.version}</maven.compiler.source>
296294
<maven.compiler.target>${java.version}</maven.compiler.target>
297-
<swagger-core-version>1.5.18</swagger-core-version>
295+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
298296
<feign-version>9.4.0</feign-version>
299297
<feign-form-version>2.1.0</feign-form-version>
300298
<jackson-version>2.8.9</jackson-version>
301299
{{#threetenbp}}
302-
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
300+
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
303301
{{/threetenbp}}
304302
<junit-version>4.12</junit-version>
305303
<maven-plugin-version>1.0.0</maven-plugin-version>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
118118
}
119119

120120
ext {
121-
swagger_annotations_version = "1.5.17"
121+
swagger_annotations_version = "1.5.21"
122122
jackson_version = "2.8.9"
123123
google_api_client_version = "1.23.0"
124124
jersey_common_version = "2.25.1"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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.17",
12+
"io.swagger" % "swagger-annotations" % "1.5.21",
1313
"com.google.api-client" % "google-api-client" % "1.23.0",
1414
"org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
1515
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",

‎modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache

+5-7
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
</goals>
115115
<configuration>
116116
<sources>
117-
<source>
118-
src/main/java</source>
117+
<source>src/main/java</source>
119118
</sources>
120119
</configuration>
121120
</execution>
@@ -127,8 +126,7 @@
127126
</goals>
128127
<configuration>
129128
<sources>
130-
<source>
131-
src/test/java</source>
129+
<source>src/test/java</source>
132130
</sources>
133131
</configuration>
134132
</execution>
@@ -287,15 +285,15 @@
287285
</dependencies>
288286
<properties>
289287
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
290-
<swagger-annotations-version>1.5.17</swagger-annotations-version>
288+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
291289
<google-api-client-version>1.23.0</google-api-client-version>
292290
<jersey-common-version>2.25.1</jersey-common-version>
293291
<jackson-version>2.8.9</jackson-version>
294292
{{#joda}}
295-
<jodatime-version>2.9.9</jodatime-version>
293+
<jodatime-version>2.9.9</jodatime-version>
296294
{{/joda}}
297295
{{#threetenbp}}
298-
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
296+
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
299297
{{/threetenbp}}
300298
<maven-plugin-version>1.0.0</maven-plugin-version>
301299
<junit-version>4.12</junit-version>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if(hasProperty('target') && target == 'android') {
117117
}
118118

119119
ext {
120-
swagger_annotations_version = "1.5.20"
120+
swagger_annotations_version = "1.5.21"
121121
jackson_version = "2.9.6"
122122
{{#supportJava6}}
123123
jersey_version = "2.6"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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.20",
12+
"io.swagger" % "swagger-annotations" % "1.5.21",
1313
"org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
1515
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
</goals>
115115
<configuration>
116116
<sources>
117-
<source>
118-
src/main/java</source>
117+
<source>src/main/java</source>
119118
</sources>
120119
</configuration>
121120
</execution>
@@ -127,8 +126,7 @@
127126
</goals>
128127
<configuration>
129128
<sources>
130-
<source>
131-
src/test/java</source>
129+
<source>src/test/java</source>
132130
</sources>
133131
</configuration>
134132
</execution>
@@ -212,7 +210,7 @@
212210
<dependency>
213211
<groupId>io.swagger</groupId>
214212
<artifactId>swagger-annotations</artifactId>
215-
<version>${swagger-core-version}</version>
213+
<version>${swagger-annotations-version}</version>
216214
</dependency>
217215

218216
<!-- HTTP client: jersey-client -->
@@ -318,7 +316,7 @@
318316
</dependencies>
319317
<properties>
320318
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
321-
<swagger-core-version>1.5.20</swagger-core-version>
319+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
322320
{{^supportJava6}}
323321
<jersey-version>2.27</jersey-version>
324322
{{/supportJava6}}

‎modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
9494
}
9595

9696
ext {
97-
swagger_annotations_version = "1.5.15"
97+
swagger_annotations_version = "1.5.21"
9898
rest_assured_version = "3.1.0"
9999
junit_version = "4.12"
100100
gson_version = "2.6.1"

‎modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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.15",
12+
"io.swagger" % "swagger-annotations" % "1.5.21",
1313
"io.rest-assured" % "scala-support" % "3.1.0",
1414
"com.google.code.gson" % "gson" % "2.6.1",
1515
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile",

‎modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache

+4-6
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113
</goals>
114114
<configuration>
115115
<sources>
116-
<source>
117-
src/main/java</source>
116+
<source>src/main/java</source>
118117
</sources>
119118
</configuration>
120119
</execution>
@@ -126,8 +125,7 @@
126125
</goals>
127126
<configuration>
128127
<sources>
129-
<source>
130-
src/test/java</source>
128+
<source>src/test/java</source>
131129
</sources>
132130
</configuration>
133131
</execution>
@@ -199,7 +197,7 @@
199197
<dependency>
200198
<groupId>io.swagger</groupId>
201199
<artifactId>swagger-annotations</artifactId>
202-
<version>${swagger-core-version}</version>
200+
<version>${swagger-annotations-version}</version>
203201
</dependency>
204202
<dependency>
205203
<groupId>io.rest-assured</groupId>
@@ -245,7 +243,7 @@
245243
</dependencies>
246244
<properties>
247245
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
248-
<swagger-core-version>1.5.15</swagger-core-version>
246+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
249247
<rest-assured.version>3.1.0</rest-assured.version>
250248
<gson-version>2.6.1</gson-version>
251249
<gson-fire-version>1.8.2</gson-fire-version>

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
</goals>
9696
<configuration>
9797
<sources>
98-
<source>
99-
src/main/java</source>
98+
<source>src/main/java</source>
10099
</sources>
101100
</configuration>
102101
</execution>
@@ -108,8 +107,7 @@
108107
</goals>
109108
<configuration>
110109
<sources>
111-
<source>
112-
src/test/java</source>
110+
<source>src/test/java</source>
113111
</sources>
114112
</configuration>
115113
</execution>
@@ -155,7 +153,7 @@
155153
<dependency>
156154
<groupId>io.swagger</groupId>
157155
<artifactId>swagger-annotations</artifactId>
158-
<version>${swagger-core-version}</version>
156+
<version>${swagger-annotations-version}</version>
159157
</dependency>
160158
<!-- HTTP client: jersey-client -->
161159
<dependency>
@@ -259,7 +257,7 @@
259257
</dependencies>
260258
<properties>
261259
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
262-
<swagger-core-version>1.5.18</swagger-core-version>
260+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
263261
<resteasy-version>3.1.3.Final</resteasy-version>
264262
<jackson-version>2.8.6</jackson-version>
265263
<threetenbp-version>2.6.4</threetenbp-version>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
118118
}
119119

120120
ext {
121-
swagger_annotations_version = "1.5.17"
121+
swagger_annotations_version = "1.5.21"
122122
jackson_version = "2.8.9"
123123
spring_web_version = "4.3.9.RELEASE"
124124
jodatime_version = "2.9.9"

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
</goals>
115115
<configuration>
116116
<sources>
117-
<source>
118-
src/main/java</source>
117+
<source>src/main/java</source>
119118
</sources>
120119
</configuration>
121120
</execution>
@@ -127,8 +126,7 @@
127126
</goals>
128127
<configuration>
129128
<sources>
130-
<source>
131-
src/test/java</source>
129+
<source>src/test/java</source>
132130
</sources>
133131
</configuration>
134132
</execution>
@@ -290,7 +288,7 @@
290288
</dependencies>
291289
<properties>
292290
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
293-
<swagger-annotations-version>1.5.17</swagger-annotations-version>
291+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
294292
<spring-web-version>4.3.9.RELEASE</spring-web-version>
295293
<jackson-version>2.8.9</jackson-version>
296294
{{#joda}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ext {
109109
okhttp_version = "2.7.5"
110110
oltu_version = "1.0.1"
111111
retrofit_version = "1.9.0"
112-
swagger_annotations_version = "1.5.8"
112+
swagger_annotations_version = "1.5.21"
113113
junit_version = "4.12"
114114
jodatime_version = "2.9.3"
115115
{{#threetenbp}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lazy val root = (project in file(".")).
1111
libraryDependencies ++= Seq(
1212
"com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
1313
"com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
14-
"io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
14+
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
1515
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
1616
"joda-time" % "joda-time" % "2.9.3" % "compile",
1717
{{#threetenbp}}

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

+11-15
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
</goals>
115115
<configuration>
116116
<sources>
117-
<source>
118-
src/main/java</source>
117+
<source>src/main/java</source>
119118
</sources>
120119
</configuration>
121120
</execution>
@@ -127,8 +126,7 @@
127126
</goals>
128127
<configuration>
129128
<sources>
130-
<source>
131-
src/test/java</source>
129+
<source>src/test/java</source>
132130
</sources>
133131
</configuration>
134132
</execution>
@@ -212,7 +210,7 @@
212210
<dependency>
213211
<groupId>io.swagger</groupId>
214212
<artifactId>swagger-annotations</artifactId>
215-
<version>${swagger-core-version}</version>
213+
<version>${swagger-annotations-version}</version>
216214
</dependency>
217215
<dependency>
218216
<groupId>com.squareup.retrofit</groupId>
@@ -241,17 +239,15 @@
241239
<version>${threetenbp-version}</version>
242240
</dependency>
243241
{{/threetenbp}}
244-
245242
{{#parcelableModel}}
246-
<!-- Needed for Parcelable support-->
247-
<dependency>
248-
<groupId>com.google.android</groupId>
249-
<artifactId>android</artifactId>
250-
<version>4.1.1.4</version>
251-
<scope>provided</scope>
252-
</dependency>
243+
<!-- Needed for Parcelable support-->
244+
<dependency>
245+
<groupId>com.google.android</groupId>
246+
<artifactId>android</artifactId>
247+
<version>4.1.1.4</version>
248+
<scope>provided</scope>
249+
</dependency>
253250
{{/parcelableModel}}
254-
255251
<!-- test dependencies -->
256252
<dependency>
257253
<groupId>junit</groupId>
@@ -262,7 +258,7 @@
262258
</dependencies>
263259
<properties>
264260
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
265-
<swagger-core-version>1.5.18</swagger-core-version>
261+
<swagger-annotations-version>1.5.21</swagger-annotations-version>
266262
<retrofit-version>1.9.0</retrofit-version>
267263
<okhttp-version>2.7.5</okhttp-version>
268264
<jodatime-version>2.9.9</jodatime-version>

0 commit comments

Comments
 (0)