Upgrade to grails 2.2.2

application.properties

@@ -1,6 +1,6 @@
 #Grails Metadata file
 #Tue Oct 30 15:47:26 MDT 2012
-app.grails.version=2.1.1
+app.grails.version=2.2.2
 app.name=ExternalConfigReload
-plugins.hibernate=2.1.1
-plugins.tomcat=2.1.1
+plugins.hibernate=2.2.2
+plugins.tomcat=2.2.2

grails-app/conf/BuildConfig.groovy

@@ -56,6 +56,8 @@ grails.project.dependency.resolution = {
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
 
         // runtime 'mysql:mysql-connector-java:5.1.13'
+
+		test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
     }
 	plugins {		
 		// Not exported
@@ -65,8 +67,9 @@ grails.project.dependency.resolution = {
 		test ':codenarc:0.15', {
 			export = false
 		}
-		test ':spock:0.6', {
+		test(":spock:0.7") {
 			export = false
+			exclude "spock-grails-support"
 		}
 		build (':release:2.0.4') {
 			export = false

grailsw

@@ -118,7 +118,7 @@ fi
 if [ -z "$STARTER_CONF" ]; then
     STARTER_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.1.0.jar:wrapper:."
+STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.2.2.jar:wrapper:."
 
 # Allow access to Cocoa classes on OS X
 if $darwin; then
@@ -179,16 +179,16 @@ if $cygwin ; then
         AGENT_GRAILS_HOME=`cygpath --windows "$GRAILS_HOME"`
 fi
 
-SPRINGLOADED_PARAMS="profile=grails"
-if [ -n "$GRAILS_AGENT_CACHE_DIR" ]; then
-    SPRINGLOADED_PARAMS="$SPRINGLOADED_PARAMS;cacheDir=$GRAILS_AGENT_CACHE_DIR"
-    if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then
-        mkdir -p $GRAILS_AGENT_CACHE_DIR
-    fi
+if [ -z "$GRAILS_AGENT_CACHE_DIR" ]; then
+    GRAILS_AGENT_CACHE_DIR=~/.grails/2.2.2/
+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-core-1.0.6.jar -noverify  -Dspringloaded=$SPRINGLOADED_PARAMS"
+AGENT_STRING="-javaagent:wrapper/springloaded-core-1.1.1.jar -noverify -Dspringloaded=\"$SPRINGLOADED_PARAMS\""
 CMD_LINE_ARGS=""
 DISABLE_RELOADING=false
 
@@ -302,7 +302,7 @@ startGrails() {
      then
  	GRAILS_OPTS="$GRAILS_OPTS"
      else
-	GRAILS_OPTS="-server -Xmx768M -Xms768M -XX:PermSize=256m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8"
+	GRAILS_OPTS="-server -Xmx768M -Xms64M -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8"
   fi
   JAVA_OPTS="$GRAILS_OPTS $JAVA_OPTS $AGENT"
   # Start the Profiler or the JVM

grailsw.bat

@@ -59,14 +59,14 @@ if "%GRAILS_HOME:~-1%"=="\" SET GRAILS_HOME=%GRAILS_HOME:~0,-1%
 
 :init
 
-set SPRINGLOADED_PARAMS="profile=grails"
-if not "%GRAILS_AGENT_CACHE_DIR%" == "" (
-set SPRINGLOADED_PARAMS="%SPRINGLOADED_PARAMS%;cacheDir=%GRAILS_AGENT_CACHE_DIR%"
+for %%x in ("%HOMEPATH%") do set SHORTHOME=%%~fsx
+if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.2.2/
+set SPRINGLOADED_PARAMS="profile=grails;cacheDir=%GRAILS_AGENT_CACHE_DIR%"
 if not exist "%GRAILS_AGENT_CACHE_DIR%" mkdir "%GRAILS_AGENT_CACHE_DIR%"
-)
-set AGENT_STRING=-javaagent:wrapper/springloaded-core-1.0.6.jar -noverify -Dspringloaded=%SPRINGLOADED_PARAMS%
+
+set AGENT_STRING=-javaagent:wrapper/springloaded-core-1.1.1.jar -noverify -Dspringloaded=\"%SPRINGLOADED_PARAMS%\"
 set DISABLE_RELOADING=
-if "%GRAILS_OPTS%" == "" set GRAILS_OPTS=-server -Xmx768M -Xms768M -XX:PermSize=256m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8
+if "%GRAILS_OPTS%" == "" set GRAILS_OPTS=-server -Xmx768M -Xms64M -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8
 
 @rem Get command-line arguments, handling Windows variants
 if "%@eval[2+2]" == "4" goto 4NT_args
@@ -130,7 +130,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.1.0.jar;wrapper;.
+set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.2.2.jar;wrapper;.
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 
@@ -159,7 +159,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=@grails.version@
+set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.2.2
 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%"
@@ -174,4 +174,3 @@ if "%OS%"=="Windows_NT" endlocal
 
 @rem Optional pause the batch file
 if "%GROOVY_BATCH_PAUSE%" == "on" pause
-

wrapper/grails-wrapper.properties

@@ -1 +1 @@
-wrapper.dist.url=http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/
+wrapper.dist.url=http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/