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 c1ba6610c73..12433489dd8 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
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>com.github.joschi.jackson</groupId>
       <artifactId>jackson-datatype-threetenbp</artifactId>
-      <version>${jackson-version}</version>
+      <version>${jackson-threetenbp-version}</version>
     </dependency>
     {{/threetenbp}}
     <dependency>
@@ -198,6 +198,9 @@
     <feign-version>8.17.0</feign-version>
     <feign-form-version>2.0.2</feign-form-version>
     <jackson-version>2.7.5</jackson-version>
+    {{#threetenbp}}
+    <jackson-threetenbp-version>2.8.4</jackson-threetenbp-version>
+    {{/threetenbp}}
     <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/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 506906d891b..7ee1b854e6a 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -158,7 +158,7 @@
     <dependency>
       <groupId>com.github.joschi.jackson</groupId>
       <artifactId>jackson-datatype-threetenbp</artifactId>
-      <version>${jackson-version}</version>
+      <version>${jackson-threetenbp-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
@@ -182,6 +182,7 @@
     <feign-version>8.17.0</feign-version>
     <feign-form-version>2.0.2</feign-form-version>
     <jackson-version>2.7.5</jackson-version>
+    <jackson-threetenbp-version>2.8.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>