From 9286e261629daed5a4ecbdd6684f0dc78f537e45 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Fri, 16 Jun 2017 11:49:32 -0700
Subject: [PATCH 1/2] updated versions

---
 .../src/main/resources/Java/libraries/feign/pom.mustache      | 2 +-
 .../src/main/resources/Java/libraries/jersey2/pom.mustache    | 2 +-
 .../main/resources/Java/libraries/okhttp-gson/pom.mustache    | 2 +-
 .../src/main/resources/Java/libraries/retrofit/pom.mustache   | 2 +-
 .../resources/Java/libraries/retrofit2/build.gradle.mustache  | 2 +-
 .../resources/Java/libraries/retrofit2/build.sbt.mustache     | 2 +-
 .../src/main/resources/Java/libraries/retrofit2/pom.mustache  | 2 +-
 .../src/main/resources/JavaInflector/pom.mustache             | 2 +-
 .../src/main/resources/JavaJaxRS/cxf/pom.mustache             | 2 +-
 .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache      | 2 +-
 .../main/resources/JavaJaxRS/libraries/jersey1/pom.mustache   | 2 +-
 .../swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache | 2 +-
 .../src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache    | 2 +-
 .../src/main/resources/JavaJaxRS/resteasy/pom.mustache        | 2 +-
 .../resources/JavaSpring/libraries/spring-cloud/pom.mustache  | 2 +-
 modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache | 2 +-
 .../src/main/resources/akka-scala/pom.mustache                | 2 +-
 .../swagger-codegen/src/main/resources/android/pom.mustache   | 2 +-
 modules/swagger-codegen/src/main/resources/scala/pom.mustache | 2 +-
 pom.xml                                                       | 4 ++--
 pom.xml.circleci                                              | 2 +-
 .../client/petstore-security-test/java/okhttp-gson/pom.xml    | 2 +-
 samples/client/petstore-security-test/scala/pom.xml           | 2 +-
 samples/client/petstore/akka-scala/pom.xml                    | 2 +-
 samples/client/petstore/android/httpclient/pom.xml            | 2 +-
 samples/client/petstore/java/feign/pom.xml                    | 2 +-
 samples/client/petstore/java/jersey2-java6/pom.xml            | 2 +-
 samples/client/petstore/java/jersey2-java8/pom.xml            | 2 +-
 samples/client/petstore/java/jersey2/pom.xml                  | 2 +-
 .../client/petstore/java/okhttp-gson-parcelableModel/pom.xml  | 2 +-
 samples/client/petstore/java/okhttp-gson/pom.xml              | 2 +-
 samples/client/petstore/java/retrofit/pom.xml                 | 2 +-
 samples/client/petstore/java/retrofit2-play24/pom.xml         | 2 +-
 samples/client/petstore/java/retrofit2/pom.xml                | 2 +-
 samples/client/petstore/java/retrofit2rx/pom.xml              | 2 +-
 samples/client/petstore/java/retrofit2rx2/pom.xml             | 2 +-
 samples/client/petstore/jaxrs-cxf-client/pom.xml              | 2 +-
 samples/client/petstore/jaxrs-cxf/pom.xml                     | 2 +-
 samples/client/petstore/scala/pom.xml                         | 2 +-
 samples/client/petstore/spring-cloud/pom.xml                  | 2 +-
 samples/server/petstore/java-inflector/pom.xml                | 2 +-
 samples/server/petstore/java-msf4j/pom.xml                    | 2 +-
 samples/server/petstore/jaxrs-cxf/pom.xml                     | 2 +-
 samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml       | 2 +-
 samples/server/petstore/jaxrs-resteasy/eap/pom.xml            | 2 +-
 samples/server/petstore/jaxrs/jersey1/pom.xml                 | 2 +-
 samples/server/petstore/jaxrs/jersey2/pom.xml                 | 2 +-
 47 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
index 7c05b94ca3e..98aaf188558 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@@ -247,7 +247,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <feign-version>9.4.0</feign-version>
     <feign-form-version>2.1.0</feign-form-version>
     <jackson-version>2.8.7</jackson-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
index d4d043bb0fa..c2193af18eb 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -271,7 +271,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-version>2.22.2</jersey-version>
     <jackson-version>2.7.5</jackson-version>
     {{^java8}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index d8086d4550f..b1c9d69ed54 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -239,7 +239,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
index 13f1ac3282b..a33360e3b2f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -222,7 +222,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.7.5</okhttp-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index b0f88ae54ee..b9a7fde1a57 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -109,7 +109,7 @@ ext {
     jackson_version = "2.7.5"
     play_version = "2.4.11"
     {{/usePlay24WS}}
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
     {{#useRxJava}}
     rx_java_version = "1.2.9"
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index e5c7f5af221..0888bea465d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -32,7 +32,7 @@ lazy val root = (project in file(".")).
       "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
       "io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile",
       {{/useRxJava2}}
-      "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.15" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       {{^java8}}
       "joda-time" % "joda-time" % "2.9.4" % "compile",
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 92002db838e..5e1d6999360 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -283,7 +283,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     {{#usePlay24WS}}
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
index 1cd3be1a531..15fc98b2cb6 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -119,7 +119,7 @@
     </repositories>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-inflector-version>1.0.11</swagger-inflector-version>
+        <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
index cea4bea9134..b9d4188be75 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -178,7 +178,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
index ec2559bd6db..03f56a5d236 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -229,7 +229,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
index 4ac349ef1f0..bf58a208a1f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
@@ -191,7 +191,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.19.1</jersey-version>
     <jackson-version>2.8.7</jackson-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
index a28823d5858..b0f5c23bb01 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -188,7 +188,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.8.7</jackson-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
index 7b7107f197a..3f855bd2eda 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
@@ -174,7 +174,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
index c9ed5939322..eba7922cb2f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -159,7 +159,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index b79762090a9..3f53b76061a 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -9,7 +9,7 @@
         <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
index 743aca536a8..2c890843eac 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@@ -75,7 +75,7 @@
     <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
index 8e2790095b1..3a5c4d0e036 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
@@ -216,7 +216,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/android/pom.mustache b/modules/swagger-codegen/src/main/resources/android/pom.mustache
index c4c4e3a5b9d..a7bb0ad4b30 100644
--- a/modules/swagger-codegen/src/main/resources/android/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/pom.mustache
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
index 11331dce41d..4d52c3ae2ef 100644
--- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
@@ -215,7 +215,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/pom.xml b/pom.xml
index afa94fd6d1f..5be36e059f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -887,10 +887,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.29</swagger-parser-version>
+        <swagger-parser-version>1.0.30</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>
diff --git a/pom.xml.circleci b/pom.xml.circleci
index 00cb33bc6c5..2a76fe27225 100644
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@@ -900,7 +900,7 @@
         <swagger-parser-version>1.0.28</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
index 9ab87a8691c..dbd7942c973 100644
--- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
@@ -206,7 +206,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/samples/client/petstore-security-test/scala/pom.xml b/samples/client/petstore-security-test/scala/pom.xml
index a54aac0067d..53980f82fc1 100644
--- a/samples/client/petstore-security-test/scala/pom.xml
+++ b/samples/client/petstore-security-test/scala/pom.xml
@@ -215,7 +215,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml
index 5593f09884a..c989c009f4d 100644
--- a/samples/client/petstore/akka-scala/pom.xml
+++ b/samples/client/petstore/akka-scala/pom.xml
@@ -216,7 +216,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml
index 75ef31f534d..caa541789be 100644
--- a/samples/client/petstore/android/httpclient/pom.xml
+++ b/samples/client/petstore/android/httpclient/pom.xml
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index afc858fcab8..165ceec4c9d 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -247,7 +247,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <feign-version>9.4.0</feign-version>
     <feign-form-version>2.1.0</feign-form-version>
     <jackson-version>2.8.7</jackson-version>
diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml
index 375f01b23de..f56f3947882 100644
--- a/samples/client/petstore/java/jersey2-java6/pom.xml
+++ b/samples/client/petstore/java/jersey2-java6/pom.xml
@@ -254,7 +254,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-version>2.22.2</jersey-version>
     <jackson-version>2.7.5</jackson-version>
     <jodatime-version>2.9.4</jodatime-version>
diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml
index 1f8805518bc..c8d29ad89de 100644
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -238,7 +238,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-version>2.22.2</jersey-version>
     <jackson-version>2.7.5</jackson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml
index fbf552cc133..a2c45727dd6 100644
--- a/samples/client/petstore/java/jersey2/pom.xml
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -243,7 +243,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-version>2.22.2</jersey-version>
     <jackson-version>2.7.5</jackson-version>
     <jodatime-version>2.9.4</jodatime-version>
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
index 751d978c946..6dae3554881 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -213,7 +213,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 26751c4e3af..6dc312c25e1 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -206,7 +206,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
index cb50ddea34d..17c2d00fb59 100644
--- a/samples/client/petstore/java/retrofit/pom.xml
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -213,7 +213,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.7.5</okhttp-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index 6693f615e65..5a121dae152 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -246,7 +246,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
     <retrofit-version>2.2.0</retrofit-version>
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index ee302c6300d..6d8d5036d2b 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -215,7 +215,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <retrofit-version>2.2.0</retrofit-version>
     <jodatime-version>2.9.4</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 1498dc252f8..3eb4087ef0d 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -225,7 +225,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <retrofit-version>2.2.0</retrofit-version>
     <rxjava-version>1.2.9</rxjava-version>
     <jodatime-version>2.9.4</jodatime-version>
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index 34d054b1fdc..555738a751e 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -225,7 +225,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <retrofit-version>2.2.0</retrofit-version>
     <rxjava-version>2.0.7</rxjava-version>
     <jodatime-version>2.9.4</jodatime-version>
diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml
index aec8f7cf37e..b1d74fe3c16 100644
--- a/samples/client/petstore/jaxrs-cxf-client/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@@ -184,7 +184,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml
index 6d5cf8442e7..041815ff47c 100644
--- a/samples/client/petstore/jaxrs-cxf/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf/pom.xml
@@ -162,7 +162,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index a54aac0067d..53980f82fc1 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -215,7 +215,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml
index 31299a7e810..f8e3b2b1e33 100644
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@@ -9,7 +9,7 @@
         <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.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index d93b5e8a6c5..44de07b8dfa 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -111,7 +111,7 @@
     </repositories>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-inflector-version>1.0.4</swagger-inflector-version>
+        <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml
index b1145335c66..511883af0bd 100644
--- a/samples/server/petstore/java-msf4j/pom.xml
+++ b/samples/server/petstore/java-msf4j/pom.xml
@@ -92,7 +92,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
index 59b8b3545d8..1410437f424 100644
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -184,7 +184,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
index 5a1e46c3fe4..0155af16b22 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
@@ -163,7 +163,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
index 762c0ccf7b9..a760e1662ea 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
@@ -158,7 +158,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml
index feaca47dd95..b1516889769 100644
--- a/samples/server/petstore/jaxrs/jersey1/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey1/pom.xml
@@ -189,7 +189,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.19.1</jersey-version>
     <jackson-version>2.8.7</jackson-version>
diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml
index 39125b0a9b2..287ab883220 100644
--- a/samples/server/petstore/jaxrs/jersey2/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey2/pom.xml
@@ -173,7 +173,7 @@
     <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.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.8.7</jackson-version>

From 8237e491ac7860d1e172588d702236f84e1cd91b Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Mon, 26 Jun 2017 13:10:31 -0700
Subject: [PATCH 2/2] fixed order of checking

---
 .../src/main/java/io/swagger/codegen/DefaultCodegen.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 49ea0d4bb5f..3f91eaae98a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1123,8 +1123,6 @@ public class DefaultCodegen {
         String datatype = null;
         if (p instanceof StringProperty && "number".equals(p.getFormat())) {
             datatype = "BigDecimal";
-        } else if (p instanceof StringProperty) {
-            datatype = "string";
         } else if (p instanceof ByteArrayProperty) {
             datatype = "ByteArray";
         } else if (p instanceof BinaryProperty) {
@@ -1163,6 +1161,8 @@ public class DefaultCodegen {
                 datatype = "Object";
                 LOGGER.error(e.getMessage(), e);
             }
+        } else if (p instanceof StringProperty) {
+            datatype = "string";
         } else {
             if (p != null) {
                 datatype = p.getType();