diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index 2aa743a12eb..f0b5f5c8b8a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -20,7 +20,7 @@ import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 {{/useRxJava}}
 {{#useRxJava2}}
-import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 {{/useRxJava2}}
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index d34028237a8..648d446ddf7 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -134,7 +134,7 @@ dependencies {
     compile "io.reactivex:rxjava:$rx_java_version"
     {{/useRxJava}}
     {{#useRxJava2}}
-    compile "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0"
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     {{/useRxJava2}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index 9b755a354dc..26d8b3aab79 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -29,7 +29,7 @@ lazy val root = (project in file(".")).
       "io.reactivex" % "rxjava" % "1.3.0" % "compile",
       {{/useRxJava}}
       {{#useRxJava2}}
-      "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
       "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
       {{/useRxJava2}}
       "io.swagger" % "swagger-annotations" % "1.5.15" % "compile",
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 881f1aadd36..7454b27f145 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -227,9 +227,9 @@
       <version>${rxjava-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.jakewharton.retrofit</groupId>
-      <artifactId>retrofit2-rxjava2-adapter</artifactId>
-      <version>1.0.0</version>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava2</artifactId>
+      <version>${retrofit-version}</version>
     </dependency>
     {{/useRxJava2}}
 
diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle
index 7ec34d974c9..9c5787a93e8 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx2/build.gradle
@@ -106,7 +106,7 @@ dependencies {
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0"
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt
index d99837ab113..46ef2833c05 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.sbt
+++ b/samples/client/petstore/java/retrofit2rx2/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
-      "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
       "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.15" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index b09b4ecea4e..1aa008b1a7f 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -205,9 +205,9 @@
       <version>${rxjava-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.jakewharton.retrofit</groupId>
-      <artifactId>retrofit2-rxjava2-adapter</artifactId>
-      <version>1.0.0</version>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava2</artifactId>
+      <version>${retrofit-version}</version>
     </dependency>
 
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
index a6e2d1c9f45..9310c72d1a1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
@@ -11,7 +11,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
 import org.threeten.bp.format.DateTimeFormatter;
 import retrofit2.Converter;
 import retrofit2.Retrofit;
-import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 import io.swagger.client.auth.HttpBasicAuth;