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 17ed86d4a93..a87e4276d6d 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
@@ -100,7 +100,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
     {{#play24}}
@@ -142,7 +142,9 @@ dependencies {
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     {{/useRxJava2}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     {{#joda}}
     compile "joda-time:joda-time:$jodatime_version"
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 501f9331b24..f4b21dcea40 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
@@ -212,6 +212,12 @@
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -349,7 +355,7 @@
         {{#threetenbp}}
             <threetenbp-version>1.3.5</threetenbp-version>
         {{/threetenbp}}
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
index 15df1acff4d..59683a42743 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play24/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     jackson_version = "2.6.6"
     play_version = "2.4.11"
@@ -108,7 +108,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "com.typesafe.play:play-java-ws_2.11:$play_version"
     compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index 4c6290e4811..79f69dba70c 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -208,10 +208,17 @@
             <artifactId>converter-scalars</artifactId>
             <version>${retrofit-version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -270,7 +277,7 @@
                 <jackson-version>2.6.6</jackson-version>
                 <play-version>2.4.11</play-version>
         <retrofit-version>2.3.0</retrofit-version>
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
index a7c63af85b6..a0ac15f6e7f 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play25/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     jackson_version = "2.7.8"
     play_version = "2.5.14"
@@ -109,7 +109,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
     compile "com.typesafe.play:play-java-ws_2.11:$play_version"
diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
index 8d46fd07ffd..1ea6ea2b5e6 100644
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -208,10 +208,17 @@
             <artifactId>converter-scalars</artifactId>
             <version>${retrofit-version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -276,7 +283,7 @@
                 <play-version>2.5.15</play-version>
         <retrofit-version>2.3.0</retrofit-version>
             <threetenbp-version>1.3.5</threetenbp-version>
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 414cbcf9590..90add11d366 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
@@ -107,7 +107,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
 
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 1b52b3919cc..8110b9d6922 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -208,10 +208,17 @@
             <artifactId>converter-scalars</artifactId>
             <version>${retrofit-version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -243,7 +250,7 @@
         <swagger-core-version>1.5.15</swagger-core-version>
         <retrofit-version>2.3.0</retrofit-version>
             <threetenbp-version>1.3.5</threetenbp-version>
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index 11b1e687d5a..6f88b83d779 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
@@ -110,7 +110,9 @@ dependencies {
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
     compile "io.reactivex:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
 
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 7052f744020..76b9d465125 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -208,10 +208,17 @@
             <artifactId>converter-scalars</artifactId>
             <version>${retrofit-version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -254,7 +261,7 @@
         <retrofit-version>2.3.0</retrofit-version>
             <rxjava-version>1.3.0</rxjava-version>
             <threetenbp-version>1.3.5</threetenbp-version>
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle
index 5cfd0149906..a325e4476d1 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx2/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
@@ -110,7 +110,9 @@ dependencies {
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
 
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index 3424a487ef3..4a1bf76bc85 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -208,10 +208,17 @@
             <artifactId>converter-scalars</artifactId>
             <version>${retrofit-version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
@@ -254,7 +261,7 @@
         <retrofit-version>2.3.0</retrofit-version>
             <rxjava-version>2.1.1</rxjava-version>
             <threetenbp-version>1.3.5</threetenbp-version>
-        <oltu-version>1.0.0</oltu-version>
+        <oltu-version>1.0.1</oltu-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>