update wrapper in the test webapp

smartiniOnGitHub · Jun 25, 2015 · 7c762ec · 7c762ec
1 parent e68b405
commit 7c762ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/test/webapp/grails-akka-test24/grailsw b/test/webapp/grails-akka-test24/grailsw
@@ -132,7 +132,7 @@ fi
 if [ -z "$STARTER_CONF" ]; then
     STARTER_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.4.3.jar:wrapper:."
+STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.4.5.jar:wrapper:."
 
 # Allow access to Cocoa classes on OS X
 if $darwin; then
@@ -200,15 +200,15 @@ if $mingw ; then
 fi
 
 if [ -z "$GRAILS_AGENT_CACHE_DIR" ]; then
-    GRAILS_AGENT_CACHE_DIR=~/.grails/2.4.3/
+    GRAILS_AGENT_CACHE_DIR=~/.grails/2.4.5/
 fi
 SPRINGLOADED_PARAMS=profile=grails\;cacheDir=$GRAILS_AGENT_CACHE_DIR
 if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then
     mkdir -p "$GRAILS_AGENT_CACHE_DIR"
 fi
 
 # Process JVM args
-AGENT_STRING="-javaagent:wrapper/springloaded-1.2.0.RELEASE.jar -noverify -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS"
+AGENT_STRING="-javaagent:wrapper/springloaded-1.2.3.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS"
 CMD_LINE_ARGS=""
 DISABLE_RELOADING=true
 
@@ -306,7 +306,7 @@ if $cygwin; then
     for arg in "$@" ; do
     	CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
     	if [ $CHECK -ne 0 ] ; then
-	    	convArg=`cygpath --path --ignore --mixed "$arg"`
+	    	convArg=`cygpath --path --ignore --mixed -- "$arg"`
     	else
 			convArg=$arg
     	fi

diff --git a/test/webapp/grails-akka-test24/grailsw.bat b/test/webapp/grails-akka-test24/grailsw.bat
@@ -60,7 +60,7 @@ if "%GRAILS_HOME:~-1%"=="\" SET GRAILS_HOME=%GRAILS_HOME:~0,-1%
 :init
 
 for %%x in ("%USERPROFILE%") do set SHORTHOME=%%~fsx
-if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.4.3/
+if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.4.5/
 set SPRINGLOADED_PARAMS="profile=grails;cacheDir=%GRAILS_AGENT_CACHE_DIR%"
 if not exist "%GRAILS_AGENT_CACHE_DIR%" mkdir "%GRAILS_AGENT_CACHE_DIR%"
 
@@ -69,7 +69,7 @@ if "%GRAILS_NO_PERMGEN%" == "" (
 	if not errorlevel 1 set GRAILS_NO_PERMGEN=1
 )
 
-set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.0.RELEASE.jar -noverify -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\"
+set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.3.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\"
 set DISABLE_RELOADING=
 if "%GRAILS_OPTS%" == "" (
 	set GRAILS_OPTS=-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8
@@ -140,7 +140,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.4.3.jar;wrapper;.
+set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.4.5.jar;wrapper;.
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 
@@ -169,7 +169,7 @@ set JAVA_OPTS=%GRAILS_OPTS% %JAVA_OPTS% %AGENT%
 
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
-set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.4.3
+set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.4.5
 set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir=.
 set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"

diff --git a/.../wrapper/grails-wrapper-runtime-2.4.4.jar → .../wrapper/grails-wrapper-runtime-2.4.5.jar b/.../wrapper/grails-wrapper-runtime-2.4.4.jar → .../wrapper/grails-wrapper-runtime-2.4.5.jar
diff --git a/...24/wrapper/springloaded-1.2.1.RELEASE.jar → ...24/wrapper/springloaded-1.2.3.RELEASE.jar b/...24/wrapper/springloaded-1.2.1.RELEASE.jar → ...24/wrapper/springloaded-1.2.3.RELEASE.jar