Merge branch '2.3.x' into 2.4.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java

Author: graemerocher

build.gradle

@@ -18,7 +18,7 @@ ext.providedDeps = []
 
 ext.provided = { providedDeps << it }
 ext {
-    grailsVersion = '2.4.2.BUILD-SNAPSHOT'
+    grailsVersion = '2.4.2'
     isBuildSnapshot = grailsVersion.endsWith(".BUILD-SNAPSHOT")
     antTraxVersion = "1.7.1"
     antVersion = "1.8.4"

build.properties

@@ -1,2 +1,2 @@
-grails.version=2.4.2.BUILD-SNAPSHOT
+grails.version=2.4.2
 

grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java

@@ -35,7 +35,7 @@
 public class GrailsUtilTests extends TestCase {
 
     public void testGrailsVersion() {
-        assertEquals("2.4.2.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
+        assertEquals("2.4.2", GrailsUtil.getGrailsVersion());
     }
 
     @Override