From 3629fbac44d7e36776f411136d70c0421dd779b9 Mon Sep 17 00:00:00 2001
From: zhenjun115 <huangzhenjun115@hotmail.com>
Date: Sat, 7 May 2016 14:12:19 +0800
Subject: [PATCH] add pom.mustache for android api client(using volley HTTP
 library);update android api client samples(using volley HTTP library);

---
 .../languages/AndroidClientCodegen.java       |  2 +-
 .../android/libraries/volley/pom.mustache     | 48 +++++++++++++++++++
 .../client/petstore/android/volley/pom.xml    | 17 +++++--
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
index c0bead5c695..324453991e0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
@@ -317,7 +317,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
     }
 
     private void addSupportingFilesForVolley() {
-        // supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         // supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
         supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
         supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
new file mode 100644
index 00000000000..09f55a743a7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>volley</artifactId>
+  <version>1.0.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger-annotations-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>${httpcomponents-httpcore-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <version>${httpcomponents-httpmime-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${google-code-gson-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.mcxiaoke.volley</groupId>
+      <artifactId>library</artifactId>
+      <version>${volley-library-version}</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <httpcomponents-httpcore-version>4.4.4</httpcomponents-httpcore-version>
+    <httpcomponents-httpmime-version>4.5.2</httpcomponents-httpmime-version>
+    <google-code-gson-version>2.3.1</google-code-gson-version>
+    <volley-library-version>1.0.19</volley-library-version>
+  </properties>
+</project>
diff --git a/samples/client/petstore/android/volley/pom.xml b/samples/client/petstore/android/volley/pom.xml
index 2a3b8ef2f96..09f55a743a7 100644
--- a/samples/client/petstore/android/volley/pom.xml
+++ b/samples/client/petstore/android/volley/pom.xml
@@ -9,33 +9,40 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>1.5.0</version>
+      <version>${swagger-annotations-version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.4.4</version>
+      <version>${httpcomponents-httpcore-version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <version>4.5.2</version>
+      <version>${httpcomponents-httpmime-version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.3.1</version>
+      <version>${google-code-gson-version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mcxiaoke.volley</groupId>
       <artifactId>library</artifactId>
-      <version>1.0.19</version>
+      <version>${volley-library-version}</version>
       <type>aar</type>
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <properties>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <httpcomponents-httpcore-version>4.4.4</httpcomponents-httpcore-version>
+    <httpcomponents-httpmime-version>4.5.2</httpcomponents-httpmime-version>
+    <google-code-gson-version>2.3.1</google-code-gson-version>
+    <volley-library-version>1.0.19</volley-library-version>
+  </properties>
 </project>