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

Author: jeffscottbrown

build.gradle

@@ -25,7 +25,7 @@ commonsCliVersion = "1.2"
 commonsCollectionsVersion = "3.2.1"
 commonsIOVersion = "2.1"
 commonsLangVersion = "2.6"
-datastoreVersion = "1.0.0.BUILD-SNAPSHOT"
+datastoreVersion = "1.0.0.RELEASE"
 gantVersion = "1.9.6"
 gdocEngineVersion = "1.0.1"
 groovyVersion = "1.8.4"

gradle/assemble.gradle

@@ -72,7 +72,7 @@ task pluginsFromSvn {
     plugins = [
         hibernate: grailsVersion,
         tomcat: grailsVersion,
-        resources: "1.1.4",
+        resources: "1.1.5",
         webxml: "1.4.1",
         jquery: "1.7.1"
     ]

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java

@@ -191,7 +191,7 @@ public Object doCall() {
                         };
                         registerDependencies(dependencyManager, compileTimeDependenciesMethod, commonsExcludingLoggingAndXmlApis, "commons-logging", "xml-apis", "commons-digester");
 
-                        String datastoreMappingVersion = "1.0.0.BUILD-SNAPSHOT";
+                        String datastoreMappingVersion = "1.0.0.RELEASE";
                         ModuleRevisionId[] compileDependencies = {
                             ModuleRevisionId.newInstance("aopalliance", "aopalliance", "1.0"),
                             ModuleRevisionId.newInstance("com.googlecode.concurrentlinkedhashmap", "concurrentlinkedhashmap-lru", "1.2_jdk5"),

grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

@@ -39,7 +39,7 @@ grails.project.dependency.resolution = {
     plugins {
         compile ":hibernate:$grailsVersion"
         compile ":jquery:1.7.1"
-        compile ":resources:1.1.4"
+        compile ":resources:1.1.5"
 
         build ":tomcat:$grailsVersion"
     }