diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
index 605472d67b3d..7dfb69db4182 100644
--- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,7 +98,7 @@ ext {
     jackson_version = "2.4.2"
     jersey_version = "1.18"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 0a678861061f..f644a9deda6d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 4ba5115aaf4f..c533c34558d1 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index ad415b545796..d033d9a1c68e 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,5 +98,5 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.2'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    testCompile 'junit:junit:4.8.1'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index d457749d19aa..bbcbeca43671 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -163,6 +163,6 @@
     <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index ca26e7394964..19b741034e72 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
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 9f34c16afc5b..1bced5a04529 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
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index f0dd8c213b07..425b525cc559 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -176,6 +176,6 @@
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/default/build.gradle b/samples/client/petstore/java/default/build.gradle
index 9e7ac008009c..bfba070e070d 100644
--- a/samples/client/petstore/java/default/build.gradle
+++ b/samples/client/petstore/java/default/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,7 +98,7 @@ ext {
     jackson_version = "2.4.2"
     jersey_version = "1.18"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
diff --git a/samples/client/petstore/java/default/pom.xml b/samples/client/petstore/java/default/pom.xml
index e35e30af5833..803c7eab63ae 100644
--- a/samples/client/petstore/java/default/pom.xml
+++ b/samples/client/petstore/java/default/pom.xml
@@ -64,6 +64,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -141,7 +142,7 @@
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
       <version>${jackson-version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
@@ -169,11 +170,12 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <swagger-annotations-version>1.5.8</swagger-annotations-version>
     <jersey-version>1.18</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index ee920fbc7cab..656d38a57eb1 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index 72fc75b04f25..2daaf89454a5 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index b81de6dbf3af..73518e399697 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,5 +98,5 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.2'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    testCompile 'junit:junit:4.8.1'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 0e9dbe72685f..520d234a769d 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -104,6 +104,7 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <!-- For testing build.gradle -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -124,13 +125,14 @@
           </execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
@@ -157,10 +159,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle
index 255a76e0403c..7d0d52536ebb 100644
--- a/samples/client/petstore/java/retrofit/build.gradle
+++ b/samples/client/petstore/java/retrofit/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -6,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -22,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index ab71653f739f..a893deaa2ae3 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index c7139267298e..123bae25560b 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
@@ -46,6 +46,10 @@ if(hasProperty('target') && target == 'android') {
 	            }
 	        }
 	    }
+
+      dependencies {
+          provided 'javax.annotation:jsr250-api:1.0'
+      }
 	}
 
 	afterEvaluate {