From ba3d54871213932fee1d59fd2a40e473cc201ab1 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Mon, 7 Mar 2016 10:38:27 +0000
Subject: [PATCH] remove okhttp and gson dependencies

---
 .../Java/libraries/retrofit2/pom.mustache     | 38 ++++++-------------
 .../client/petstore/java/retrofit2/pom.xml    | 14 -------
 .../client/petstore/java/retrofit2rx/pom.xml  | 32 +++++-----------
 3 files changed, 21 insertions(+), 63 deletions(-)

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 @@
       <artifactId>converter-gson</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-	  <groupId>com.google.code.gson</groupId>
-	  <artifactId>gson</artifactId>
-	  <version>${gson-version}</version>
-	</dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
+    </dependency>{{#useRxJava}}
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>${rxjava-version}</version>
     </dependency>
-      <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-      {{#useRxJava}}
-          <dependency>
-              <groupId>io.reactivex</groupId>
-              <artifactId>rxjava</artifactId>
-              <version>${rxjava-version}</version>
-          </dependency>
-          <dependency>
-              <groupId>com.squareup.retrofit2</groupId>
-              <artifactId>adapter-rxjava</artifactId>
-              <version>${retrofit-version}</version>
-          </dependency>
-      {{/useRxJava}}
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>{{/useRxJava}}
 
     <!-- test dependencies -->
     <dependency>
@@ -166,10 +154,8 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <retrofit-version>2.0.0-beta4</retrofit-version>
-    {{#useRxJava}}<rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
-    <okhttp-version>3.0.1</okhttp-version>
-    <gson-version>2.4</gson-version>
+    <retrofit-version>2.0.0-beta4</retrofit-version>{{#useRxJava}}
+    <rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
     <oltu-version>1.0.0</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
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 @@
       <artifactId>converter-gson</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-	  <groupId>com.google.code.gson</groupId>
-	  <artifactId>gson</artifactId>
-	  <version>${gson-version}</version>
-	</dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
-      <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-      
 
     <!-- test dependencies -->
     <dependency>
@@ -156,9 +145,6 @@
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <retrofit-version>2.0.0-beta4</retrofit-version>
-    
-    <okhttp-version>3.0.1</okhttp-version>
-    <gson-version>2.4</gson-version>
     <oltu-version>1.0.0</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
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 @@
       <artifactId>converter-gson</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-	  <groupId>com.google.code.gson</groupId>
-	  <artifactId>gson</artifactId>
-	  <version>${gson-version}</version>
-	</dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
-      <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>${rxjava-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava</artifactId>
+      <version>${retrofit-version}</version>
     </dependency>
-      
-          <dependency>
-              <groupId>io.reactivex</groupId>
-              <artifactId>rxjava</artifactId>
-              <version>${rxjava-version}</version>
-          </dependency>
-          <dependency>
-              <groupId>com.squareup.retrofit2</groupId>
-              <artifactId>adapter-rxjava</artifactId>
-              <version>${retrofit-version}</version>
-          </dependency>
-      
 
     <!-- test dependencies -->
     <dependency>
@@ -168,8 +156,6 @@
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <retrofit-version>2.0.0-beta4</retrofit-version>
     <rxjava-version>1.0.16</rxjava-version>
-    <okhttp-version>3.0.1</okhttp-version>
-    <gson-version>2.4</gson-version>
     <oltu-version>1.0.0</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>