GRAILS-6577 - upgrade to Groovy 1.7.4

grails · Aug 4, 2010 · 888b94a · 888b94a
1 parent baa4373
commit 888b94a
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/.classpath b/.classpath
@@ -56,7 +56,7 @@
 	<classpathentry kind="lib" path="lib/ehcache-core-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
 	<classpathentry kind="var" path="ASPECTJRT_LIB"/>
-	<classpathentry kind="lib" path="lib/groovy-all-1.7.3.jar"/>
+	<classpathentry kind="lib" path="lib/groovy-all-1.7.4.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjrt-1.6.8.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjweaver-1.6.8.jar"/>
 	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.3.RELEASE.jar"/>

diff --git a/bin/startGrails b/bin/startGrails
@@ -114,7 +114,7 @@ fi
 if [ -z "$GROOVY_CONF" ]; then
     GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.4.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.4.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.4.jar"
 
 # Allow access to Cocoa classes on OS X
 if $darwin; then

diff --git a/bin/startGrails.bat b/bin/startGrails.bat
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.4.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.4.jar
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ configurations {
 dependencies {
     lib = "$projectDir/lib"
     groovy files(fileTree(dir: lib as File, includes: ['groovy-all-1.7.*.jar']))
-    compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.3.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
+    compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.4.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
     jsp21 files("$lib/jsp-api-2.1.jar")
 }
 

diff --git a/build.properties b/build.properties
@@ -16,7 +16,7 @@ bundlor.servlet.version=2.5.0
 bundlor.jndi.version=1.2.0
 bundlor.servlet.jsp.version=2.1.0
 bundlor.radeox.version=1.0.0.b2
-bundlor.groovy.version=1.7.3
+bundlor.groovy.version=1.7.4
 bundlor.spring.version=3.0.3.RELEASE
 bundlor.ant.version=1.7.1
 bundlor.ivy.version=2.0.0

diff --git a/conf/groovy-starter.conf b/conf/groovy-starter.conf
@@ -10,7 +10,7 @@
 ##
     # Load required libraries
     load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar
-    load ${grails.home}/lib/groovy-all-1.7.3.jar
+    load ${grails.home}/lib/groovy-all-1.7.4.jar
     load ${grails.home}/lib/gpars-0.9.jar
     load ${grails.home}/lib/ivy-2.1.0.jar
     load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar

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 1.9.2 (http://gant.codehaus.org) Apache 2.0 License
 - required for the command line tools (Gant)
 
-* groovy-all-1.7.3.jar
-- Groovy 1.7.3 (http://groovy.codehaus.org) Apache 2.0 License
+* groovy-all-1.7.4.jar
+- Groovy 1.7.4 (http://groovy.codehaus.org) Apache 2.0 License
 - required for the command line tools (Gant)
 - required for building Grails core
 - required for running Grails applications

diff --git a/grails.ipr b/grails.ipr
@@ -573,7 +573,7 @@
     </library>
     <library name="Groovy">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.7.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.7.4.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>

diff --git a/lib/groovy-all-1.7.3.jar → lib/groovy-all-1.7.4.jar b/lib/groovy-all-1.7.3.jar → lib/groovy-all-1.7.4.jar
diff --git a/maven/grails-docs.pom.in b/maven/grails-docs.pom.in
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>1.7.3</version>
+            <version>1.7.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>jline</groupId>

diff --git a/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy b/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -248,7 +248,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
                          "javax.servlet:jsp-api:2.1"
 
                 // dependencies needed for compilation
-                "${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.3") {
+                "${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.4") {
                     excludes 'jline'
                 }
 

diff --git a/src/resources/bash/startGrails b/src/resources/bash/startGrails
@@ -114,7 +114,7 @@ fi
 if [ -z "$GROOVY_CONF" ]; then
     GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.4.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar"
 
 # Allow access to Cocoa classes on OS X
 if $darwin; then

diff --git a/src/resources/bash/startGrails.bat b/src/resources/bash/startGrails.bat
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"