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 7fc972aa441..cdeca371b6d 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
@@ -128,33 +128,21 @@
converter-gson
${retrofit-version}
-
- com.google.code.gson
- gson
- ${gson-version}
-
org.apache.oltu.oauth2
org.apache.oltu.oauth2.client
${oltu-version}
+ {{#useRxJava}}
+
+ io.reactivex
+ rxjava
+ ${rxjava-version}
-
- com.squareup.okhttp3
- okhttp
- ${okhttp-version}
-
- {{#useRxJava}}
-
- io.reactivex
- rxjava
- ${rxjava-version}
-
-
- com.squareup.retrofit2
- adapter-rxjava
- ${retrofit-version}
-
- {{/useRxJava}}
+
+ com.squareup.retrofit2
+ adapter-rxjava
+ ${retrofit-version}
+ {{/useRxJava}}
@@ -166,10 +154,8 @@
1.5.0
- 2.0.0-beta4
- {{#useRxJava}}1.0.16{{/useRxJava}}
- 3.0.1
- 2.4
+ 2.0.0-beta4{{#useRxJava}}
+ 1.0.16{{/useRxJava}}
1.0.0
1.0.0
4.12
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index d2655cbc7b7..2d8f0440161 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -128,22 +128,11 @@
converter-gson
${retrofit-version}
-
- com.google.code.gson
- gson
- ${gson-version}
-
org.apache.oltu.oauth2
org.apache.oltu.oauth2.client
${oltu-version}
-
- com.squareup.okhttp3
- okhttp
- ${okhttp-version}
-
-
@@ -156,9 +145,6 @@
1.5.0
2.0.0-beta4
-
- 3.0.1
- 2.4
1.0.0
1.0.0
4.12
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index eac585a082c..b2cf9949578 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -128,33 +128,21 @@
converter-gson
${retrofit-version}
-
- com.google.code.gson
- gson
- ${gson-version}
-
org.apache.oltu.oauth2
org.apache.oltu.oauth2.client
${oltu-version}
-
- com.squareup.okhttp3
- okhttp
- ${okhttp-version}
+
+ io.reactivex
+ rxjava
+ ${rxjava-version}
+
+
+ com.squareup.retrofit2
+ adapter-rxjava
+ ${retrofit-version}
-
-
- io.reactivex
- rxjava
- ${rxjava-version}
-
-
- com.squareup.retrofit2
- adapter-rxjava
- ${retrofit-version}
-
-
@@ -168,8 +156,6 @@
1.5.0
2.0.0-beta4
1.0.16
- 3.0.1
- 2.4
1.0.0
1.0.0
4.12