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
index 4036bb32afbc..80ba5feacab2 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
@@ -37,11 +37,24 @@
         <version>${android-platform-version}</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-annotations-version>1.5.8</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>
+    <google-code-gson-version>2.6.2</google-code-gson-version>
     <volley-library-version>1.0.19</volley-library-version>
     <android-platform-version>4.1.1.4</android-platform-version>
   </properties>
diff --git a/samples/client/petstore/android/volley/README.md b/samples/client/petstore/android/volley/README.md
index e4aa4748243c..65931066a32a 100644
--- a/samples/client/petstore/android/volley/README.md
+++ b/samples/client/petstore/android/volley/README.md
@@ -1,4 +1,4 @@
-# swagger-petstore-android-volley
+# swagger-android-client
 
 ## Requirements
 
@@ -27,7 +27,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
     <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-android-volley</artifactId>
+    <artifactId>swagger-android-client</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>
@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "io.swagger:swagger-petstore-android-volley:1.0.0"
+compile "io.swagger:swagger-android-client:1.0.0"
 ```
 
 ### Others
@@ -49,7 +49,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/swagger-petstore-android-volley-1.0.0.jar
+* target/swagger-android-client-1.0.0.jar
 * target/lib/*.jar
 
 ## Getting Started
diff --git a/samples/client/petstore/android/volley/pom.xml b/samples/client/petstore/android/volley/pom.xml
index 98572662fb27..04369688c3bd 100644
--- a/samples/client/petstore/android/volley/pom.xml
+++ b/samples/client/petstore/android/volley/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-petstore-android-volley</artifactId>
+  <artifactId>swagger-android-client</artifactId>
   <version>1.0.0</version>
   <dependencies>
     <dependency>
@@ -37,11 +37,24 @@
         <version>${android-platform-version}</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-annotations-version>1.5.8</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>
+    <google-code-gson-version>2.6.2</google-code-gson-version>
     <volley-library-version>1.0.19</volley-library-version>
     <android-platform-version>4.1.1.4</android-platform-version>
   </properties>