diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index 60dec7e1260..6befe74db7c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -106,6 +106,9 @@ ext {
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
     jodatime_version = "2.9.3"
+    {{#threetenbp}}
+    threetenbp_version = "1.3.5"
+    {{/threetenbp}}
 }
 
 dependencies {
@@ -114,5 +117,8 @@ dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "joda-time:joda-time:$jodatime_version"
+    {{#threetenbp}}
+    compile "org.threeten:threetenbp:$threetenbp_version"
+    {{/threetenbp}}
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
index 56f6cee13ab..ffa308d528a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
@@ -14,6 +14,9 @@ lazy val root = (project in file(".")).
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "joda-time" % "joda-time" % "2.9.3" % "compile",
+      {{#threetenbp}}
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
+      {{/threetenbp}}
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
index b4ceff3aac0..0921ab21ac4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -222,6 +222,13 @@
             <artifactId>joda-time</artifactId>
             <version>${jodatime-version}</version>
         </dependency>
+        {{#threetenbp}}
+        <dependency>
+            <groupId>org.threeten</groupId>
+            <artifactId>threetenbp</artifactId>
+            <version>${threetenbp-version}</version>
+        </dependency>
+        {{/threetenbp}}
 
         {{#parcelableModel}}
             <!-- Needed for Parcelable support-->
@@ -247,6 +254,9 @@
         <retrofit-version>1.9.0</retrofit-version>
         <okhttp-version>2.7.5</okhttp-version>
         <jodatime-version>2.9.9</jodatime-version>
+        {{#threetenbp}}
+        <threetenbp-version>1.3.5</threetenbp-version>
+        {{/threetenbp}}
         <oltu-version>1.0.1</oltu-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache
index f85b028870c..af65a37bc36 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}} MultipartBody.Part {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") MultipartBody.Part {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file