diff --git a/bin/java-petstore-all.sh b/bin/java-petstore-all.sh
index b8cb3014e0..190bf33fa5 100755
--- a/bin/java-petstore-all.sh
+++ b/bin/java-petstore-all.sh
@@ -13,6 +13,7 @@
./bin/java8-petstore-jersey2.sh
./bin/java-petstore-retrofit2-play24.sh
./bin/java-petstore-retrofit2-play25.sh
+./bin/java-petstore-retrofit2-play26.sh
./bin/java-petstore-jersey2-java6.sh
./bin/java-petstore-resttemplate.sh
./bin/java-petstore-resttemplate-withxml.sh
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 32254e5250..a4e5ea5a79 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.9"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7"
{{#threetenbp}}
threepane_version = "2.6.4"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
index d745ef7e86..a3dff94200 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
index a616e68bcf..7a81b340af 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -294,12 +292,12 @@
{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}
${java.version}
${java.version}
- 1.5.18
+ 1.5.21
9.4.0
2.1.0
2.8.9
{{#threetenbp}}
- 2.6.4
+ 2.6.4
{{/threetenbp}}
4.12
1.0.0
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
index 1a2b2afc6c..acbe24a53f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
index d6b88c91d9..9f1aeaf157 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.17",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"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.8.9" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
index 2fff29a15b..69aac87b27 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -287,15 +285,15 @@
UTF-8
- 1.5.17
+ 1.5.21
1.23.0
2.25.1
2.8.9
{{#joda}}
- 2.9.9
+ 2.9.9
{{/joda}}
{{#threetenbp}}
- 2.6.4
+ 2.6.4
{{/threetenbp}}
1.0.0
4.12
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 8f7c03adef..2a4a56b935 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -117,7 +117,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.20"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6"
{{#supportJava6}}
jersey_version = "2.6"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
index 54902da798..cc2e9480b6 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.20",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
"org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
index 5c273fa147..93f2d9e2c9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -212,7 +210,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -318,7 +316,7 @@
UTF-8
- 1.5.20
+ 1.5.21
{{^supportJava6}}
2.27
{{/supportJava6}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
index 54b90483f4..87608f2102 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.15"
+ swagger_annotations_version = "1.5.21"
rest_assured_version = "3.1.0"
junit_version = "4.12"
gson_version = "2.6.1"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
index 68f3eff08d..7a666ebace 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.15",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"io.rest-assured" % "scala-support" % "3.1.0",
"com.google.code.gson" % "gson" % "2.6.1",
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
index 1d0c171138..aa0c15d8b3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -113,8 +113,7 @@
-
- src/main/java
+ src/main/java
@@ -126,8 +125,7 @@
-
- src/test/java
+ src/test/java
@@ -199,7 +197,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
io.rest-assured
@@ -245,7 +243,7 @@
UTF-8
- 1.5.15
+ 1.5.21
3.1.0
2.6.1
1.8.2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index f2f7fa53a4..540c54c681 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -95,8 +95,7 @@
-
- src/main/java
+ src/main/java
@@ -108,8 +107,7 @@
-
- src/test/java
+ src/test/java
@@ -155,7 +153,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -259,7 +257,7 @@
UTF-8
- 1.5.18
+ 1.5.21
3.1.3.Final
2.8.6
2.6.4
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index 9925cc43da..b50203a337 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
index 0d371de6ea..10d84edafc 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -290,7 +288,7 @@
UTF-8
- 1.5.17
+ 1.5.21
4.3.9.RELEASE
2.8.9
{{#joda}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index f0c1cbe4c8..45da8dd03b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -109,7 +109,7 @@ ext {
okhttp_version = "2.7.5"
oltu_version = "1.0.1"
retrofit_version = "1.9.0"
- swagger_annotations_version = "1.5.8"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
jodatime_version = "2.9.3"
{{#threetenbp}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
index ffa308d528..9d5df5e223 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
@@ -11,7 +11,7 @@ lazy val root = (project in file(".")).
libraryDependencies ++= Seq(
"com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
"com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"joda-time" % "joda-time" % "2.9.3" % "compile",
{{#threetenbp}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
index adbd6e99e5..155a8128e3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -212,7 +210,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit
@@ -241,17 +239,15 @@
${threetenbp-version}
{{/threetenbp}}
-
{{#parcelableModel}}
-
-
- com.google.android
- android
- 4.1.1.4
- provided
-
+
+
+ com.google.android
+ android
+ 4.1.1.4
+ provided
+
{{/parcelableModel}}
-
junit
@@ -262,7 +258,7 @@
UTF-8
- 1.5.18
+ 1.5.21
1.9.0
2.7.5
2.9.9
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index cd9baeb50d..dfd1f6d940 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -134,7 +134,7 @@ ext {
play_version = "2.6.7"
{{/play26}}
{{/usePlayWS}}
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
{{#useRxJava}}
rx_java_version = "1.3.0"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index b08e715a7b..e66ca78403 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -44,7 +44,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
{{/useRxJava2}}
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
{{#joda}}
"joda-time" % "joda-time" % "2.9.9" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 8518053b80..3028604c36 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -262,7 +260,6 @@
${retrofit-version}
{{/useRxJava2}}
-
{{#usePlayWS}}
@@ -291,16 +288,13 @@
${jackson-version}
{{#withXml}}
-
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
${jackson-version}
-
{{/withXml}}
-
{{#play24}}
com.typesafe.play
@@ -327,9 +321,7 @@
1.1.0.Final
{{/play26}}
-
{{/usePlayWS}}
-
{{#parcelableModel}}
@@ -339,7 +331,6 @@
provided
{{/parcelableModel}}
-
junit
@@ -354,33 +345,33 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
+ 1.5.21
{{#usePlayWS}}
- {{#play24}}
- 2.6.6
- 2.4.11
- {{/play24}}
- {{#play25}}
- 2.7.8
- 2.5.15
- {{/play25}}
- {{#play26}}
- 2.8.10
- 2.6.7
- {{/play26}}
+ {{#play24}}
+ 2.6.6
+ 2.4.11
+ {{/play24}}
+ {{#play25}}
+ 2.7.8
+ 2.5.15
+ {{/play25}}
+ {{#play26}}
+ 2.8.10
+ 2.6.7
+ {{/play26}}
{{/usePlayWS}}
2.3.0
{{#useRxJava}}
- 1.3.0
+ 1.3.0
{{/useRxJava}}
{{#useRxJava2}}
- 2.1.1
+ 2.1.1
{{/useRxJava2}}
{{#joda}}
- 2.9.9
+ 2.9.9
{{/joda}}
{{#threetenbp}}
- 1.3.5
+ 1.3.5
{{/threetenbp}}
1.0.1
4.12
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
index e1c956d5f7..1f2ebac439 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
@@ -26,7 +26,7 @@ task execute(type:JavaExec) {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
vertx_version = "3.4.2"
junit_version = "4.12"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
index 32f94b6263..b8d7e513d6 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -271,7 +269,7 @@
UTF-8
3.4.2
- 1.5.18
+ 1.5.21
{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}
4.12
diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache
index 0c1501e115..275a5c869a 100644
--- a/modules/openapi-generator/src/main/resources/Java/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -327,7 +325,7 @@
UTF-8
- 1.5.17
+ 1.5.21
1.19.4
{{#supportJava6}}
2.5
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index b4d7da7926..e2126b1243 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.9"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7"
threepane_version = "2.6.4"
feign_version = "9.4.0"
diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt
index 0b09ff26bd..b387ad56e6 100644
--- a/samples/client/petstore/java/feign/build.sbt
+++ b/samples/client/petstore/java/feign/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index ce837265ab..58b7d4d7e0 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -268,11 +266,11 @@
1.7
${java.version}
${java.version}
- 1.5.18
+ 1.5.21
9.4.0
2.1.0
2.8.9
- 2.6.4
+ 2.6.4
4.12
1.0.0
1.0.1
diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle
index d66603375a..97de036a9c 100644
--- a/samples/client/petstore/java/google-api-client/build.gradle
+++ b/samples/client/petstore/java/google-api-client/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1"
diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt
index 92a0aabedd..7052571b29 100644
--- a/samples/client/petstore/java/google-api-client/build.sbt
+++ b/samples/client/petstore/java/google-api-client/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.17",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"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.8.9" % "compile",
diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml
index 02d4066015..af558ebb15 100644
--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -246,11 +244,11 @@
UTF-8
- 1.5.17
+ 1.5.21
1.23.0
2.25.1
2.8.9
- 2.6.4
+ 2.6.4
1.0.0
4.12
diff --git a/samples/client/petstore/java/jersey1/pom.xml b/samples/client/petstore/java/jersey1/pom.xml
index 397958485b..c2ccfcede3 100644
--- a/samples/client/petstore/java/jersey1/pom.xml
+++ b/samples/client/petstore/java/jersey1/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -257,7 +255,7 @@
UTF-8
- 1.5.17
+ 1.5.21
1.19.4
2.6.4
1.0.0
diff --git a/samples/client/petstore/java/jersey2-java6/build.sbt b/samples/client/petstore/java/jersey2-java6/build.sbt
index 3d85a70e1d..ea742941dc 100644
--- a/samples/client/petstore/java/jersey2-java6/build.sbt
+++ b/samples/client/petstore/java/jersey2-java6/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.20",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"org.glassfish.jersey.core" % "jersey-client" % "2.6",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml
index 46ee931b3d..eea08b8d53 100644
--- a/samples/client/petstore/java/jersey2-java6/pom.xml
+++ b/samples/client/petstore/java/jersey2-java6/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -267,7 +265,7 @@
UTF-8
- 1.5.20
+ 1.5.21
2.6
2.5
3.6
diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle
index d271017ae9..d2daa9fa14 100644
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.20"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6"
jersey_version = "2.27"
junit_version = "4.12"
diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt
index 1bd1f63a7d..8edfce668a 100644
--- a/samples/client/petstore/java/jersey2-java8/build.sbt
+++ b/samples/client/petstore/java/jersey2-java8/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.20",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"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",
diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml
index c6317e79ee..70130e62c2 100644
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -251,7 +249,7 @@
UTF-8
- 1.5.20
+ 1.5.21
2.27
2.8.9
1.0.0
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index f1a401ef53..84f8976c2c 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.20"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6"
jersey_version = "2.27"
junit_version = "4.12"
diff --git a/samples/client/petstore/java/jersey2/build.sbt b/samples/client/petstore/java/jersey2/build.sbt
index 578112888e..e3f30385ef 100644
--- a/samples/client/petstore/java/jersey2/build.sbt
+++ b/samples/client/petstore/java/jersey2/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.20",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"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",
diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml
index ffc94e97de..94391c4544 100644
--- a/samples/client/petstore/java/jersey2/pom.xml
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -257,7 +255,7 @@
UTF-8
- 1.5.20
+ 1.5.21
2.27
2.8.9
2.6.4
diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle
index 8afb2af188..b9eb1e177e 100644
--- a/samples/client/petstore/java/rest-assured/build.gradle
+++ b/samples/client/petstore/java/rest-assured/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.15"
+ swagger_annotations_version = "1.5.21"
rest_assured_version = "3.1.0"
junit_version = "4.12"
gson_version = "2.6.1"
diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt
index a57bc62b67..eb61e74a89 100644
--- a/samples/client/petstore/java/rest-assured/build.sbt
+++ b/samples/client/petstore/java/rest-assured/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
- "io.swagger" % "swagger-annotations" % "1.5.15",
+ "io.swagger" % "swagger-annotations" % "1.5.21",
"io.rest-assured" % "scala-support" % "3.1.0",
"com.google.code.gson" % "gson" % "2.6.1",
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile",
diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml
index 4ed742e465..ed7f35ac02 100644
--- a/samples/client/petstore/java/rest-assured/pom.xml
+++ b/samples/client/petstore/java/rest-assured/pom.xml
@@ -113,8 +113,7 @@
-
- src/main/java
+ src/main/java
@@ -126,8 +125,7 @@
-
- src/test/java
+ src/test/java
@@ -199,7 +197,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
io.rest-assured
@@ -236,7 +234,7 @@
UTF-8
- 1.5.15
+ 1.5.21
3.1.0
2.6.1
1.8.2
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
index ffe295db73..de50c2bb94 100644
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -95,8 +95,7 @@
-
- src/main/java
+ src/main/java
@@ -108,8 +107,7 @@
-
- src/test/java
+ src/test/java
@@ -143,7 +141,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -215,7 +213,7 @@
UTF-8
- 1.5.18
+ 1.5.21
3.1.3.Final
2.8.6
2.6.4
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index 1d6787e3db..6448e545d5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml
index e8c5b512c7..74cc0d02f0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/pom.xml
+++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -255,7 +253,7 @@
UTF-8
- 1.5.17
+ 1.5.21
4.3.9.RELEASE
2.8.9
2.6.4
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index a6de57bd8c..1732501800 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml
index 9869bad196..d3a526022d 100644
--- a/samples/client/petstore/java/resttemplate/pom.xml
+++ b/samples/client/petstore/java/resttemplate/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -247,7 +245,7 @@
UTF-8
- 1.5.17
+ 1.5.21
4.3.9.RELEASE
2.8.9
2.6.4
diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle
index fb1371f1f3..124982e859 100644
--- a/samples/client/petstore/java/retrofit/build.gradle
+++ b/samples/client/petstore/java/retrofit/build.gradle
@@ -97,7 +97,7 @@ ext {
okhttp_version = "2.7.5"
oltu_version = "1.0.1"
retrofit_version = "1.9.0"
- swagger_annotations_version = "1.5.8"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
jodatime_version = "2.9.3"
}
diff --git a/samples/client/petstore/java/retrofit/build.sbt b/samples/client/petstore/java/retrofit/build.sbt
index 44fb828418..cedb083de9 100644
--- a/samples/client/petstore/java/retrofit/build.sbt
+++ b/samples/client/petstore/java/retrofit/build.sbt
@@ -11,7 +11,7 @@ lazy val root = (project in file(".")).
libraryDependencies ++= Seq(
"com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
"com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"joda-time" % "joda-time" % "2.9.3" % "compile",
"junit" % "junit" % "4.12" % "test",
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
index 1373ec6264..3f6dfee60f 100644
--- a/samples/client/petstore/java/retrofit/pom.xml
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit
@@ -222,8 +220,6 @@
joda-time
${jodatime-version}
-
-
junit
@@ -234,7 +230,7 @@
UTF-8
- 1.5.18
+ 1.5.21
1.9.0
2.7.5
2.9.9
diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
index 714331ea31..667a9b283e 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play24/build.gradle
@@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0"
jackson_version = "2.6.6"
play_version = "2.4.11"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
json_fire_version = "1.8.0"
}
diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt
index d754ac539e..ef9a3ad810 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play24/build.sbt
@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test",
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index 0ebc809261..e73282392c 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -224,7 +222,6 @@
gson-fire
${gson-fire-version}
-
com.squareup.retrofit2
@@ -251,15 +248,11 @@
jackson-datatype-jsr310
${jackson-version}
-
com.typesafe.play
play-java-ws_2.11
${play-version}
-
-
-
junit
@@ -274,9 +267,9 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
- 2.6.6
- 2.4.11
+ 1.5.21
+ 2.6.6
+ 2.4.11
2.3.0
1.0.1
4.12
diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
index 8197e91599..201ad458bb 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play25/build.gradle
@@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0"
jackson_version = "2.7.8"
play_version = "2.5.14"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
threetenbp_version = "1.3.5"
json_fire_version = "1.8.0"
diff --git a/samples/client/petstore/java/retrofit2-play25/build.sbt b/samples/client/petstore/java/retrofit2-play25/build.sbt
index 49e5cc4d0e..1f17d6bfc9 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play25/build.sbt
@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
index e26afdebc7..4051b0036d 100644
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -229,7 +227,6 @@
threetenbp
${threetenbp-version}
-
com.squareup.retrofit2
@@ -256,15 +253,11 @@
jackson-datatype-jsr310
${jackson-version}
-
com.typesafe.play
play-java-ws_2.11
${play-version}
-
-
-
junit
@@ -279,11 +272,11 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
- 2.7.8
- 2.5.15
+ 1.5.21
+ 2.7.8
+ 2.5.15
2.3.0
- 1.3.5
+ 1.3.5
1.0.1
4.12
diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle
index e24d5f0643..dd9ded7db0 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play26/build.gradle
@@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0"
jackson_version = "2.8.10"
play_version = "2.6.7"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
threetenbp_version = "1.3.5"
json_fire_version = "1.8.0"
diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt
index 8a5dfc447b..6ef49aa26d 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play26/build.sbt
@@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.10" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml
index 338ae2c35f..6957bc7ec6 100644
--- a/samples/client/petstore/java/retrofit2-play26/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -229,7 +227,6 @@
threetenbp
${threetenbp-version}
-
com.squareup.retrofit2
@@ -256,7 +253,6 @@
jackson-datatype-jsr310
${jackson-version}
-
com.typesafe.play
play-ahc-ws_2.12
@@ -267,9 +263,6 @@
validation-api
1.1.0.Final
-
-
-
junit
@@ -284,11 +277,11 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
- 2.8.10
- 2.6.7
+ 1.5.21
+ 2.8.10
+ 2.6.7
2.3.0
- 1.3.5
+ 1.3.5
1.0.1
4.12
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index f4017a3f71..5b2dbdafa3 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext {
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
threetenbp_version = "1.3.5"
json_fire_version = "1.8.0"
diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt
index ef3a285ecb..32ae300614 100644
--- a/samples/client/petstore/java/retrofit2/build.sbt
+++ b/samples/client/petstore/java/retrofit2/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index eefa92c58a..6cba3499f5 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -229,9 +227,6 @@
threetenbp
${threetenbp-version}
-
-
-
junit
@@ -246,9 +241,9 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
+ 1.5.21
2.3.0
- 1.3.5
+ 1.3.5
1.0.1
4.12
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index 79af8dae49..9ea182cc72 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext {
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
rx_java_version = "1.3.0"
threetenbp_version = "1.3.5"
diff --git a/samples/client/petstore/java/retrofit2rx/build.sbt b/samples/client/petstore/java/retrofit2rx/build.sbt
index 023b614314..1cabf93331 100644
--- a/samples/client/petstore/java/retrofit2rx/build.sbt
+++ b/samples/client/petstore/java/retrofit2rx/build.sbt
@@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
"io.reactivex" % "rxjava" % "1.3.0" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index d438ede5b4..d764b2112d 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -239,9 +237,6 @@
adapter-rxjava
${retrofit-version}
-
-
-
junit
@@ -256,10 +251,10 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
+ 1.5.21
2.3.0
- 1.3.0
- 1.3.5
+ 1.3.0
+ 1.3.5
1.0.1
4.12
diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle
index fc7fcf23f4..44233fa581 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx2/build.gradle
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext {
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
junit_version = "4.12"
rx_java_version = "2.1.1"
threetenbp_version = "1.3.5"
diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt
index 7385685986..fbdee2f168 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.sbt
+++ b/samples/client/petstore/java/retrofit2rx2/build.sbt
@@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
- "io.swagger" % "swagger-annotations" % "1.5.17" % "compile",
+ "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index 0ffd258fae..316cedb4f2 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -191,7 +189,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
com.squareup.retrofit2
@@ -239,9 +237,6 @@
adapter-rxjava2
${retrofit-version}
-
-
-
junit
@@ -256,10 +251,10 @@
${java.version}
${java.version}
1.8.0
- 1.5.18
+ 1.5.21
2.3.0
- 2.1.1
- 1.3.5
+ 2.1.1
+ 1.3.5
1.0.1
4.12
diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle
index b10a98e8f1..d55ccac8c3 100644
--- a/samples/client/petstore/java/vertx/build.gradle
+++ b/samples/client/petstore/java/vertx/build.gradle
@@ -26,7 +26,7 @@ task execute(type:JavaExec) {
}
ext {
- swagger_annotations_version = "1.5.17"
+ swagger_annotations_version = "1.5.21"
jackson_version = "2.6.4"
vertx_version = "3.4.2"
junit_version = "4.12"
diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml
index a7e7b8bb4c..754d4660ca 100644
--- a/samples/client/petstore/java/vertx/pom.xml
+++ b/samples/client/petstore/java/vertx/pom.xml
@@ -114,8 +114,7 @@
-
- src/main/java
+ src/main/java
@@ -127,8 +126,7 @@
-
- src/test/java
+ src/test/java
@@ -200,7 +198,7 @@
io.swagger
swagger-annotations
- ${swagger-core-version}
+ ${swagger-annotations-version}
@@ -260,7 +258,7 @@
UTF-8
3.4.2
- 1.5.18
+ 1.5.21
2.6.4
4.12