Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x

build.gradle

@@ -174,7 +174,15 @@ subprojects { project ->
     }
 
     dependencies {
-        groovy groovyDependency
+        // this check is really here only to support the
+        // joint build.  as soon as the 2.1 Groovy branch
+        // is update to Gradle 1.10 we can remove this and
+        // remove the call to "groovy groovyDependency"
+        if('1.10' == project.gradle.gradleVersion) {
+            compile groovyDependency
+        } else {
+            groovy groovyDependency
+        }
 
         if (project.name != "grails-docs") {
             // Logging
@@ -222,15 +230,6 @@ subprojects { project ->
     }
 
     if(!isTestSuite) {
-
-        // Map the groovy gradle configuration to the “compile” scope in our published POMs.
-        // For some reason, this has to go here. If it's put later in the build, the groovy-all
-        // JAR doesn't get added to the artifact POMs.
-        def groovyConfiguration = project.configurations.findByName("groovy")
-        if (groovyConfiguration) {
-            conf2ScopeMappings.addMapping(1, groovyConfiguration, "compile")
-        }
-
         artifacts {
             archives jar
             archives sourcesJar
@@ -374,6 +373,6 @@ apply {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.5-rc-1'
+    gradleVersion = '1.10'
     jarFile = 'gradle/wrapper/gradle-wrapper.jar'
 }

gradle/assemble.gradle

@@ -48,9 +48,8 @@ task configurePopulateDependencies << {
 
     ext {
         baseCachesDir = "$gradle.gradleUserHomeDir/caches"
-        cacheDir = "$baseCachesDir/artifacts-14"
-        metadata = "$cacheDir/module-metadata"
-        filestore = "$cacheDir/filestore"
+        cacheDir = "$baseCachesDir/modules-2"
+        metadata = "$cacheDir/metadata-2.1/descriptors"
     }
 
     def seen = []
@@ -75,9 +74,8 @@ task configurePopulateDependencies << {
                 }
 
                 populateDependencies.from ("${metadata}/${dependency.group}/${dependency.name}/${dependency.version}") {
-                    include "*.ivy.xml"
-                    eachFile { it.path = "$dependency.group/$dependency.name/ivy-${dependency.version}.xml" }
-
+                    include "**/*ivy.xml"
+                    eachFile { it.path = "$dependency.group/$dependency.name/ivy-${dependency.version}.xml" }   
                 }
             }
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 20 13:37:09 CET 2013
+#Mon Dec 23 12:10:03 CST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-rc-1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

grails-test-suite-web/build.gradle

@@ -42,6 +42,19 @@ dependencies {
         exclude group: 'javassist', module: 'javassist'
     }
 }
+
+// javaee-web-api has a bad versions of classes we need to compile against
+// Just remove it fromt the compile classpath here
+configurations {
+    testCompile {
+        exclude module: "javaee-web-api"
+    }
+}
+
+compileTestGroovy {
+    groovyOptions.listFiles = true
+}
+
 test {
     maxParallelForks = 4
     forkEvery = 100