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

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

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"

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",

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: Netflix Feign -->
@@ -294,12 +292,12 @@
         <java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <feign-version>9.4.0</feign-version>
         <feign-form-version>2.1.0</feign-form-version>
         <jackson-version>2.8.9</jackson-version>
         {{#threetenbp}}
-            <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
+        <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         {{/threetenbp}}
         <junit-version>4.12</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>

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"

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",

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -287,15 +285,15 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <google-api-client-version>1.23.0</google-api-client-version>
         <jersey-common-version>2.25.1</jersey-common-version>
         <jackson-version>2.8.9</jackson-version>
         {{#joda}}
-            <jodatime-version>2.9.9</jodatime-version>
+        <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
         {{#threetenbp}}
-            <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
+        <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         {{/threetenbp}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>

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"

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}},

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -212,7 +210,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: jersey-client -->
@@ -318,7 +316,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         {{^supportJava6}}
         <jersey-version>2.27</jersey-version>
         {{/supportJava6}}

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"

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",

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

@@ -113,8 +113,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -126,8 +125,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -199,7 +197,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
@@ -245,7 +243,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.15</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <rest-assured.version>3.1.0</rest-assured.version>
         <gson-version>2.6.1</gson-version>
         <gson-fire-version>1.8.2</gson-fire-version>

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

@@ -95,8 +95,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -108,8 +107,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -155,7 +153,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <!-- HTTP client: jersey-client -->
         <dependency>
@@ -259,7 +257,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
         <jackson-version>2.8.6</jackson-version>
         <threetenbp-version>2.6.4</threetenbp-version>

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"

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -290,7 +288,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
         <jackson-version>2.8.9</jackson-version>
         {{#joda}}

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}}

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}}

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -212,7 +210,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit</groupId>
@@ -241,17 +239,15 @@
             <version>${threetenbp-version}</version>
         </dependency>
         {{/threetenbp}}
-
         {{#parcelableModel}}
-            <!-- Needed for Parcelable support-->
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android</artifactId>
-                <version>4.1.1.4</version>
-                <scope>provided</scope>
-            </dependency>
+        <!-- Needed for Parcelable support-->
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <version>4.1.1.4</version>
+            <scope>provided</scope>
+        </dependency>
         {{/parcelableModel}}
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -262,7 +258,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <retrofit-version>1.9.0</retrofit-version>
         <okhttp-version>2.7.5</okhttp-version>
         <jodatime-version>2.9.9</jodatime-version>

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"

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",

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -262,7 +260,6 @@
                 <version>${retrofit-version}</version>
             </dependency>
         {{/useRxJava2}}
-
         {{#usePlayWS}}
             <!-- JSON processing: jackson -->
             <dependency>
@@ -291,16 +288,13 @@
                 <version>${jackson-version}</version>
             </dependency>
             {{#withXml}}
-
                 <!-- XML processing: Jackson -->
                 <dependency>
                     <groupId>com.fasterxml.jackson.dataformat</groupId>
                     <artifactId>jackson-dataformat-xml</artifactId>
                     <version>${jackson-version}</version>
                 </dependency>
-
             {{/withXml}}
-
             {{#play24}}
             <dependency>
                 <groupId>com.typesafe.play</groupId>
@@ -327,9 +321,7 @@
                 <version>1.1.0.Final</version>
             </dependency>
             {{/play26}}
-
         {{/usePlayWS}}
-
         {{#parcelableModel}}
             <!-- Needed for Parcelable support-->
             <dependency>
@@ -339,7 +331,6 @@
                 <scope>provided</scope>
             </dependency>
         {{/parcelableModel}}
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -354,33 +345,33 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         {{#usePlayWS}}
-            {{#play24}}
-                <jackson-version>2.6.6</jackson-version>
-                <play-version>2.4.11</play-version>
-            {{/play24}}
-            {{#play25}}
-                <jackson-version>2.7.8</jackson-version>
-                <play-version>2.5.15</play-version>
-            {{/play25}}
-            {{#play26}}
-                <jackson-version>2.8.10</jackson-version>
-                <play-version>2.6.7</play-version>
-            {{/play26}}
+        {{#play24}}
+        <jackson-version>2.6.6</jackson-version>
+        <play-version>2.4.11</play-version>
+        {{/play24}}
+        {{#play25}}
+        <jackson-version>2.7.8</jackson-version>
+        <play-version>2.5.15</play-version>
+        {{/play25}}
+        {{#play26}}
+        <jackson-version>2.8.10</jackson-version>
+        <play-version>2.6.7</play-version>
+        {{/play26}}
         {{/usePlayWS}}
         <retrofit-version>2.3.0</retrofit-version>
         {{#useRxJava}}
-            <rxjava-version>1.3.0</rxjava-version>
+        <rxjava-version>1.3.0</rxjava-version>
         {{/useRxJava}}
         {{#useRxJava2}}
-            <rxjava-version>2.1.1</rxjava-version>
+        <rxjava-version>2.1.1</rxjava-version>
         {{/useRxJava2}}
         {{#joda}}
-            <jodatime-version>2.9.9</jodatime-version>
+        <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
         {{#threetenbp}}
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         {{/threetenbp}}
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>

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"

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- Vertx -->
@@ -271,7 +269,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx-version>3.4.2</vertx-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jackson-version>{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
         <junit-version>4.12</junit-version>
     </properties>

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -327,7 +325,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>1.19.4</jersey-version>
         {{#supportJava6}}
         <commons_io_version>2.5</commons_io_version>

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"

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",

samples/client/petstore/java/feign/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: Netflix Feign -->
@@ -268,11 +266,11 @@
         <java.version>1.7</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <feign-version>9.4.0</feign-version>
         <feign-form-version>2.1.0</feign-form-version>
         <jackson-version>2.8.9</jackson-version>
-            <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
+        <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         <junit-version>4.12</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <oltu-version>1.0.1</oltu-version>

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"

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",

samples/client/petstore/java/google-api-client/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -246,11 +244,11 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <google-api-client-version>1.23.0</google-api-client-version>
         <jersey-common-version>2.25.1</jersey-common-version>
         <jackson-version>2.8.9</jackson-version>
-            <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
+        <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

samples/client/petstore/java/jersey1/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -257,7 +255,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>1.19.4</jersey-version>
         <jackson-version>2.6.4</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>

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",

samples/client/petstore/java/jersey2-java6/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: jersey-client -->
@@ -267,7 +265,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>2.6</jersey-version>
         <commons_io_version>2.5</commons_io_version>
         <commons_lang3_version>3.6</commons_lang3_version>

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"

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",

samples/client/petstore/java/jersey2-java8/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: jersey-client -->
@@ -251,7 +249,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>2.27</jersey-version>
         <jackson-version>2.8.9</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>

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"

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",

samples/client/petstore/java/jersey2/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- HTTP client: jersey-client -->
@@ -257,7 +255,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>2.27</jersey-version>
         <jackson-version>2.8.9</jackson-version>
         <threetenbp-version>2.6.4</threetenbp-version>

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"

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",

samples/client/petstore/java/rest-assured/pom.xml

@@ -113,8 +113,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -126,8 +125,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -199,7 +197,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
@@ -236,7 +234,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.15</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <rest-assured.version>3.1.0</rest-assured.version>
         <gson-version>2.6.1</gson-version>
         <gson-fire-version>1.8.2</gson-fire-version>

samples/client/petstore/java/resteasy/pom.xml

@@ -95,8 +95,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -108,8 +107,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -143,7 +141,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <!-- HTTP client: jersey-client -->
         <dependency>
@@ -215,7 +213,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
         <jackson-version>2.8.6</jackson-version>
         <threetenbp-version>2.6.4</threetenbp-version>

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"

samples/client/petstore/java/resttemplate-withXml/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -255,7 +253,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
         <jackson-version>2.8.9</jackson-version>
         <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

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"

samples/client/petstore/java/resttemplate/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -247,7 +245,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
         <jackson-version>2.8.9</jackson-version>
         <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

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"
 }

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",

samples/client/petstore/java/retrofit/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit</groupId>
@@ -222,8 +220,6 @@
             <artifactId>joda-time</artifactId>
             <version>${jodatime-version}</version>
         </dependency>
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -234,7 +230,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <retrofit-version>1.9.0</retrofit-version>
         <okhttp-version>2.7.5</okhttp-version>
         <jodatime-version>2.9.9</jodatime-version>

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"
 }

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",

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

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -224,7 +222,6 @@
             <artifactId>gson-fire</artifactId>
             <version>${gson-fire-version}</version>
         </dependency>
-
             <!-- JSON processing: jackson -->
             <dependency>
                 <groupId>com.squareup.retrofit2</groupId>
@@ -251,15 +248,11 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.typesafe.play</groupId>
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -274,9 +267,9 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
-                <jackson-version>2.6.6</jackson-version>
-                <play-version>2.4.11</play-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        <jackson-version>2.6.6</jackson-version>
+        <play-version>2.4.11</play-version>
         <retrofit-version>2.3.0</retrofit-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>

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"

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",

samples/client/petstore/java/retrofit2-play25/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -229,7 +227,6 @@
                 <artifactId>threetenbp</artifactId>
                 <version>${threetenbp-version}</version>
             </dependency>
-
             <!-- JSON processing: jackson -->
             <dependency>
                 <groupId>com.squareup.retrofit2</groupId>
@@ -256,15 +253,11 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.typesafe.play</groupId>
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -279,11 +272,11 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
-                <jackson-version>2.7.8</jackson-version>
-                <play-version>2.5.15</play-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        <jackson-version>2.7.8</jackson-version>
+        <play-version>2.5.15</play-version>
         <retrofit-version>2.3.0</retrofit-version>
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>

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"

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",

samples/client/petstore/java/retrofit2-play26/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -229,7 +227,6 @@
                 <artifactId>threetenbp</artifactId>
                 <version>${threetenbp-version}</version>
             </dependency>
-
             <!-- JSON processing: jackson -->
             <dependency>
                 <groupId>com.squareup.retrofit2</groupId>
@@ -256,7 +253,6 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.typesafe.play</groupId>
                 <artifactId>play-ahc-ws_2.12</artifactId>
@@ -267,9 +263,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -284,11 +277,11 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
-                <jackson-version>2.8.10</jackson-version>
-                <play-version>2.6.7</play-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        <jackson-version>2.8.10</jackson-version>
+        <play-version>2.6.7</play-version>
         <retrofit-version>2.3.0</retrofit-version>
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>

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"

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",

samples/client/petstore/java/retrofit2/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -229,9 +227,6 @@
                 <artifactId>threetenbp</artifactId>
                 <version>${threetenbp-version}</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -246,9 +241,9 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <retrofit-version>2.3.0</retrofit-version>
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>

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"

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",

samples/client/petstore/java/retrofit2rx/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -239,9 +237,6 @@
                 <artifactId>adapter-rxjava</artifactId>
                 <version>${retrofit-version}</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -256,10 +251,10 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <retrofit-version>2.3.0</retrofit-version>
-            <rxjava-version>1.3.0</rxjava-version>
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <rxjava-version>1.3.0</rxjava-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>

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"

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",

samples/client/petstore/java/retrofit2rx2/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -191,7 +189,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
@@ -239,9 +237,6 @@
                 <artifactId>adapter-rxjava2</artifactId>
                 <version>${retrofit-version}</version>
             </dependency>
-
-
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -256,10 +251,10 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.0</gson-fire-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <retrofit-version>2.3.0</retrofit-version>
-            <rxjava-version>2.1.1</rxjava-version>
-            <threetenbp-version>1.3.5</threetenbp-version>
+        <rxjava-version>2.1.1</rxjava-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>

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"

samples/client/petstore/java/vertx/pom.xml

@@ -114,8 +114,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/main/java</source>
+                                <source>src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -127,8 +126,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>
-                                src/test/java</source>
+                                <source>src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,7 +198,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
+            <version>${swagger-annotations-version}</version>
         </dependency>
 
         <!-- Vertx -->
@@ -260,7 +258,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx-version>3.4.2</vertx-version>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jackson-version>2.6.4</jackson-version>
         <junit-version>4.12</junit-version>
     </properties>