diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index b8d24109f04..3b8cea940a1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -60,7 +60,7 @@ public JavaClientCodegen() {
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
 
         supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.1. JSON processing: Jackson 2.7.0. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put("feign", "HTTP client: Netflix Feign 8.16.0. JSON processing: Jackson 2.7.0");
+        supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.7");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.22.2. JSON processing: Jackson 2.7.0");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.6.2. Enable Parcelable modles on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 0ea9d62f542..c969ed307a9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.9"
-    jackson_version = "2.7.5"
-    feign_version = "8.17.0"
-    feign_form_version = "2.0.2"
+    jackson_version = "2.8.7"
+    feign_version = "9.4.0"
+    feign_form_version = "2.1.0"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
index d0270a99b59..c2d771961a0 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
-      "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
-      "com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
-      "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
-      "io.github.openfeign.form" % "feign-form" % "2.0.2" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.7.5" % "compile",
+      "com.netflix.feign" % "feign-core" % "9.4.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
+      "com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.8.7" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "junit" % "junit" % "4.12" % "test",
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 584466ed695..da5eb7f93ab 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
@@ -176,17 +176,17 @@
 
     <!-- HTTP client: Netflix Feign -->
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-core</artifactId>
         <version>${feign-version}</version>
     </dependency>
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-jackson</artifactId>
         <version>${feign-version}</version>
     </dependency>
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-slf4j</artifactId>
         <version>${feign-version}</version>
     </dependency>
@@ -236,9 +236,9 @@
     <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>
-    <feign-version>8.17.0</feign-version>
-    <feign-form-version>2.0.2</feign-form-version>
-    <jackson-version>2.7.5</jackson-version>
+    <feign-version>9.4.0</feign-version>
+    <feign-form-version>2.1.0</feign-form-version>
+    <jackson-version>2.8.7</jackson-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.1</oltu-version>
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index 0e13c2381b2..4372273e208 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.9"
-    jackson_version = "2.7.5"
-    feign_version = "8.17.0"
-    feign_form_version = "2.0.2"
+    jackson_version = "2.8.7"
+    feign_version = "9.4.0"
+    feign_form_version = "2.1.0"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }
diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt
index dd67e3e7298..3037da434d8 100644
--- a/samples/client/petstore/java/feign/build.sbt
+++ b/samples/client/petstore/java/feign/build.sbt
@@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
-      "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
-      "com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
-      "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
-      "io.github.openfeign.form" % "feign-form" % "2.0.2" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile",
+      "com.netflix.feign" % "feign-core" % "9.4.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
+      "com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "junit" % "junit" % "4.12" % "test",
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index b8b7c6d85a0..37d2b96f4fa 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -176,17 +176,17 @@
 
     <!-- HTTP client: Netflix Feign -->
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-core</artifactId>
         <version>${feign-version}</version>
     </dependency>
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-jackson</artifactId>
         <version>${feign-version}</version>
     </dependency>
     <dependency>
-        <groupId>com.netflix.feign</groupId>
+        <groupId>io.github.openfeign</groupId>
         <artifactId>feign-slf4j</artifactId>
         <version>${feign-version}</version>
     </dependency>
@@ -236,9 +236,9 @@
     <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>
-    <feign-version>8.17.0</feign-version>
-    <feign-form-version>2.0.2</feign-form-version>
-    <jackson-version>2.7.5</jackson-version>
+    <feign-version>9.4.0</feign-version>
+    <feign-form-version>2.1.0</feign-form-version>
+    <jackson-version>2.8.7</jackson-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.1</oltu-version>