diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
index a40806b32e981d48fa70cbc820fc8e3c3366d5fb..f2b88d13b0c8bb41c81d45d165140d3696c2285a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -161,6 +161,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
index 2412ba208ecb1971998d9f81a59d9ea4ce221f75..e7542aa21401d0c70782864acf6392e6f3cf06ae 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -166,6 +166,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
index 707c31284841146a0c97378d1907209e40b44d31..c02997b09be68fdd7c18125b32786144e4669f53 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -181,6 +181,17 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                     <tags>
                         <tag>
                             <name>http.response.details</name>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
index 2e68695d431a8c835547ef5e4a2fe316dd0e90b4..3d61858290bd01e1bdbfba105f97005c10b1a2fd 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -153,6 +153,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index d09da29b4728c70bd26cc416d8d76139fa72df8e..353e0edab593749702e04218614da46ee1c73fa0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -164,6 +164,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
index 7c689ae4b6c29c0cddce8caf598ee12ff1d956c8..707a5f137310a0110891cfd750e83de20fbbb9f0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -166,6 +166,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 6a7b8e8cca8d0e6f1e6a44649d5fba4ab53f0f85..e578c925f54dbe2dbdb46b54fc42cacf4e79f75c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -122,18 +122,16 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
+    jackson_version = "2.10.4"
+    jackson_databind_version = "2.10.4"
+    jackson_databind_nullable_version = "0.2.1"
     {{#play24}}
-    jackson_version = "2.6.6"
     play_version = "2.4.11"
     {{/play24}}
     {{#play25}}
-    jackson_version = "2.10.4"
     play_version = "2.5.14"
     {{/play25}}
     {{#play26}}
-    jackson_version = "2.10.4"
-    jackson_databind_version = "2.10.4"
-    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.6.7"
     {{/play26}}
     {{/usePlayWS}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index 4c85b1411d27e15f52ad16a545362bdb5dd6b6a8..92c0ad397e1859319e5a43b57109797389eb7691 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -17,24 +17,18 @@ lazy val root = (project in file(".")).
       {{#usePlayWS}}
       {{#play24}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
       {{/play24}}
       {{#play25}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
       {{/play25}}
       {{#play26}}
       "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
+      {{/play26}}
+      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      {{/play26}}
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       {{/usePlayWS}}
       {{#useRxJava}}
       "com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
index 344fadd2e3ed43eaef92bf1530c976fd10916f78..b17ac6415643f3060095025cc6c203ce610663bf 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
@@ -1,8 +1,10 @@
 package {{invokerPackage}};
 
 import okhttp3.*;
+import okio.AsyncTimeout;
 import okio.Buffer;
 import okio.BufferedSource;
+import okio.Timeout;
 import play.libs.F;
 import play.libs.ws.WSClient;
 import play.libs.ws.WSRequest;
@@ -95,10 +97,12 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         private WSRequest wsRequest;
 
         private final Request request;
+        private final AsyncTimeout timeout;
 
         public PlayWSCall(WSClient wsClient, Request request) {
             this.wsClient = wsClient;
             this.request = request;
+            this.timeout = new AsyncTimeout();
         }
 
         @Override
@@ -106,6 +110,11 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
             return request;
         }
 
+        @Override
+        public Timeout timeout() {
+            return timeout;
+        }
+
         @Override
         public void enqueue(final okhttp3.Callback responseCallback) {
             final Call call = this;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 61bacc3bb7c4b39b2c0d2c74111a1c462b1d5176..bba1ed49d2c017e7ec4c7b81e888962b627e5547 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -139,12 +139,44 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                {{#supportJava6}}
+                    <source>1.6</source>
+                    <target>1.6</target>
+                {{/supportJava6}}
+                {{^supportJava6}}
+                {{#java8}}
+                    <source>1.8</source>
+                    <target>1.8</target>
+                {{/java8}}
+                {{^java8}}
+                    <source>1.7</source>
+                    <target>1.7</target>
+                {{/java8}}
+                {{/supportJava6}}
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -296,7 +328,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -317,11 +354,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play24}}
             {{#play25}}
             <dependency>
@@ -329,11 +361,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play25}}
             {{#play26}}
             <dependency>
@@ -346,11 +373,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play26}}
         {{/usePlayWS}}
         {{#parcelableModel}}
@@ -378,17 +400,14 @@
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
         {{#usePlayWS}}
-        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <jackson-version>2.10.4</jackson-version>
         {{#play24}}
-        <jackson-version>2.6.6</jackson-version>
         <play-version>2.4.11</play-version>
         {{/play24}}
         {{#play25}}
-        <jackson-version>2.10.4</jackson-version>
         <play-version>2.5.15</play-version>
         {{/play25}}
         {{#play26}}
-        <jackson-version>2.10.4</jackson-version>
         <play-version>2.6.7</play-version>
         {{/play26}}
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
index 587a6e76cc4270f3c6805d6d1e6738254d919993..7168f595a828237291036b584b2d31c1ae565b62 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -154,6 +154,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache
index e9cbf546b6d7b549fc072de88fc97b5eb6ed7fb2..da7884cb72aea8fa3290ae28452918799f07df13 100644
--- a/modules/openapi-generator/src/main/resources/Java/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache
@@ -181,6 +181,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 5e288b31a459c2273f7067a8ae63169378e2a37b..b27ff94afb82c0f19b6c376a4d98be7fc9d08241 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -154,6 +154,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/feign10x/pom.xml b/samples/client/petstore/java/feign10x/pom.xml
index 5cb786250a7e26b005879b43cfdc8ef3d3f332fc..7061fcd21902f95d8319001325bccc4da179f397 100644
--- a/samples/client/petstore/java/feign10x/pom.xml
+++ b/samples/client/petstore/java/feign10x/pom.xml
@@ -154,6 +154,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml
index e10770e25990ddb394252407fe6afbdf3e84ffb0..238c0ba1d987b4211c4a472a0a557092290efd83 100644
--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -147,6 +147,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/jersey1/pom.xml b/samples/client/petstore/java/jersey1/pom.xml
index 09f4db8539e74a9221b3df24c3fbb82ad4b121e4..c48363cd4bf388eafbb0b917f6c581fd2869fc9b 100644
--- a/samples/client/petstore/java/jersey1/pom.xml
+++ b/samples/client/petstore/java/jersey1/pom.xml
@@ -162,6 +162,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 872fb602156cf26f5f6eb9c0d24cbbfc260a2308..837b5ea02461385bfd4e01599b1abfdd06d4fe8a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -35,16 +35,15 @@ public class AnotherFakeApiTest {
     /**
      * To test special tags
      *
-     * To test special tags
+     * To test special tags and operation ID starting with number
      *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
-    public void testSpecialTagsTest() throws ApiException {
-        Client client = null;
-        Client response = api.testSpecialTags(client);
-
+    public void call123testSpecialTagsTest() throws ApiException {
+        Client body = null;
+        Client response = api.call123testSpecialTags(body);
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 07f4a80a5b24f63c3eb69793188e47879af97456..b2c8f47fb36e964b5dca7e2da178444309aeb89e 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -22,6 +22,7 @@ import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
 import org.junit.Test;
 import org.junit.Ignore;
 
@@ -39,6 +40,21 @@ public class FakeApiTest {
     private final FakeApi api = new FakeApi();
 
     
+    /**
+     * creates an XmlItem
+     *
+     * this route creates an XmlItem
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void createXmlItemTest() throws ApiException {
+        XmlItem xmlItem = null;
+        api.createXmlItem(xmlItem);
+        // TODO: test validations
+    }
+    
     /**
      * 
      *
@@ -51,7 +67,6 @@ public class FakeApiTest {
     public void fakeOuterBooleanSerializeTest() throws ApiException {
         Boolean body = null;
         Boolean response = api.fakeOuterBooleanSerialize(body);
-
         // TODO: test validations
     }
     
@@ -65,9 +80,8 @@ public class FakeApiTest {
      */
     @Test
     public void fakeOuterCompositeSerializeTest() throws ApiException {
-        OuterComposite outerComposite = null;
-        OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);
-
+        OuterComposite body = null;
+        OuterComposite response = api.fakeOuterCompositeSerialize(body);
         // TODO: test validations
     }
     
@@ -83,7 +97,6 @@ public class FakeApiTest {
     public void fakeOuterNumberSerializeTest() throws ApiException {
         BigDecimal body = null;
         BigDecimal response = api.fakeOuterNumberSerialize(body);
-
         // TODO: test validations
     }
     
@@ -99,7 +112,6 @@ public class FakeApiTest {
     public void fakeOuterStringSerializeTest() throws ApiException {
         String body = null;
         String response = api.fakeOuterStringSerialize(body);
-
         // TODO: test validations
     }
     
@@ -113,9 +125,8 @@ public class FakeApiTest {
      */
     @Test
     public void testBodyWithFileSchemaTest() throws ApiException {
-        FileSchemaTestClass fileSchemaTestClass = null;
-        api.testBodyWithFileSchema(fileSchemaTestClass);
-
+        FileSchemaTestClass body = null;
+        api.testBodyWithFileSchema(body);
         // TODO: test validations
     }
     
@@ -130,9 +141,8 @@ public class FakeApiTest {
     @Test
     public void testBodyWithQueryParamsTest() throws ApiException {
         String query = null;
-        User user = null;
-        api.testBodyWithQueryParams(query, user);
-
+        User body = null;
+        api.testBodyWithQueryParams(query, body);
         // TODO: test validations
     }
     
@@ -146,16 +156,15 @@ public class FakeApiTest {
      */
     @Test
     public void testClientModelTest() throws ApiException {
-        Client client = null;
-        Client response = api.testClientModel(client);
-
+        Client body = null;
+        Client response = api.testClientModel(body);
         // TODO: test validations
     }
     
     /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
      * @throws ApiException
      *          if the Api call fails
@@ -177,7 +186,6 @@ public class FakeApiTest {
         String password = null;
         String paramCallback = null;
         api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
         // TODO: test validations
     }
     
@@ -200,7 +208,6 @@ public class FakeApiTest {
         List<String> enumFormStringArray = null;
         String enumFormString = null;
         api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
         // TODO: test validations
     }
     
@@ -220,8 +227,14 @@ public class FakeApiTest {
         Integer stringGroup = null;
         Boolean booleanGroup = null;
         Long int64Group = null;
-        api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-
+        api.testGroupParameters()
+                .requiredStringGroup(requiredStringGroup)
+                .requiredBooleanGroup(requiredBooleanGroup)
+                .requiredInt64Group(requiredInt64Group)
+                .stringGroup(stringGroup)
+                .booleanGroup(booleanGroup)
+                .int64Group(int64Group)
+                .execute();
         // TODO: test validations
     }
     
@@ -235,9 +248,8 @@ public class FakeApiTest {
      */
     @Test
     public void testInlineAdditionalPropertiesTest() throws ApiException {
-        Map<String, String> requestBody = null;
-        api.testInlineAdditionalProperties(requestBody);
-
+        Map<String, String> param = null;
+        api.testInlineAdditionalProperties(param);
         // TODO: test validations
     }
     
@@ -254,7 +266,25 @@ public class FakeApiTest {
         String param = null;
         String param2 = null;
         api.testJsonFormData(param, param2);
-
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * To test the collection format in query parameters
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testQueryParameterCollectionFormatTest() throws ApiException {
+        List<String> pipe = null;
+        List<String> ioutil = null;
+        List<String> http = null;
+        List<String> url = null;
+        List<String> context = null;
+        api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index e2ac28cb12ac4d52c1653d3617b3ef0147b38db4..71999316797ac2f5a8968df2a8ee347d9f91dce3 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -42,9 +42,8 @@ public class FakeClassnameTags123ApiTest {
      */
     @Test
     public void testClassnameTest() throws ApiException {
-        Client client = null;
-        Client response = api.testClassname(client);
-
+        Client body = null;
+        Client response = api.testClassname(body);
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/PetApiTest.java
index 27c60b40246e3e712d05e092c8e7a57785db8550..6ca055171ef346f186397ebfb3d8c7ca9db8aa69 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * API tests for PetApi
@@ -45,8 +44,8 @@ public class PetApiTest {
      */
     @Test
     public void addPetTest() throws ApiException {
-        Pet pet = null;
-        api.addPet(pet);
+        Pet body = null;
+        api.addPet(body);
 
         // TODO: test validations
     }
@@ -126,8 +125,8 @@ public class PetApiTest {
      */
     @Test
     public void updatePetTest() throws ApiException {
-        Pet pet = null;
-        api.updatePet(pet);
+        Pet body = null;
+        api.updatePet(body);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/StoreApiTest.java
index f83e6c38972d992d6373990401c0ae84926b1283..cd36a70fece3cfed95dc5bcdeef20ee40ed5af10 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -44,7 +44,6 @@ public class StoreApiTest {
     public void deleteOrderTest() throws ApiException {
         String orderId = null;
         api.deleteOrder(orderId);
-
         // TODO: test validations
     }
     
@@ -59,7 +58,6 @@ public class StoreApiTest {
     @Test
     public void getInventoryTest() throws ApiException {
         Map<String, Integer> response = api.getInventory();
-
         // TODO: test validations
     }
     
@@ -75,7 +73,6 @@ public class StoreApiTest {
     public void getOrderByIdTest() throws ApiException {
         Long orderId = null;
         Order response = api.getOrderById(orderId);
-
         // TODO: test validations
     }
     
@@ -89,9 +86,8 @@ public class StoreApiTest {
      */
     @Test
     public void placeOrderTest() throws ApiException {
-        Order order = null;
-        Order response = api.placeOrder(order);
-
+        Order body = null;
+        Order response = api.placeOrder(body);
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/UserApiTest.java
index 79e0b6b2bb5932de3b03fa68215ef2e8f1169efe..f7ef9050c955b42ff45d9b4e74752826fe3cdca8 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -42,9 +42,8 @@ public class UserApiTest {
      */
     @Test
     public void createUserTest() throws ApiException {
-        User user = null;
-        api.createUser(user);
-
+        User body = null;
+        api.createUser(body);
         // TODO: test validations
     }
     
@@ -58,9 +57,8 @@ public class UserApiTest {
      */
     @Test
     public void createUsersWithArrayInputTest() throws ApiException {
-        List<User> user = null;
-        api.createUsersWithArrayInput(user);
-
+        List<User> body = null;
+        api.createUsersWithArrayInput(body);
         // TODO: test validations
     }
     
@@ -74,9 +72,8 @@ public class UserApiTest {
      */
     @Test
     public void createUsersWithListInputTest() throws ApiException {
-        List<User> user = null;
-        api.createUsersWithListInput(user);
-
+        List<User> body = null;
+        api.createUsersWithListInput(body);
         // TODO: test validations
     }
     
@@ -92,7 +89,6 @@ public class UserApiTest {
     public void deleteUserTest() throws ApiException {
         String username = null;
         api.deleteUser(username);
-
         // TODO: test validations
     }
     
@@ -108,7 +104,6 @@ public class UserApiTest {
     public void getUserByNameTest() throws ApiException {
         String username = null;
         User response = api.getUserByName(username);
-
         // TODO: test validations
     }
     
@@ -125,7 +120,6 @@ public class UserApiTest {
         String username = null;
         String password = null;
         String response = api.loginUser(username, password);
-
         // TODO: test validations
     }
     
@@ -140,7 +134,6 @@ public class UserApiTest {
     @Test
     public void logoutUserTest() throws ApiException {
         api.logoutUser();
-
         // TODO: test validations
     }
     
@@ -155,9 +148,8 @@ public class UserApiTest {
     @Test
     public void updateUserTest() throws ApiException {
         String username = null;
-        User user = null;
-        api.updateUser(username, user);
-
+        User body = null;
+        api.updateUser(username, body);
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
index 2b0bd0bbaefef579f35d77b5f429ca4162ce3eda..ec44af783873700b5ca784a73ba20f3bbb592a5d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
index c6dd88eea82c05a3d80752f67daed51497d68d26..ceb024c5620beab4e56808ec3d4f88012d6078c3 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
index 9d474c0dd8015e09d767275b91e2c05631a7030f..517e5a10ae434251eacc0ce9d97ec02cd5438f48 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
index c6bcc988bf9458d05d01ed458593dd849f7b3f04..2e3844ba9756c0e7c3ceaeebf76ccd08efcbe9df 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,11 +13,13 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,19 +43,91 @@ public class AdditionalPropertiesClassTest {
     }
 
     /**
-     * Test the property 'mapProperty'
+     * Test the property 'mapString'
      */
     @Test
-    public void mapPropertyTest() {
-        // TODO: test mapProperty
+    public void mapStringTest() {
+        // TODO: test mapString
     }
 
     /**
-     * Test the property 'mapOfMapProperty'
+     * Test the property 'mapNumber'
      */
     @Test
-    public void mapOfMapPropertyTest() {
-        // TODO: test mapOfMapProperty
+    public void mapNumberTest() {
+        // TODO: test mapNumber
+    }
+
+    /**
+     * Test the property 'mapInteger'
+     */
+    @Test
+    public void mapIntegerTest() {
+        // TODO: test mapInteger
+    }
+
+    /**
+     * Test the property 'mapBoolean'
+     */
+    @Test
+    public void mapBooleanTest() {
+        // TODO: test mapBoolean
+    }
+
+    /**
+     * Test the property 'mapArrayInteger'
+     */
+    @Test
+    public void mapArrayIntegerTest() {
+        // TODO: test mapArrayInteger
+    }
+
+    /**
+     * Test the property 'mapArrayAnytype'
+     */
+    @Test
+    public void mapArrayAnytypeTest() {
+        // TODO: test mapArrayAnytype
+    }
+
+    /**
+     * Test the property 'mapMapString'
+     */
+    @Test
+    public void mapMapStringTest() {
+        // TODO: test mapMapString
+    }
+
+    /**
+     * Test the property 'mapMapAnytype'
+     */
+    @Test
+    public void mapMapAnytypeTest() {
+        // TODO: test mapMapAnytype
+    }
+
+    /**
+     * Test the property 'anytype1'
+     */
+    @Test
+    public void anytype1Test() {
+        // TODO: test anytype1
+    }
+
+    /**
+     * Test the property 'anytype2'
+     */
+    @Test
+    public void anytype2Test() {
+        // TODO: test anytype2
+    }
+
+    /**
+     * Test the property 'anytype3'
+     */
+    @Test
+    public void anytype3Test() {
+        // TODO: test anytype3
     }
 
 }
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
index bf1b1c427b64cce98caa9fcd564a1d78c90c02a8..66a7b85623e365413f1ebb08612a0a9e21f3628b 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
index b9cb6470e38d508e75a08109deebc82e4a96f6e2..4e03485a4484cb00519041f8756f38e1ec0d3098 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
index 3cbcb8ec3b0ff2840874acc52da35b1183e16078..e0c72c5863477abac5140fde5e9e7b5b5b940a46 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
index 1d3c05075eaaaa2e93e17697998df5b99fa4885a..c84d987e7640652ec1868124dd309e02dd31f603 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AnimalTest.java
index beb02882b30ecbacd60b2b21f480743b463d303b..c0d10ec5a3d8787ffa3129ade8411e350a037cc8 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
index ae7970522b15c0005b3d8afd5204dab2b2445024..e25187a3b608f61c4d16a70f0d65b384db2edd3a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
index 6151b7068b7577d4877088f44851319e0d92997d..ae1061823991929fcc859de0d1e5867708edd654 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayTestTest.java
index 4bb62b6569ae77d65750596cb5a265b8b81b41cb..36bd9951cf600015d585eb5b69bf1ab667fab3f1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CapitalizationTest.java
index eae9be7938c953d3a255625297969d0bbd25e823..a701b341fc5974b8f8e9f9ff7564a42de7055625 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatAllOfTest.java
index 69b226745d79bc38168ff3aa1661b0867ea315e4..1d85a0447253e7e0ef8d0464cfecc1afdd76b8b2 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatTest.java
index dcb9f2d4cae6eb040f574653780454d5d258baa0..dbf40678a2d0c5150bb148070e9a525eaec75703 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,12 +13,14 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CategoryTest.java
index 1df27cf03202e59bdd59c4b21a90d273efc10a5d..6027994a2ac3a18d8db3adf1a153c4ad1edfdd8c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClassModelTest.java
index 04eb02f835e2a469272d80b3ec4081b63df0b9c5..8914c9cad43d881b03329d6e0b63ee4ddf98a72d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClientTest.java
index 03b6bb41a52939bd507e93791e559cf2d54510fe..c21b346272d771f9d34c973cdf699b07aef0440d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClientTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogAllOfTest.java
index 1b83dcefc4f55502f8ab246f3675ee5609b84cf8..6e4b491080986a444a33d2663df2571691219818 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogTest.java
index 06ac28f804adffbcec4c3316e8a613e5a5146733..a46bc508d48ce9d9d68db386fa3421a33d9fcd0c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,12 +13,14 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumArraysTest.java
index 11b5f01985fe73677e4948617ad5b38a94e44ec7..45b8fbbd8220f4e31f9544094987e2ab8853f1d6 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumClassTest.java
index cb51ca50c9583dd77002e6be6881b23bb405d4d5..9e45543facd2cd783422a3d64bfa4597f59b37c1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumTestTest.java
index 13122a0cb978bc688a4b90057a35ea431419fc85..04e7afb197844bbf2183e5d692510d45eece5289 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
index a6b0d8ff7b0572c3ded4a47d174f9e56848381eb..ef37e666be394536bd80d993affaacb1737bcab6 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FormatTestTest.java
index 6081209ef19f7766f7122288705fb82516f0d9b4..710501b51bd4d81eccaa3c92b02387ed082d7bc5 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -146,4 +147,12 @@ public class FormatTestTest {
         // TODO: test password
     }
 
+    /**
+     * Test the property 'bigDecimal'
+     */
+    @Test
+    public void bigDecimalTest() {
+        // TODO: test bigDecimal
+    }
+
 }
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
index 2c4b2470b9830ca82ffec1f309f11bdb9bd4670b..e902c100383b6a8b4291f548d3531eea9e99b563 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MapTestTest.java
index 0f08d8c88f07b546c54fb307e6e1a8bd56a7aa7b..a0c991bb75888d63ab1cbf98400c8c173857482e 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
index c308aec0a94dd82bd1a5c3d3d871bd49d6310be4..f8a8c734baafce0a4f856eedaae4c6aa9a855364 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
index 1ad55ca32ea6cd4f66541749a86cf33d9b86b48c..82c7208079db70d7602a84e05ce5d48fe9c97eb8 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
index 73d28676aeae06ca3004a524e9980bab11032df4..97a1287aa4136a9384d49666752ecb02af530d1f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelReturnTest.java
index b073fda0014020a1890f2c5c8a4416e4a3f858be..f884519ebc86e097012d3e7bdb604bfe8273be11 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NameTest.java
index e81ebc38e6529e235a656ccb7d678decf8507726..cb3a94cf74abc57c5a01cf7c0fb06dbf0aecdffe 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NameTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NameTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
index 565c8bd0627e89f8ffe6f01e471d9ccd7fcdae0a..f4fbd5ee8b4200ced1581258c917c0becda0463c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OrderTest.java
index c2d3025a264374f7c3ca86c544915ab64d94c884..d24c8479f5d68d02ec415baaeabd2c3a8f5d1239 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
index 49b656a93faff80b5bc6e39fa2ffdc4595a0fe19..ebea3ca304c0ba753d2988182e4c1dd1cc4b44d9 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterEnumTest.java
index 61154c6d88182573fd92e543a216c62b0c4b2421..cf0ebae0faf0ac6e8387d7bf55db47815000bfec 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/PetTest.java
index bf6908e4a4556d398b9d4edc24cf3b9570e44c82..c3c0d4cc35dd09657c8e4083a04df61d0ab9ff22 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/PetTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
index e48b31a39fdaee082b3382d1bfe569a37808abeb..b82a7d0ef561f166911bcb8f1655175bc45110a1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
index 1696eee82dad966578c6b26d82b0d8822f734886..d5a19c371e689ea49c6e993a1e014b5da072029f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TagTest.java
index b37aca5fdfc809d5d1ff730eb3bc0d0ced834430..5c2cc6f49e059151d80ac4eaad75d8471b51b70b 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TagTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
index 409076e80a3afa67bf9bd97432fe46b2af4818bc..e96ac744439dd0da196c636112f81c768a55fb0c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
index ffd8f3ddc33e971bedff46c610cad5dee356e9fa..56641d163a5097f07afb4ccf0fed5c97ff4740c1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -56,6 +57,14 @@ public class TypeHolderExampleTest {
         // TODO: test numberItem
     }
 
+    /**
+     * Test the property 'floatItem'
+     */
+    @Test
+    public void floatItemTest() {
+        // TODO: test floatItem
+    }
+
     /**
      * Test the property 'integerItem'
      */
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/UserTest.java
index 76733c9e72f2876749047ddcb7d7cbff9166bff9..ce40d3a2a637d837f98efb1756743ce90db0f2d5 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/UserTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/UserTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/XmlItemTest.java
index 55e75391e00e91ac278723aac97fb057070d9fe5..501c414555f405475503a658955189ab2e603340 100644
--- a/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -225,51 +226,51 @@ public class XmlItemTest {
     }
 
     /**
-     * Test the property 'prefixNamespaceString'
+     * Test the property 'prefixNsString'
      */
     @Test
-    public void prefixNamespaceStringTest() {
-        // TODO: test prefixNamespaceString
+    public void prefixNsStringTest() {
+        // TODO: test prefixNsString
     }
 
     /**
-     * Test the property 'prefixNamespaceNumber'
+     * Test the property 'prefixNsNumber'
      */
     @Test
-    public void prefixNamespaceNumberTest() {
-        // TODO: test prefixNamespaceNumber
+    public void prefixNsNumberTest() {
+        // TODO: test prefixNsNumber
     }
 
     /**
-     * Test the property 'prefixNamespaceInteger'
+     * Test the property 'prefixNsInteger'
      */
     @Test
-    public void prefixNamespaceIntegerTest() {
-        // TODO: test prefixNamespaceInteger
+    public void prefixNsIntegerTest() {
+        // TODO: test prefixNsInteger
     }
 
     /**
-     * Test the property 'prefixNamespaceBoolean'
+     * Test the property 'prefixNsBoolean'
      */
     @Test
-    public void prefixNamespaceBooleanTest() {
-        // TODO: test prefixNamespaceBoolean
+    public void prefixNsBooleanTest() {
+        // TODO: test prefixNsBoolean
     }
 
     /**
-     * Test the property 'prefixNamespaceArray'
+     * Test the property 'prefixNsArray'
      */
     @Test
-    public void prefixNamespaceArrayTest() {
-        // TODO: test prefixNamespaceArray
+    public void prefixNsArrayTest() {
+        // TODO: test prefixNsArray
     }
 
     /**
-     * Test the property 'prefixNamespaceWrappedArray'
+     * Test the property 'prefixNsWrappedArray'
      */
     @Test
-    public void prefixNamespaceWrappedArrayTest() {
-        // TODO: test prefixNamespaceWrappedArray
+    public void prefixNsWrappedArrayTest() {
+        // TODO: test prefixNsWrappedArray
     }
 
 }
diff --git a/samples/client/petstore/java/jersey2-java7/pom.xml b/samples/client/petstore/java/jersey2-java7/pom.xml
index f299e5a8b38b5d7f15dc6d9b7c5ef32126427673..6a6ec6081c57610617a8437e06012e564115dd6e 100644
--- a/samples/client/petstore/java/jersey2-java7/pom.xml
+++ b/samples/client/petstore/java/jersey2-java7/pom.xml
@@ -162,6 +162,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml
index f3a8ffe108b679d847c73be64810e1e306ac83e3..55a93740a3c7d41cdb824ce10c83151aeb1def75 100644
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -162,6 +162,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml
index 3666b630e03ae940b93518105a28ecfe117d9b24..fac245af2b611ed6c7cd117f3aa326fbab645d2e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/pom.xml
+++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml
@@ -146,6 +146,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml
index 21e224499c41a3b3c4f2a4df56156b370cf747ee..a4740d3445d3740078cbf2353e134f8d0befb3ec 100644
--- a/samples/client/petstore/java/rest-assured/pom.xml
+++ b/samples/client/petstore/java/rest-assured/pom.xml
@@ -146,6 +146,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
index 414dfab5bec5d8fa3e7564570f40268d74f1b620..93dd093f998ba8705f5078a268cc22ef0508602a 100644
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -145,6 +145,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
index 24d4971bed717c600718c032f67f686ae393530f..9de4ae305fdb4be1c7ed0c3b784d1140a8570d04 100644
--- a/samples/client/petstore/java/retrofit/pom.xml
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -147,6 +147,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
index c40aba2faad6f1c196c2a19bd1ee4e87db1eeb1f..0be71ccbc8beba0bd5a89337e5fb7eee96c4917a 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play24/build.gradle
@@ -97,7 +97,9 @@ if(hasProperty('target') && target == 'android') {
 ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
-    jackson_version = "2.6.6"
+    jackson_version = "2.10.4"
+    jackson_databind_version = "2.10.4"
+    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.4.11"
     swagger_annotations_version = "1.5.22"
     junit_version = "4.13"
diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt
index d2bc6d8212787c2b15e39915638f8c81636582c0..5293d449662931f2fc3d8dc64a38db943e560ca5 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play24/build.sbt
@@ -12,10 +12,10 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
       "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index e17c6639dffcbe44756b20a4bec136861cc7fd72..8f9acc2b4a482a6f0fa2e80c4d37617338fdcd33 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -250,7 +260,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -262,11 +277,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -282,8 +292,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-version>2.6.6</jackson-version>
+        <jackson-version>2.10.4</jackson-version>
         <play-version>2.4.11</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <retrofit-version>2.5.0</retrofit-version>
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
index 0bcc385af46e338b1871802e0cd9bf482703e356..7a0bdae26b902c635cdf47273fb1cc4ba914baa8 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
@@ -1,8 +1,10 @@
 package org.openapitools.client;
 
 import okhttp3.*;
+import okio.AsyncTimeout;
 import okio.Buffer;
 import okio.BufferedSource;
+import okio.Timeout;
 import play.libs.F;
 import play.libs.ws.WSClient;
 import play.libs.ws.WSRequest;
@@ -95,10 +97,12 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         private WSRequest wsRequest;
 
         private final Request request;
+        private final AsyncTimeout timeout;
 
         public PlayWSCall(WSClient wsClient, Request request) {
             this.wsClient = wsClient;
             this.request = request;
+            this.timeout = new AsyncTimeout();
         }
 
         @Override
@@ -106,6 +110,11 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
             return request;
         }
 
+        @Override
+        public Timeout timeout() {
+            return timeout;
+        }
+
         @Override
         public void enqueue(final okhttp3.Callback responseCallback) {
             final Call call = this;
diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
index 521a5e5c5c8e76c83e4d3393bf5cf668d0b6b464..f179395f2c72767926bd71f30d22377cee76ad3c 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play25/build.gradle
@@ -98,6 +98,8 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     jackson_version = "2.10.4"
+    jackson_databind_version = "2.10.4"
+    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.5.14"
     swagger_annotations_version = "1.5.22"
     junit_version = "4.13"
diff --git a/samples/client/petstore/java/retrofit2-play25/build.sbt b/samples/client/petstore/java/retrofit2-play25/build.sbt
index 520494bfdd5389e91ceb1fa0b993de0143c60b84..73b9ced71d19a884a8161f718ec8acffe8c7e4cb 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play25/build.sbt
@@ -12,10 +12,10 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
+      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
index 76aa913fc2cc791f1baa01a6b7b2b703f20f6d98..196d3f1816f5a2c22e0ed58a75a5470aad92cc5b 100644
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -255,7 +265,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -267,11 +282,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -287,7 +297,6 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-version>2.10.4</jackson-version>
         <play-version>2.5.15</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt
index 6c72635b4d05e602854d442acb76fd70f883b64c..b7b876eac8dc20dd865d09c17faf43e7b033f695 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play26/build.sbt
@@ -13,10 +13,10 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
+      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml
index c0e191c5546af4cb86b7b4881307897b447369eb..d1233a9b83e3dac736fa2f3fbf67675ed505b2b7 100644
--- a/samples/client/petstore/java/retrofit2-play26/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -255,7 +265,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -272,11 +287,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -292,7 +302,6 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-version>2.10.4</jackson-version>
         <play-version>2.6.7</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index f9891166b9518ca69ef6f3f9cd8d4c2feb4460e7..314c6631dc621a9deddd7931d9c2e1ed1e962de2 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 0606c937d3ea15c47c7c6db1ebbd4e20fa0943ae..d195f17ba588340230388a90d80699588755c85f 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index a99c4583e437e530fd2b130000f75f141e407513..baf5a5c4aefb5f8432ef65c77e51f28955c19ec5 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml
index 74bde701e6460dcf8c0a0db22d4e44f110b20a15..31855a4f1fa65730b27cf048b37d33b30b0cbf4a 100644
--- a/samples/client/petstore/java/vertx/pom.xml
+++ b/samples/client/petstore/java/vertx/pom.xml
@@ -147,6 +147,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>