diff --git a/.classpath b/.classpath
index 8a7fbc49b40..973b0304978 100644
--- a/.classpath
+++ b/.classpath
@@ -4,23 +4,23 @@
 	<classpathentry kind="src" path="scripts"/>
 	<classpathentry kind="src" output="target/eclipse/test-output" path="src/test"/>
 	<classpathentry kind="src" path="src/jar"/>
-	<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/HIBERNATE_HOME/src"/>
-	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aop-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.asm-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aspects-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.beans-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context.support-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.core-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.expression-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.instrument-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jdbc-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jms-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.orm-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.test-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.transaction-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.servlet-sources-3.0.0.RC3.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/Developer/hibernate-distribution-3.3.1.GA/project/core/src/main/java"/>
+	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aop-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.asm-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aspects-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.expression-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.instrument-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jdbc-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jms-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.orm-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.test-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.transaction-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="lib" path="lib/ant-junit-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-nodeps-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-1.7.1.jar"/>
@@ -74,5 +74,6 @@
 	<classpathentry kind="lib" path="lib/GParallelizer-0.8.3.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjrt-1.6.6.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjweaver-1.6.6.jar"/>
+	<classpathentry kind="var" path="ASPECTJRT_LIB"/>
 	<classpathentry kind="output" path="target/eclipse/bin-output"/>
 </classpath>
diff --git a/Grails.iml b/Grails.iml
index a2ea9d282cb..6aa5355c01a 100644
--- a/Grails.iml
+++ b/Grails.iml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Groovy" name="Groovy">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/idea-target/classes" />
     <output-test url="file://$MODULE_DIR$/idea-target/test-classes" />
@@ -13,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/jsp21" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/META-INF" />
       <excludeFolder url="file://$MODULE_DIR$/cruise" />
       <excludeFolder url="file://$MODULE_DIR$/doc" />
       <excludeFolder url="file://$MODULE_DIR$/downloads" />
@@ -105,15 +99,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/src/jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="GParallelizer" level="project" />
     <orderEntry type="library" name="DOM4J" level="project" />
     <orderEntry type="library" name="JPA" level="project" />
@@ -141,6 +126,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/src/jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <javadoc-paths>
       <root url="file://$MODULE_DIR$/../spring-framework-2.0/docs/api" />
       <root url="file://$MODULE_DIR$/../hibernate-3.2/doc/api" />
diff --git a/JSP21.iml b/JSP21.iml
index 5cc60cef005..eebac09d0e5 100644
--- a/JSP21.iml
+++ b/JSP21.iml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Groovy" name="Groovy">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/src/jsp21">
diff --git a/build.properties b/build.properties
index d0dfe102973..66746a8ea2c 100644
--- a/build.properties
+++ b/build.properties
@@ -15,7 +15,7 @@ bundlor.svnkit.version=1.3.1
 bundlor.servlet.version=2.5.0
 bundlor.radeox.version=1.0.0.b2
 bundlor.groovy.version=1.6.7
-bundlor.spring.version=3.0.0.RC3
+bundlor.spring.version=3.0.0.RELEASE
 bundlor.ant.version=1.7.1
 bundlor.ivy.version=2.0.0
 bundlor.gant.version=1.6.0
diff --git a/grails.ipr b/grails.ipr
index 91b18505b16..8c064c442dc 100644
--- a/grails.ipr
+++ b/grails.ipr
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="true" version="4">
+<project version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -25,9 +25,7 @@
         <option name="WHILE_ON_NEW_LINE" value="true" />
         <option name="CATCH_ON_NEW_LINE" value="true" />
         <option name="FINALLY_ON_NEW_LINE" value="true" />
-        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
-        <option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
-        <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+        <ADDITIONAL_INDENT_OPTIONS fileType="">
           <option name="INDENT_SIZE" value="4" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
@@ -36,8 +34,8 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
-          <option name="INDENT_SIZE" value="2" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="">
+          <option name="INDENT_SIZE" value="4" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
           <option name="USE_TAB_CHARACTER" value="false" />
@@ -45,8 +43,8 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="java">
-          <option name="INDENT_SIZE" value="4" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="">
+          <option name="INDENT_SIZE" value="2" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
           <option name="USE_TAB_CHARACTER" value="false" />
@@ -54,7 +52,7 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+        <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
           <option name="INDENT_SIZE" value="4" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
@@ -63,8 +61,8 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
-          <option name="INDENT_SIZE" value="4" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+          <option name="INDENT_SIZE" value="2" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
           <option name="USE_TAB_CHARACTER" value="false" />
@@ -72,8 +70,8 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="sql">
-          <option name="INDENT_SIZE" value="2" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="INDENT_SIZE" value="4" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
           <option name="TAB_SIZE" value="4" />
           <option name="USE_TAB_CHARACTER" value="false" />
@@ -99,16 +97,25 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="DEPLOY_AFTER_MAKE" value="2" />
     <excludeFromCompile>
       <file url="file://$PROJECT_DIR$/test/persistence/org/codehaus/groovy/grails/orm/hibernate/PersistenceMethodTests.groovy" />
       <file url="file://$PROJECT_DIR$/test/persistence/org/codehaus/groovy/grails/orm/hibernate/HibernateCriteriaBuilderTests.groovy" />
+      <file url="file:///Users/graemerocher/Library/Caches/IntelliJIdea90/compiler/grails.grails76ce06ee/.generated/groovyStubs/grails76ce06ee/Grails/tests/grails/spring/TestScope.java" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -125,6 +132,7 @@
       <entry name="?*.dtd" />
       <entry name="?*.tld" />
     </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
   </component>
   <component name="CopyrightManager" default="">
     <module2copyright />
@@ -136,11 +144,8 @@
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />
   </component>
   <component name="EclipseCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
     <option name="GENERATE_NO_WARNINGS" value="true" />
     <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
   <component name="EclipseEmbeddedCompilerSettings">
     <option name="DEBUGGING_INFO" value="true" />
@@ -218,29 +223,14 @@
   </component>
   <component name="IdProvider" IDEtalkID="094372AACB9649246F599517414513BF" />
   <component name="InspectionProjectProfileManager">
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-    <scopes />
-    <profiles>
-      <profile version="1.0" is_locked="false">
-        <option name="myName" value="Project Default" />
-        <option name="myLocal" value="false" />
-      </profile>
-    </profiles>
-    <list size="4">
+    <list size="5">
       <item index="0" class="java.lang.String" itemvalue="INFO" />
-      <item index="1" class="java.lang.String" itemvalue="WARNING" />
-      <item index="2" class="java.lang.String" itemvalue="ERROR" />
-      <item index="3" class="java.lang.String" itemvalue="SERVER PROBLEM" />
+      <item index="1" class="java.lang.String" itemvalue="TYPO" />
+      <item index="2" class="java.lang.String" itemvalue="WARNING" />
+      <item index="3" class="java.lang.String" itemvalue="ERROR" />
+      <item index="4" class="java.lang.String" itemvalue="SERVER PROBLEM" />
     </list>
   </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/doc/api" />
     <option name="OPTION_SCOPE" value="package" />
@@ -258,14 +248,6 @@
     <option name="LOCALE" />
     <option name="OPEN_IN_BROWSER" value="true" />
   </component>
-  <component name="JikesSettings">
-    <option name="JIKES_PATH" value="" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
   <component name="LogConsolePreferences">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
@@ -403,7 +385,6 @@
   <component name="ProjectDetails">
     <option name="projectName" value="grails" />
   </component>
-  <component name="ProjectFileVersion" converted="true" />
   <component name="ProjectKey">
     <option name="state" value="project:///Developer/grails-dev/core/grails/grails/grails.ipr" />
   </component>
@@ -425,13 +406,6 @@
       </value>
     </option>
   </component>
-  <component name="RmicSettings">
-    <option name="IS_EANABLED" value="false" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_IIOP_STUBS" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
       <map>
@@ -530,23 +504,23 @@
         <root url="jar://$PROJECT_DIR$/lib/org.springframework.webflow-2.0.8.RELEASE.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/org.springframework.js-2.0.8.RELEASE.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/org.springframework.binding-2.0.8.RELEASE.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.0.RC3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.0.RC3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.0.RELEASE.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.0.RELEASE.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
diff --git a/lib/org.springframework.aop-3.0.0.RC3.jar b/lib/org.springframework.aop-3.0.0.RELEASE.jar
similarity index 85%
rename from lib/org.springframework.aop-3.0.0.RC3.jar
rename to lib/org.springframework.aop-3.0.0.RELEASE.jar
index 65ae5aa9148..ec185b58c75 100644
Binary files a/lib/org.springframework.aop-3.0.0.RC3.jar and b/lib/org.springframework.aop-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.asm-3.0.0.RC3.jar b/lib/org.springframework.asm-3.0.0.RELEASE.jar
similarity index 88%
rename from lib/org.springframework.asm-3.0.0.RC3.jar
rename to lib/org.springframework.asm-3.0.0.RELEASE.jar
index a49e0084029..2e9b3510500 100644
Binary files a/lib/org.springframework.asm-3.0.0.RC3.jar and b/lib/org.springframework.asm-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.aspects-3.0.0.RC3.jar b/lib/org.springframework.aspects-3.0.0.RC3.jar
deleted file mode 100644
index a86d4210def..00000000000
Binary files a/lib/org.springframework.aspects-3.0.0.RC3.jar and /dev/null differ
diff --git a/lib/org.springframework.aspects-3.0.0.RELEASE.jar b/lib/org.springframework.aspects-3.0.0.RELEASE.jar
new file mode 100644
index 00000000000..c0eb9b560ff
Binary files /dev/null and b/lib/org.springframework.aspects-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.beans-3.0.0.RC3.jar b/lib/org.springframework.beans-3.0.0.RELEASE.jar
similarity index 71%
rename from lib/org.springframework.beans-3.0.0.RC3.jar
rename to lib/org.springframework.beans-3.0.0.RELEASE.jar
index 3423e84810c..d39d80ad04d 100644
Binary files a/lib/org.springframework.beans-3.0.0.RC3.jar and b/lib/org.springframework.beans-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.context-3.0.0.RC3.jar b/lib/org.springframework.context-3.0.0.RELEASE.jar
similarity index 69%
rename from lib/org.springframework.context-3.0.0.RC3.jar
rename to lib/org.springframework.context-3.0.0.RELEASE.jar
index 7cf24844eb8..aea23d651b6 100644
Binary files a/lib/org.springframework.context-3.0.0.RC3.jar and b/lib/org.springframework.context-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.context.support-3.0.0.RC3.jar b/lib/org.springframework.context.support-3.0.0.RELEASE.jar
similarity index 85%
rename from lib/org.springframework.context.support-3.0.0.RC3.jar
rename to lib/org.springframework.context.support-3.0.0.RELEASE.jar
index b30305a6922..ee0fb8d9698 100644
Binary files a/lib/org.springframework.context.support-3.0.0.RC3.jar and b/lib/org.springframework.context.support-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.core-3.0.0.RC3.jar b/lib/org.springframework.core-3.0.0.RELEASE.jar
similarity index 67%
rename from lib/org.springframework.core-3.0.0.RC3.jar
rename to lib/org.springframework.core-3.0.0.RELEASE.jar
index f8f11fb2231..39d1b9da216 100644
Binary files a/lib/org.springframework.core-3.0.0.RC3.jar and b/lib/org.springframework.core-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.expression-3.0.0.RC3.jar b/lib/org.springframework.expression-3.0.0.RC3.jar
deleted file mode 100644
index d4cff392d7a..00000000000
Binary files a/lib/org.springframework.expression-3.0.0.RC3.jar and /dev/null differ
diff --git a/lib/org.springframework.expression-3.0.0.RELEASE.jar b/lib/org.springframework.expression-3.0.0.RELEASE.jar
new file mode 100644
index 00000000000..a1ad2775019
Binary files /dev/null and b/lib/org.springframework.expression-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.instrument-3.0.0.RC3.jar b/lib/org.springframework.instrument-3.0.0.RC3.jar
deleted file mode 100644
index d7e163e6378..00000000000
Binary files a/lib/org.springframework.instrument-3.0.0.RC3.jar and /dev/null differ
diff --git a/lib/org.springframework.instrument-3.0.0.RELEASE.jar b/lib/org.springframework.instrument-3.0.0.RELEASE.jar
new file mode 100644
index 00000000000..731e4906bde
Binary files /dev/null and b/lib/org.springframework.instrument-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.jdbc-3.0.0.RC3.jar b/lib/org.springframework.jdbc-3.0.0.RELEASE.jar
similarity index 84%
rename from lib/org.springframework.jdbc-3.0.0.RC3.jar
rename to lib/org.springframework.jdbc-3.0.0.RELEASE.jar
index b19e78b7e38..41b43f718d1 100644
Binary files a/lib/org.springframework.jdbc-3.0.0.RC3.jar and b/lib/org.springframework.jdbc-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.jms-3.0.0.RC3.jar b/lib/org.springframework.jms-3.0.0.RELEASE.jar
similarity index 86%
rename from lib/org.springframework.jms-3.0.0.RC3.jar
rename to lib/org.springframework.jms-3.0.0.RELEASE.jar
index 73c5ecd8b2c..9452614d66a 100644
Binary files a/lib/org.springframework.jms-3.0.0.RC3.jar and b/lib/org.springframework.jms-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.orm-3.0.0.RC3.jar b/lib/org.springframework.orm-3.0.0.RELEASE.jar
similarity index 82%
rename from lib/org.springframework.orm-3.0.0.RC3.jar
rename to lib/org.springframework.orm-3.0.0.RELEASE.jar
index d58bccd6dd4..c2711565b95 100644
Binary files a/lib/org.springframework.orm-3.0.0.RC3.jar and b/lib/org.springframework.orm-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.oxm-3.0.0.RC3.jar b/lib/org.springframework.oxm-3.0.0.RELEASE.jar
similarity index 82%
rename from lib/org.springframework.oxm-3.0.0.RC3.jar
rename to lib/org.springframework.oxm-3.0.0.RELEASE.jar
index 24d4bb23e39..9180dcae011 100644
Binary files a/lib/org.springframework.oxm-3.0.0.RC3.jar and b/lib/org.springframework.oxm-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.test-3.0.0.RC3.jar b/lib/org.springframework.test-3.0.0.RELEASE.jar
similarity index 85%
rename from lib/org.springframework.test-3.0.0.RC3.jar
rename to lib/org.springframework.test-3.0.0.RELEASE.jar
index a13c3a12c7d..790eefc3539 100644
Binary files a/lib/org.springframework.test-3.0.0.RC3.jar and b/lib/org.springframework.test-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.transaction-3.0.0.RC3.jar b/lib/org.springframework.transaction-3.0.0.RELEASE.jar
similarity index 73%
rename from lib/org.springframework.transaction-3.0.0.RC3.jar
rename to lib/org.springframework.transaction-3.0.0.RELEASE.jar
index df98f2b5872..215bf38e105 100644
Binary files a/lib/org.springframework.transaction-3.0.0.RC3.jar and b/lib/org.springframework.transaction-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.web-3.0.0.RC3.jar b/lib/org.springframework.web-3.0.0.RELEASE.jar
similarity index 75%
rename from lib/org.springframework.web-3.0.0.RC3.jar
rename to lib/org.springframework.web-3.0.0.RELEASE.jar
index d19d0edbdce..3047956acbd 100644
Binary files a/lib/org.springframework.web-3.0.0.RC3.jar and b/lib/org.springframework.web-3.0.0.RELEASE.jar differ
diff --git a/lib/org.springframework.web.servlet-3.0.0.RC3.jar b/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
similarity index 78%
rename from lib/org.springframework.web.servlet-3.0.0.RC3.jar
rename to lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
index bb41434d48d..19b52711ef2 100644
Binary files a/lib/org.springframework.web.servlet-3.0.0.RC3.jar and b/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar differ
diff --git a/maven/grails.pom.in b/maven/grails.pom.in
index 52a7c5b5840..28e073a0314 100644
--- a/maven/grails.pom.in
+++ b/maven/grails.pom.in
@@ -46,6 +46,12 @@
             <url>http://download.java.net/maven/2/</url>
         </repository>
 
+        <repository>
+            <id>spring-release</id>
+            <name>Spring Portfolio Release Repository</name>
+            <url>http://repository.springsource.com/maven/bundles/release</url>
+        </repository>
+        
         <repository>
             <id>spring-milestone</id>
             <name>Spring Portfolio Milestone Repository</name>
@@ -94,7 +100,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -108,7 +114,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-asm</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -122,7 +128,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aspects</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -136,7 +142,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -150,7 +156,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -164,7 +170,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context-support</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -178,7 +184,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -192,7 +198,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-expression</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -206,7 +212,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-instrument</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -220,7 +226,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jdbc</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -234,7 +240,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jms</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -248,7 +254,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-orm</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -262,7 +268,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-oxm</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -277,7 +283,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-tx</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -291,7 +297,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -305,7 +311,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
@@ -319,7 +325,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
-                <version>3.0.0.RC3</version>
+                <version>3.0.0.RELEASE</version>
                 <scope>runtime</scope>
                 <exclusions>
                     <!-- We have JCL-over-SLF4J instead. -->
diff --git a/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy b/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
index f0817ae7efa..7ed71cc91b2 100644
--- a/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
+++ b/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -252,7 +252,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
                        "org.grails:grails-web:$grailsVersion",
                        "org.slf4j:slf4j-api:1.5.8",
                        "org.slf4j:slf4j-log4j12:1.5.8",
-                       "org.springframework:org.springframework.test:3.0.0.RC3"
+                       "org.springframework:org.springframework.test:3.0.0.RELEASE"
 
                 // dependencies needed during development, but not for deployment
                 provided "javax.servlet:servlet-api:2.5",
@@ -284,22 +284,22 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
                          "org.grails:grails-resources:$grailsVersion",
                          "org.grails:grails-spring:$grailsVersion",
                          "org.grails:grails-web:$grailsVersion",
-                         "org.springframework:org.springframework.core:3.0.0.RC3",
-                         "org.springframework:org.springframework.aop:3.0.0.RC3",
-                         "org.springframework:org.springframework.aspects:3.0.0.RC3",
-                         "org.springframework:org.springframework.asm:3.0.0.RC3",
-                         "org.springframework:org.springframework.beans:3.0.0.RC3",
-                         "org.springframework:org.springframework.context:3.0.0.RC3",
-                         "org.springframework:org.springframework.context.support:3.0.0.RC3",
-                         "org.springframework:org.springframework.expression:3.0.0.RC3",
-                         "org.springframework:org.springframework.instrument:3.0.0.RC3",
-                         "org.springframework:org.springframework.jdbc:3.0.0.RC3",
-                         "org.springframework:org.springframework.jms:3.0.0.RC3",
-                         "org.springframework:org.springframework.orm:3.0.0.RC3",
-                         "org.springframework:org.springframework.oxm:3.0.0.RC3",
-                         "org.springframework:org.springframework.transaction:3.0.0.RC3",
-                         "org.springframework:org.springframework.web:3.0.0.RC3",
-                         "org.springframework:org.springframework.web.servlet:3.0.0.RC3",
+                         "org.springframework:org.springframework.core:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.aop:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.aspects:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.asm:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.beans:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.context:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.context.support:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.expression:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.instrument:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.jdbc:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.jms:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.orm:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.oxm:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.transaction:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.web:3.0.0.RELEASE",
+                         "org.springframework:org.springframework.web.servlet:3.0.0.RELEASE",
                          "org.slf4j:slf4j-api:1.5.8") {
                         transitive = false
                 }
@@ -308,7 +308,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
                 // dependencies needed for running tests
                 test "junit:junit:3.8.2",
                      "org.grails:grails-test:$grailsVersion",
-                     "org.springframework:org.springframework.test:3.0.0.RC3"
+                     "org.springframework:org.springframework.test:3.0.0.RELEASE"
 
                 // dependencies needed at runtime only
                 runtime "org.aspectj:aspectjweaver:1.6.6",