From a3701cd81cd893850d316cd995fb725c0f9ea7e8 Mon Sep 17 00:00:00 2001
From: Silvio Heuberger <silvio.heuberger@ergon.ch>
Date: Thu, 31 Mar 2016 14:26:14 +0200
Subject: [PATCH] Update retrofit2 and retrofit2rx to use retrofit 2.0.1

---
 .../swagger/codegen/languages/JavaClientCodegen.java   |  2 +-
 .../Java/libraries/retrofit2/build.gradle.mustache     |  5 ++---
 .../resources/Java/libraries/retrofit2/pom.mustache    | 10 +++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 9fe2b6fc370a..2bd79dbf015e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -110,7 +110,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)");
-        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta4). Enable the RxJava adapter using '-DuseRxJava=true'.");
+        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.1). Enable the RxJava adapter using '-DuseRxJava=true'. (RxJava 1.1.2)");
 
         CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
         library.setDefault(DEFAULT_LIBRARY);
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 1be055c1fff3..3f07e9df1776 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
@@ -94,9 +94,8 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.1"
-    retrofit_version = "2.0.0-beta4"
-    gson_version = "2.6.2"
+    oltu_version = "1.0.0"
+    retrofit_version = "2.0.1"
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
 {{#useRxJava}}
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 11bbae5797aa..d120e7255c61 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
@@ -122,11 +122,6 @@
       <artifactId>converter-scalars</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
@@ -153,8 +148,9 @@
   </dependencies>
   <properties>
     <swagger-core-version>1.5.8</swagger-core-version>
-    <retrofit-version>2.0.0-beta4</retrofit-version>{{#useRxJava}}
-    <rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
+    <retrofit-version>2.0.1</retrofit-version>
+    {{#useRxJava}}<rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
+    <okhttp-version>3.0.1</okhttp-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>