diff --git a/grailsw b/grailsw index d60c7a3cdd..6b741765fa 100755 --- a/grailsw +++ b/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.5.4.jar:wrapper:." +STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.5.5.jar:wrapper:." # Allow access to Cocoa classes on OS X if $darwin; then @@ -200,7 +200,7 @@ if $mingw ; then fi if [ -z "$GRAILS_AGENT_CACHE_DIR" ]; then - GRAILS_AGENT_CACHE_DIR=~/.grails/2.5.4/ + GRAILS_AGENT_CACHE_DIR=~/.grails/2.5.5/ fi SPRINGLOADED_PARAMS=profile=grails\;cacheDir=$GRAILS_AGENT_CACHE_DIR if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then @@ -208,7 +208,7 @@ if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then fi # Process JVM args -AGENT_STRING="-javaagent:wrapper/springloaded-1.2.4.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS" +AGENT_STRING="-javaagent:wrapper/springloaded-1.2.5.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS" CMD_LINE_ARGS="" DISABLE_RELOADING=true diff --git a/grailsw.bat b/grailsw.bat index 55336b134a..5ecf7699c3 100644 --- a/grailsw.bat +++ b/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.5.4/ +if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.5.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.4.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\" +set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.5.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.5.4.jar;wrapper;. +set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.5.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.5.4 +set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.5.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.5.jar b/wrapper/grails-wrapper-runtime-2.4.5.jar deleted file mode 100644 index 191f633d61..0000000000 Binary files a/wrapper/grails-wrapper-runtime-2.4.5.jar and /dev/null differ diff --git a/wrapper/grails-wrapper-runtime-2.5.4.jar b/wrapper/grails-wrapper-runtime-2.5.5.jar similarity index 87% rename from wrapper/grails-wrapper-runtime-2.5.4.jar rename to wrapper/grails-wrapper-runtime-2.5.5.jar index 4dbeefd756..64c897e315 100644 Binary files a/wrapper/grails-wrapper-runtime-2.5.4.jar and b/wrapper/grails-wrapper-runtime-2.5.5.jar differ diff --git a/wrapper/grails-wrapper.properties b/wrapper/grails-wrapper.properties index 6d3de48a70..82d01c40bf 100644 --- a/wrapper/grails-wrapper.properties +++ b/wrapper/grails-wrapper.properties @@ -1 +1 @@ -wrapper.dist.url=https://github.com/grails/grails-core/releases/download/v2.5.4/ +wrapper.dist.url=https://github.com/grails/grails-core/releases/download/v2.5.5/ diff --git a/wrapper/springloaded-1.2.3.RELEASE.jar b/wrapper/springloaded-1.2.3.RELEASE.jar deleted file mode 100644 index 7e8cb3f47a..0000000000 Binary files a/wrapper/springloaded-1.2.3.RELEASE.jar and /dev/null differ diff --git a/wrapper/springloaded-1.2.4.RELEASE.jar b/wrapper/springloaded-1.2.4.RELEASE.jar deleted file mode 100644 index 83d7911043..0000000000 Binary files a/wrapper/springloaded-1.2.4.RELEASE.jar and /dev/null differ