upgrade to groovy 1.5, set to 1.0 RC3 release

graeme · graeme · commit ed48510f3eb9 · 2007-12-11T16:06:52.000Z
git-svn-id: https://svn.codehaus.org/grails/trunk@6302 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
diff --git a/.classpath b/.classpath
@@ -34,8 +34,8 @@
 	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/ehcache-1.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
-	<classpathentry kind="lib" path="lib/gant-0.3.4-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/groovy-all-1.1-final-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/gant-1.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/groovy-all-1.5.0.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb-1.8.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/jasper-compiler-5.5.15.jar"/>
diff --git a/bin/startGrails b/bin/startGrails
@@ -111,7 +111,7 @@ fi
 if [ -z "$GROOVY_CONF" ]; then
     GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.1-final-SNAPSHOT.jar:$GRAILS_HOME/dist/grails-cli-1.0-RC3-SNAPSHOT.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.5.jar:$GRAILS_HOME/dist/grails-cli-1.0-RC3.jar"
 
 # Allow access to Cocoa classes on OS X
 if $darwin; then
diff --git a/bin/startGrails.bat b/bin/startGrails.bat
@@ -118,7 +118,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.1-final-SNAPSHOT.jar;%GRAILS_HOME%\dist\grails-cli-1.0-RC3-SNAPSHOT.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.5.jar;%GRAILS_HOME%\dist\grails-cli-1.0-RC3.jar
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 
diff --git a/build.properties b/build.properties
@@ -1,4 +1,4 @@
-grails.version=1.0-RC3-SNAPSHOT
+grails.version=1.0-RC3
 grails.src.commons=src/commons
 grails.src.groovy=src/groovy
 
diff --git a/dependencies.txt b/dependencies.txt
@@ -83,8 +83,8 @@ The following libraries are included in Grails because they are required either
 - Gant 0.3.4 Snapshot build (http://groovy.codehaus.org/Gant)
 - required for the command line tools (Gant)
 
-* groovy-all-1.1-final-SNAPSHOT.jar
-- Groovy 1.1 final Snapshot build (http://groovy.codehaus.org)
+* groovy-all-1.5.jar
+- Groovy 1.5 (http://groovy.codehaus.org)
 - required for the command line tools (Gant)
 - required for building Grails core
 - required for running Grails applications
diff --git a/lib/gant-0.3.4-SNAPSHOT.jar b/lib/gant-0.3.4-SNAPSHOT.jar
diff --git a/lib/gant-1.0.0.jar b/lib/gant-1.0.0.jar
diff --git a/lib/groovy-all-1.5.0.jar b/lib/groovy-all-1.5.0.jar
diff --git a/test/groovy/grails/util/GrailsUtilTests.groovy b/test/groovy/grails/util/GrailsUtilTests.groovy
@@ -7,7 +7,7 @@ class GrailsUtilTests extends GroovyTestCase {
 
     void testGrailsVersion() {
 
-        assertEquals "1.0-RC3-SNAPSHOT", grails.util.GrailsUtil.getGrailsVersion()
+        assertEquals "1.0-RC3", grails.util.GrailsUtil.getGrailsVersion()
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-grails.version=1.0-RC3-SNAPSHOT`
	`1`	`+grails.version=1.0-RC3`
`2`	`2`	`grails.src.commons=src/commons`
`3`	`3`	`grails.src.groovy=src/groovy`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class GrailsUtilTests extends GroovyTestCase {`
`7`	`7`
`8`	`8`	`void testGrailsVersion() {`
`9`	`9`
`10`		`- assertEquals "1.0-RC3-SNAPSHOT", grails.util.GrailsUtil.getGrailsVersion()`
	`10`	`+ assertEquals "1.0-RC3", grails.util.GrailsUtil.getGrailsVersion()`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`