diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
index 9110e16a16f..a86e1b08d1d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
@@ -2,6 +2,7 @@ package {{invokerPackage}}.auth;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Date;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -92,7 +93,7 @@ public class OAuth implements RequestInterceptor {
         try {
             accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
         } catch (Exception e) {
-            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
+            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, (Date) null, template.request());
         }
         if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
             setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache
index 25e2c25e563..c4a495d7179 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache
@@ -19,7 +19,7 @@ ext {
     {{#threetenbp}}
     threepane_version = "2.6.4"
     {{/threetenbp}}
-    feign_version = "11.6"
+    feign_version = "13.5"
     feign_form_version = "3.8.0"
     junit_version = "4.13.1"
     oltu_version = "1.0.1"
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 2ea7316817f..1be1788f841 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
@@ -319,7 +319,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <swagger-core-version>1.5.24</swagger-core-version>
-        <feign-version>11.6</feign-version>
+        <feign-version>13.5</feign-version>
         <feign-form-version>3.8.0</feign-form-version>
         <jackson-version>2.15.2</jackson-version>
         {{#threetenbp}}
diff --git a/samples/client/petstore/java/feign/.swagger-codegen/VERSION b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
index fdda2b0f1ca..d6a8e234502 100644
--- a/samples/client/petstore/java/feign/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.38-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 396d24d3f81..80e6e1d61de 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -269,7 +269,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <swagger-core-version>1.5.24</swagger-core-version>
-        <feign-version>11.6</feign-version>
+        <feign-version>13.5</feign-version>
         <feign-form-version>3.8.0</feign-form-version>
         <jackson-version>2.15.2</jackson-version>
             <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
index d5be407e1e3..99865dd35c9 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Date;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -92,7 +93,7 @@ public synchronized void updateAccessToken(RequestTemplate template) {
         try {
             accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
         } catch (Exception e) {
-            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
+            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, (Date) null, template.request());
         }
         if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
             setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());