Merge pull request #264 from bobbywarner/2.0.x

Updated 2.0 branch with Groovy 1.8.8
grails · Sep 12, 2012 · 9faacb7 · 9faacb7
2 parents 88394f4 + dbf1caf
commit 9faacb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ ext {
     datastoreVersion = "1.0.9.RELEASE"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
-    groovyVersion = "1.8.7"
+    groovyVersion = "1.8.8"
     gradleGroovyVersion = groovyVersion
     gradleGroovyVersion = "1.8.2"
     ivyVersion = "2.2.0"

diff --git a/dependencies.txt b/dependencies.txt
@@ -88,8 +88,8 @@ The following libraries are included in Grails because they are required either
 - Gant 1.9.5 (http://gant.codehaus.org) Apache 2.0 License
 - required for the command line tools (Gant)
 
-* groovy-all-1.8.7.jar
-- Groovy 1.8.7 (http://groovy.codehaus.org) Apache 2.0 License
+* groovy-all-1.8.8.jar
+- Groovy 1.8.8 (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/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java b/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
@@ -181,7 +181,7 @@ public Object doCall() {
 
                         // dependencies needed at compile time
                         ModuleRevisionId[] groovyDependencies = {
-                            ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "1.8.7")
+                            ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "1.8.8")
                         };
                         registerDependencies(dependencyManager, compileTimeDependenciesMethod, groovyDependencies, "jline");