From f294656073efb94205ee063dff8eac1fba0b0c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerard=20Sol=C3=A9?= <gerard@gsole.cat>
Date: Thu, 7 Aug 2014 11:28:08 -0700
Subject: [PATCH 1/2] Edit line 76 to place pom.xml correctly

---
 .../com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
index f88657b957f..e14fe4cca78 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
@@ -73,6 +73,6 @@ class BasicAndroidJavaGenerator extends BasicJavaGenerator {
     ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
     ("jsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
     ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
-    ("pom.mustache", destinationDir, "pom.xml")
+    ("pom.mustache", "generated-code/android-java", "pom.xml")
   )
 }

From 4a64d602a00f74fdf783b37c344c9aefa29dd51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerard=20Sol=C3=A9?= <gerard@gsole.cat>
Date: Thu, 7 Aug 2014 12:17:05 -0700
Subject: [PATCH 2/2] Add plugin to build a jar with dependencies

---
 src/main/resources/android-java/pom.mustache | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/android-java/pom.mustache b/src/main/resources/android-java/pom.mustache
index c595e16d83a..272606f1ffd 100644
--- a/src/main/resources/android-java/pom.mustache
+++ b/src/main/resources/android-java/pom.mustache
@@ -47,7 +47,22 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+    	<artifactId>maven-assembly-plugin</artifactId>
+    	<executions>
+      	  <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
       <!-- attach test jar -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>