diff --git a/circle.yml b/circle.yml
index a202b2986c..03731d82c6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,4 +1,4 @@
-# Java client, server tests
+# Java-related client, server tests
 machine:
   java:
     version: openjdk8
@@ -10,7 +10,9 @@ machine:
 
 dependencies:
   cache_directories:
-    - ~/.m2
+    - "~/.m2"
+    - "~/.sbt"
+
   pre:
     # to run petstore server locally via docker
     - docker pull swaggerapi/petstore
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java
index fba16839e2..89e24a360f 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javaPlayFramework/JavaPlayFrameworkOptionsTest.java
@@ -1,13 +1,14 @@
 package io.swagger.codegen.javaPlayFramework;
 
+import io.swagger.codegen.AbstractOptionsTest;
 import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.java.JavaClientOptionsTest;
 import io.swagger.codegen.languages.JavaPlayFrameworkCodegen;
 import io.swagger.codegen.options.JavaPlayFrameworkOptionsProvider;
+import io.swagger.codegen.options.OptionsProvider;
 import mockit.Expectations;
 import mockit.Tested;
 
-public class JavaPlayFrameworkOptionsTest extends JavaClientOptionsTest {
+public class JavaPlayFrameworkOptionsTest extends AbstractOptionsTest {
 
     @Tested
     private JavaPlayFrameworkCodegen clientCodegen;
@@ -16,6 +17,10 @@ public class JavaPlayFrameworkOptionsTest extends JavaClientOptionsTest {
         super(new JavaPlayFrameworkOptionsProvider());
     }
 
+    protected JavaPlayFrameworkOptionsTest(OptionsProvider optionsProvider) {
+        super(optionsProvider);
+    }
+
     @Override
     protected CodegenConfig getCodegenConfig() {
         return clientCodegen;
diff --git a/pom.xml b/pom.xml
index 7f1438b9fe..31be9ea8de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -792,12 +792,7 @@
             </activation>
             <modules>
                 <!-- clients -->
-                <module>samples/client/petstore/akka-scala</module>
-                <module>samples/client/petstore/ruby</module>
-                <module>samples/client/petstore/android/volley</module>
-                <module>samples/client/petstore/bash</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/go</module>
                 <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2</module>
@@ -807,9 +802,15 @@
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
+                <module>samples/client/petstore/scala</module>
+                <!-- only test java-related projects 
+                <module>samples/client/petstore/akka-scala</module>
+                <module>samples/client/petstore/ruby</module>
+                <module>samples/client/petstore/android/volley</module>
+                <module>samples/client/petstore/bash</module>
+                <module>samples/client/petstore/go</module>
                 <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/python</module>
-                <module>samples/client/petstore/scala</module>
                 <module>samples/client/petstore/typescript-fetch/builds/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
                 <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
@@ -817,6 +818,7 @@
                 <module>samples/client/petstore/typescript-angular</module>
                 <module>samples/client/petstore/typescript-node/npm</module>
                 <module>samples/client/petstore/typescript-jquery/npm</module>
+                -->
                 <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
                 <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
                 <!-- servers -->
diff --git a/pom.xml.circleci b/pom.xml.circleci
index 56e51dd57e..31be9ea8de 100644
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@@ -1,5 +1,4 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -10,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.2.3-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@@ -68,6 +67,56 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+                <!-- Uncomment this to format before checkstyle -->
+                <!-- <executions>
+                    <execution>
+                        <id>format</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                    </execution>
+                </executions> -->
+                <configuration>
+                    <compilerSource>1.7</compilerSource>
+                    <compilerCompliance>1.7</compilerCompliance>
+                    <compilerTargetPlatform>1.7</compilerTargetPlatform>
+                    <lineEnding>LF</lineEnding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <configLocation>google_checkstyle.xml</configLocation>
+                            <!-- Don't include generated sources a la http://stackoverflow.com/a/30406454 -->
+                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                            <encoding>UTF-8</encoding>
+                            <consoleOutput>true</consoleOutput>
+                            <failsOnError>true</failsOnError>
+                            <linkXRef>false</linkXRef>
+                        </configuration>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>6.19</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -106,7 +155,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.1</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -174,6 +223,15 @@
                 </executions>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.revelc.code</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>0.5.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
     <profiles>
         <profile>
@@ -256,6 +314,18 @@
                 <module>samples/client/petstore/android/volley</module>
             </modules>
         </profile>
+        <profile>
+            <id>bash-client</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/bash</module>
+            </modules>
+        </profile>
         <profile>
             <id>clojure-client</id>
             <activation>
@@ -292,6 +362,18 @@
                 <module>samples/client/petstore/java/jersey2</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-client-jersey2-java6</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/jersey2-java6</module>
+            </modules>
+        </profile>
         <profile>
             <id>java-client-okhttp-gson</id>
             <activation>
@@ -304,6 +386,18 @@
                 <module>samples/client/petstore/java/okhttp-gson</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-client-okhttp-gson-parcelable</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/okhttp-gson/parcelableModel</module>
+            </modules>
+        </profile>
         <profile>
             <id>java-client-retrofit</id>
             <activation>
@@ -400,6 +494,30 @@
                 <module>samples/client/petstore/swift/default/SwaggerClientTests</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-msf4j-server</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/java-msf4/</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jaxrs-cxf-server</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/jaxrs-cxf</module>
+            </modules>
+        </profile>
         <profile>
             <id>jaxrs-resteasy-server</id>
             <activation>
@@ -424,6 +542,30 @@
                 <module>samples/server/petstore/jaxrs-resteasy/joda</module>
             </modules>
         </profile>
+        <profile>
+            <id>jaxrs-resteasy-eap-server</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/jaxrs-resteasy/eap</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jaxrs-resteasy-eap-server-joda</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>
+            </modules>
+        </profile>
         <profile>
             <id>jaxrs-server</id>
             <activation>
@@ -568,6 +710,18 @@
                 <module>samples/server/petstore/spring-mvc</module>
             </modules>
         </profile>
+        <profile>
+            <id>springboot-beanvalidation</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/springboot-beanvalidation</module>
+            </modules>
+        </profile>
         <profile>
             <id>springboot</id>
             <activation>
@@ -604,6 +758,30 @@
                 <module>samples/server/petstore/scalatra</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-inflector</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/java-inflector</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>java-undertowr</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/undertow</module>
+            </modules>
+        </profile>
         <profile>
             <id>samples</id>
             <activation>
@@ -613,12 +791,8 @@
                 </property>
             </activation>
             <modules>
-                <!-- only test java-related clients/servers -->
                 <!-- clients -->
-                <module>samples/client/petstore/android/volley</module>
-                <!--<module>samples/client/petstore/ruby</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/go</module>-->
                 <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2</module>
@@ -626,26 +800,49 @@
                 <module>samples/client/petstore/java/retrofit</module>
                 <module>samples/client/petstore/java/retrofit2</module>
                 <module>samples/client/petstore/java/retrofit2rx</module>
-                <!--<module>samples/client/petstore/javascript</module>
-                <module>samples/client/petstore/python</module>
+                <module>samples/client/petstore/jaxrs-cxf-client</module>
+                <module>samples/client/petstore/java/resttemplate</module>
                 <module>samples/client/petstore/scala</module>
+                <!-- only test java-related projects 
+                <module>samples/client/petstore/akka-scala</module>
+                <module>samples/client/petstore/ruby</module>
+                <module>samples/client/petstore/android/volley</module>
+                <module>samples/client/petstore/bash</module>
+                <module>samples/client/petstore/go</module>
+                <module>samples/client/petstore/javascript</module>
+                <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/typescript-fetch/builds/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
                 <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
                 <module>samples/client/petstore/typescript-fetch/tests/default</module>
                 <module>samples/client/petstore/typescript-angular</module>
-                <module>samples/client/petstore/typescript-node/npm</module>-->
+                <module>samples/client/petstore/typescript-node/npm</module>
+                <module>samples/client/petstore/typescript-jquery/npm</module>
+                -->
+                <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
+                <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
                 <!-- servers -->
+                <module>samples/server/petstore/java-inflector</module>
+                <module>samples/server/petstore/java-play-framework</module>
+                <module>samples/server/petstore/undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs-resteasy/default</module>
+                <module>samples/server/petstore/jaxrs-resteasy/eap</module>
+                <module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>
                 <module>samples/server/petstore/jaxrs-resteasy/joda</module>
+                <module>samples/server/petstore/scalatra</module>
                 <module>samples/server/petstore/spring-mvc</module>
-                <module>samples/client/petstore/spring-cloud</module>
+                <!-- comment out due to change in method signature
+                <module>samples/client/petstore/spring-cloud</module> -->
                 <module>samples/server/petstore/springboot</module>
-                <!--<module>samples/server/petstore/scalatra</module>-->
-                <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
-                <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
+                <module>samples/server/petstore/springboot-beanvalidation</module>
+                <module>samples/server/petstore/jaxrs-cxf</module>
+                <module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module>
+                <module>samples/server/petstore/jaxrs-cxf-cdi</module>
+                <module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>
+
+                <!--<module>samples/server/petstore/java-msf4j</module> note: JDK8 only -->
             </modules>
         </profile>
     </profiles>
@@ -717,13 +914,14 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.22</swagger-parser-version>
+        <swagger-parser-version>1.0.28</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
-        <felix-version>2.3.4</felix-version>
-        <swagger-core-version>1.5.9</swagger-core-version>
+        <felix-version>3.3.0</felix-version>
+        <swagger-core-version>1.5.12</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>
+        <jackson-version>2.8.5</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.4</commons-lang-version>
         <slf4j-version>1.7.12</slf4j-version>
diff --git a/samples/server/petstore/scalatra/pom.xml b/samples/server/petstore/scalatra/pom.xml
index bc1a6f92cd..72d6629895 100644
--- a/samples/server/petstore/scalatra/pom.xml
+++ b/samples/server/petstore/scalatra/pom.xml
@@ -19,7 +19,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>/usr/local/bin/sbt</executable>
+                            <executable>sbt</executable>
                             <arguments>
                                 <argument>test</argument>
                             </arguments>