diff --git a/appveyor.yml b/appveyor.yml
index f55637ac920f..2b31bd9f70ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,9 +16,9 @@ install:
   - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build_script:
-  - mvn clean package --batch-mode -DskipTest
-test_script:
   - mvn clean install --batch-mode
+test_script:
+  - .\bin\windows\run-all-petstore.cmd
 cache:
   - C:\maven\
   - C:\Users\appveyor\.m2
diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh
deleted file mode 100755
index 62dfae74542b..000000000000
--- a/bin/all-petstore.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-./bin/akka-scala-petstore.sh
-./bin/android-petstore.sh
-./bin/aspnet5-petstore-server.sh
-./bin/clojure-petstore.sh
-./bin/csharp-petstore.sh
-./bin/dynamic-html.sh
-./bin/haskell-petstore.sh
-./bin/html-petstore.sh
-./bin/java-petstore.sh
-./bin/java-petstore-jersey2.sh
-./bin/java-petstore-okhttp-gson.sh
-./bin/java-petstore-retrofit.sh
-./bin/java-petstore-retrofit2.sh
-./bin/java8-petstore-jersey2.sh
-./bin/jaxrs-petstore-server.sh
-./bin/nodejs-petstore-server.sh
-./bin/objc-petstore.sh
-./bin/perl-petstore.sh
-./bin/php-petstore.sh
-./bin/python-petstore.sh
-./bin/qt5-petstore.sh
-./bin/ruby-petstore.sh
-./bin/scala-async-petstore.sh
-./bin/scala-petstore.sh
-./bin/scalatra-petstore-server.sh
-./bin/silex-petstore-server.sh
-./bin/slim-petstore-server.sh
-./bin/spring-mvc-petstore-server.sh
-./bin/spring-mvc-petstore-j8-async-server.sh
-./bin/swift-petstore.sh
-./bin/tizen-petstore.sh
-./bin/typescript-angular-petstore.sh
-./bin/typescript-angular2-petstore.sh
-./bin/typescript-angular2-petstore-with-npm.sh
-./bin/typescript-node-petstore.sh
-./bin/lumen-petstore-server.sh
\ No newline at end of file
diff --git a/bin/jaxrs-spec-petstore-server.sh b/bin/jaxrs-spec-petstore-server.sh
old mode 100644
new mode 100755
diff --git a/bin/run-all-petstore b/bin/run-all-petstore
new file mode 100755
index 000000000000..715287e15826
--- /dev/null
+++ b/bin/run-all-petstore
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+for SCRIPT in ./bin/*.sh
+do
+    if [ -f $SCRIPT -a -x $SCRIPT ]
+    then
+        $SCRIPT
+        rc=$?
+        if [[ $rc != 0 ]]
+        then
+            echo "ERROR!! FAILED TO RUN $SCRIPT"
+            exit $rc;
+        fi
+    fi
+done
diff --git a/bin/windows/akka-scala-petstore.bat b/bin/windows/akka-scala-petstore.bat
index ecd7433d2e26..27598a00a4bb 100755
--- a/bin/windows/akka-scala-petstore.bat
+++ b/bin/windows/akka-scala-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\akka-scala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/android-petstore.bat b/bin/windows/android-petstore.bat
index 03ee8a858361..21200f128839 100755
--- a/bin/windows/android-petstore.bat
+++ b/bin/windows/android-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\android -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\default
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\default
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/aspnet5-petstore-server.bat b/bin/windows/aspnet5-petstore-server.bat
index 955ad6677b8b..0823553857bf 100755
--- a/bin/windows/aspnet5-petstore-server.bat
+++ b/bin/windows/aspnet5-petstore-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\aspnet5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/async-scala-petstore.bat b/bin/windows/async-scala-petstore.bat
index d2b772b91b82..9d3eac55eb2c 100755
--- a/bin/windows/async-scala-petstore.bat
+++ b/bin/windows/async-scala-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\asyncscala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l async-scala -o samples\client\petstore\async-scala
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l async-scala -o samples\client\petstore\async-scala
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/clojure-petstore.bat b/bin/windows/clojure-petstore.bat
index bfbb6663d11a..a0f5bb77a4b0 100755
--- a/bin/windows/clojure-petstore.bat
+++ b/bin/windows/clojure-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\clojure -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l clojure -o samples\client\petstore\clojure
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l clojure -o samples\client\petstore\clojure
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/cpprest-petstore.bat b/bin/windows/cpprest-petstore.bat
index 433126698407..9f977cf9b864 100755
--- a/bin/windows/cpprest-petstore.bat
+++ b/bin/windows/cpprest-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\cpprest -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l cpprest -o samples\client\petstore\cpprest
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l cpprest -o samples\client\petstore\cpprest
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/csharp-petstore.bat b/bin/windows/csharp-petstore.bat
index fbfc18d334d5..77493d69ae76 100755
--- a/bin/windows/csharp-petstore.bat
+++ b/bin/windows/csharp-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\csharp -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l csharp -o samples\client\petstore\csharp\SwaggerClient
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples\client\petstore\csharp\SwaggerClient
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/dart-petstore.bat b/bin/windows/dart-petstore.bat
index bbf77fed2ccc..bb0140ffe0dc 100755
--- a/bin/windows/dart-petstore.bat
+++ b/bin/windows/dart-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\dart -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dart -o samples\client\petstore\dart
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dart -o samples\client\petstore\dart
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/dynamic-html-petstore.bat b/bin/windows/dynamic-html-petstore.bat
index 27595a54a161..be4aa1a5d354 100755
--- a/bin/windows/dynamic-html-petstore.bat
+++ b/bin/windows/dynamic-html-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\dynamic-html -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/flash-petstore.bat b/bin/windows/flash-petstore.bat
index 9e4445b77eab..9e656642e455 100755
--- a/bin/windows/flash-petstore.bat
+++ b/bin/windows/flash-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\flash -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l flash -o samples\client\petstore\flash
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l flash -o samples\client\petstore\flash
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/go-petstore.bat b/bin/windows/go-petstore.bat
index 050bfd23cc84..c684f19ed2b8 100755
--- a/bin/windows/go-petstore.bat
+++ b/bin/windows/go-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\go -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat
index 82cc490027a2..34c1d8af3ecb 100755
--- a/bin/windows/html-petstore.bat
+++ b/bin/windows/html-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\html -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-okhttp-gson.bat b/bin/windows/java-petstore-okhttp-gson.bat
index e7c1dde982a3..0a771bd9bd46 100755
--- a/bin/windows/java-petstore-okhttp-gson.bat
+++ b/bin/windows/java-petstore-okhttp-gson.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore.bat b/bin/windows/java-petstore.bat
index 02a81e1adbf7..ef508c6590a4 100755
--- a/bin/windows/java-petstore.bat
+++ b/bin/windows/java-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/javascript-petstore.bat b/bin/windows/javascript-petstore.bat
index 6ee220a70624..cb7f97bab2c5 100755
--- a/bin/windows/javascript-petstore.bat
+++ b/bin/windows/javascript-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\javascript -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l javascript -o samples\client\petstore\javascript
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l javascript -o samples\client\petstore\javascript
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/nancyfx-petstore-server.bat b/bin/windows/nancyfx-petstore-server.bat
index 72af10287ce8..fff39d8e86a0 100644
--- a/bin/windows/nancyfx-petstore-server.bat
+++ b/bin/windows/nancyfx-petstore-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\nancyfx -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/objc-petstore.bat b/bin/windows/objc-petstore.bat
index 9e64a80ac00f..13c11d2adcdf 100755
--- a/bin/windows/objc-petstore.bat
+++ b/bin/windows/objc-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\objc -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l objc -o samples\client\petstore\objc\default
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l objc -o samples\client\petstore\objc\default
 
 java %JAVA_OPTS% -DappName=PetstoreClient -jar %executable% %ags%
diff --git a/bin/windows/perl-petstore.bat b/bin/windows/perl-petstore.bat
index da526e40dd7f..d8bd90fd6754 100755
--- a/bin/windows/perl-petstore.bat
+++ b/bin/windows/perl-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\perl -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l perl -o samples\client\petstore\perl
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l perl -o samples\client\petstore\perl
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/php-petstore.bat b/bin/windows/php-petstore.bat
index cc10b72a609b..603a33140b74 100755
--- a/bin/windows/php-petstore.bat
+++ b/bin/windows/php-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\php -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l php -o samples\client\petstore\php
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l php -o samples\client\petstore\php
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/python-petstore.bat b/bin/windows/python-petstore.bat
index 2762cf15b814..4c3db67398e0 100755
--- a/bin/windows/python-petstore.bat
+++ b/bin/windows/python-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\python -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l python -o samples\client\petstore\python
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l python -o samples\client\petstore\python
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/qt5cpp-petstore.bat b/bin/windows/qt5cpp-petstore.bat
index 3c5b849a3f18..55e8cd417bdd 100755
--- a/bin/windows/qt5cpp-petstore.bat
+++ b/bin/windows/qt5cpp-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\qt5cpp -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l qt5cpp -o samples\client\petstore\qt5cpp
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l qt5cpp -o samples\client\petstore\qt5cpp
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/rails-petstore-server.bat b/bin/windows/rails-petstore-server.bat
deleted file mode 100644
index 55677b551977..000000000000
--- a/bin/windows/rails-petstore-server.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
-
-If Not Exist %executable% (
-  mvn clean package
-)
-
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\rails5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\rails5\
-
-java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/rails5-petstore-server.bat b/bin/windows/rails5-petstore-server.bat
index a03162797841..8c4df75b87f9 100755
--- a/bin/windows/rails5-petstore-server.bat
+++ b/bin/windows/rails5-petstore-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\rails5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/ruby-petstore.bat b/bin/windows/ruby-petstore.bat
index 3642a6e19ba0..2c7cfa7d783e 100755
--- a/bin/windows/ruby-petstore.bat
+++ b/bin/windows/ruby-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\ruby -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l ruby -o samples\client\petstore\ruby
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l ruby -o samples\client\petstore\ruby
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/run-all-petstore.cmd b/bin/windows/run-all-petstore.cmd
new file mode 100644
index 000000000000..2b49a860a614
--- /dev/null
+++ b/bin/windows/run-all-petstore.cmd
@@ -0,0 +1,7 @@
+for /f "delims=" %%i in ('dir /b ".\bin\windows\*.bat"') do (
+
+  CALL .\bin\windows\%%i
+
+  IF ERRORLEVEL 1 IF NOT ERRORLEVEL 2 exit /b 1
+
+)
diff --git a/bin/windows/scala-petstore.bat b/bin/windows/scala-petstore.bat
index 5d72d6e0c612..b06be64cc4c1 100755
--- a/bin/windows/scala-petstore.bat
+++ b/bin/windows/scala-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\scala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l scala -o samples\client\petstore\scala
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l scala -o samples\client\petstore\scala
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat
index 601de1ff6f82..4ef8db445684 100644
--- a/bin/windows/spring-mvc-petstore-j8-async-server.bat
+++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringMVC -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc  -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json
 
-java %JAVA_OPTS% -jar %executable% %ags%
\ No newline at end of file
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat
index f4ab64d5bd89..258495f6cd79 100644
--- a/bin/windows/spring-mvc-petstore-server.bat
+++ b/bin/windows/spring-mvc-petstore-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringMVC -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc
 
-java %JAVA_OPTS% -jar %executable% %ags%
\ No newline at end of file
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/springboot-petstore-server.bat b/bin/windows/springboot-petstore-server.bat
index 18077852db34..44f100a9f6d6 100644
--- a/bin/windows/springboot-petstore-server.bat
+++ b/bin/windows/springboot-petstore-server.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringBoot -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l springboot -o samples\server\petstore\springboot
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring -o samples\server\petstore\springboot
 
-java %JAVA_OPTS% -jar %executable% %ags%
\ No newline at end of file
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift-petstore.bat b/bin/windows/swift-petstore.bat
index 31d19c183992..b0ef85d695d4 100755
--- a/bin/windows/swift-petstore.bat
+++ b/bin/windows/swift-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\swift -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/tizen-petstore.bat b/bin/windows/tizen-petstore.bat
index 27122c2cb94b..3da907bd4851 100755
--- a/bin/windows/tizen-petstore.bat
+++ b/bin/windows/tizen-petstore.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\tizen -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l tizen -o samples\client\petstore\tizen
+REM set JAVA_OPTS=%JAVA_OPTS% Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l tizen -o samples\client\petstore\tizen
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular.bat b/bin/windows/typescript-angular.bat
index d77012e1b3d5..26245ef22b11 100755
--- a/bin/windows/typescript-angular.bat
+++ b/bin/windows/typescript-angular.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular -o samples\client\petstore\typescript-angular
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular -o samples\client\petstore\typescript-angular
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2-with-npm.bat b/bin/windows/typescript-angular2-with-npm.bat
index dcbd6df81554..1d6766a17ecb 100644
--- a/bin/windows/typescript-angular2-with-npm.bat
+++ b/bin/windows/typescript-angular2-with-npm.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin/typescript-petstore-npm.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2.bat b/bin/windows/typescript-angular2.bat
index ce2f0e0dc8c8..a3bff34c87fd 100755
--- a/bin/windows/typescript-angular2.bat
+++ b/bin/windows/typescript-angular2.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-fetch.bat b/bin/windows/typescript-fetch.bat
index b3ff19ea2117..9d78c6f754a3 100755
--- a/bin/windows/typescript-fetch.bat
+++ b/bin/windows/typescript-fetch.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-fetch -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-fetch -o samples\client\petstore\typescript-fetch
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-fetch -o samples\client\petstore\typescript-fetch
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-node-with-npm.bat b/bin/windows/typescript-node-with-npm.bat
index a433181fde97..d33958637bb8 100755
--- a/bin/windows/typescript-node-with-npm.bat
+++ b/bin/windows/typescript-node-with-npm.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-node -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin/typescript-petstore-npm.json -l typescript-node -o samples\client\petstore\typescript-node\npm
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-node -o samples\client\petstore\typescript-node\npm
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-node.bat b/bin/windows/typescript-node.bat
index 53f8b34e8430..f756deafb7b6 100755
--- a/bin/windows/typescript-node.bat
+++ b/bin/windows/typescript-node.bat
@@ -4,7 +4,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-node -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-node -o samples\client\petstore\typescript-node\default
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-node -o samples\client\petstore\typescript-node\default
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java
index 1219af147630..e7d15868282a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -36,6 +36,15 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen
         apiPackage = "io.swagger.api";
         modelPackage = "io.swagger.model";
 
+        apiTestTemplateFiles.clear(); // TODO: add api test template
+        modelTestTemplateFiles.clear(); // TODO: add model test template
+
+        // clear model and api doc template as this codegen
+        // does not support auto-generated markdown doc at the moment
+        //TODO: add doc templates
+        modelDocTemplateFiles.remove("model_doc.mustache");
+        apiDocTemplateFiles.remove("api_doc.mustache");
+
         additionalProperties.put("title", title);
 
         typeMapping.put("date", "LocalDate");
diff --git a/modules/swagger-codegen/src/main/resources/lumen/licenseinfo.mustache b/modules/swagger-codegen/src/main/resources/lumen/licenseInfo.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/lumen/licenseinfo.mustache
rename to modules/swagger-codegen/src/main/resources/lumen/licenseInfo.mustache
diff --git a/shippable.yml b/shippable.yml
new file mode 100644
index 000000000000..c28371ec2523
--- /dev/null
+++ b/shippable.yml
@@ -0,0 +1,13 @@
+language: java
+
+jdk:
+- openjdk7
+- openjdk8
+- oraclejdk7
+- oraclejdk8
+
+build:
+  ci:
+    - ./bin/run-all-petstore > run-all-petstore.log 2>&1
+  post_ci:
+    - tail run-all-petstore.log