Leverage Shipable.io to validate mustache templates (swagger-api#3333)

* add run all petstore shell script * add run all petstore batch file for windows tests * better output for travis and appveyor * add shippable config to test all petstore * show log after test script * remo all-petstore, update travis build * update shiippable config * add run-all-petstore * failure test using ruby model * use bash script for run-all-petstore * update script permission * fix html batch script * fix missing doc in jaxrs spec generator * fix missing api, model test in jaxrs spec generator * rename licenseInfo for lumen * remove ruby model failure (for CI test) * fix "the input line is too long" * update windows batch file to shorten the commands * update appveyor config * update shippable config * add build script * update batch file to remove args option * fix window batch file for spring mvc/boot * remove logging output to file
stcarrez · Jul 11, 2016 · d4951bb · d4951bb
1 parent f536295
commit d4951bb
Show file tree

Hide file tree

Showing 44 changed files with 119 additions and 141 deletions.
diff --git 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
diff --git a/bin/jaxrs-spec-petstore-server.sh b/bin/jaxrs-spec-petstore-server.sh
diff --git a/bin/run-all-petstore 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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%
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git 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%
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git 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%
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git 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%