Merge branch 'zhenjun115-issue3051'

Author: wing328

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache

@@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.8"
+    swagger_annotations_version = "1.5.9"
     jackson_version = "2.7.5"
-    feign_version = "8.16.0"
+    feign_version = "8.17.0"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache

@@ -9,9 +9,9 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
       "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
-      "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
       "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",

modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

@@ -160,8 +160,8 @@
     <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.8</swagger-core-version>
-    <feign-version>8.16.0</feign-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
+    <feign-version>8.17.0</feign-version>
     <jackson-version>2.7.5</jackson-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>

samples/client/petstore/java/feign/build.gradle

@@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.8"
+    swagger_annotations_version = "1.5.9"
     jackson_version = "2.7.5"
-    feign_version = "8.16.0"
+    feign_version = "8.17.0"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }

samples/client/petstore/java/feign/build.sbt

@@ -9,9 +9,9 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
       "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
-      "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
       "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",

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

@@ -160,8 +160,8 @@
     <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.8</swagger-core-version>
-    <feign-version>8.16.0</feign-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
+    <feign-version>8.17.0</feign-version>
     <jackson-version>2.7.5</jackson-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>