Merge branch '3.1.x'

Author: graemerocher

\

@@ -0,0 +1,27 @@
+Revert "Use Gradle embedded within the "grails" process. Fixes #9640"
+
+This reverts commit 9134bc81f97a8227a5e7b635b8576e36149c6476.
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch 3.0.x
+# Your branch is up-to-date with 'origin/3.0.x'.
+#
+# You are currently bisecting, started from branch '06c1d57'.
+#
+# Changes to be committed:
+#	modified:   grails-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy
+#
+# Untracked files:
+#	gradle/test
+#	grails-bootstrap/GRAILS-8488.patch
+#	grails-keys.txt.asc
+#	media/logos/grails-cupsonly-logo-black.svg
+#	media/logos/grails-cupsonly-logo-white.svg
+#	media/logos/grails-cupsonly-logo.svg
+#	pubring.gpg
+#	run.sh
+#	secring.gpg
+#	settings.xml
+#	test.sh
+#

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         classpath "com.github.adrianbk:gradle-travisci-trigger-plugin:1.0.0"
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
-        classpath 'net.gvmtool:gradle-sdkvendor-plugin:0.3.1'
+        classpath "gradle.plugin.io.sdkman:gradle-sdkvendor-plugin:1.0.0"
     }
 }
 
@@ -32,7 +32,7 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"
     commonsLangVersion = "2.6"
-    datastoreVersion = "5.0.4.RELEASE"
+    datastoreVersion = "5.0.6.RELEASE"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
     groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.6"
@@ -41,13 +41,14 @@ ext {
     jlineVersion = "2.12"
     jnaVersion = "4.0.0"
     slf4jVersion = "1.7.10"
+    reactorCoreVersion = '2.0.8.RELEASE'
     reactorVersion = '2.0.7.RELEASE'
 
     spockVersion = '1.0-groovy-2.4'
-    springBootVersion = "1.3.3.RELEASE"
+    springBootVersion = "1.3.5.RELEASE"
     springLoadedVersion = "1.2.6.RELEASE"
     springLoadedCommonOptions = "-Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
-    springVersion = "4.2.5.RELEASE"
+    springVersion = "4.2.6.RELEASE"
     ehcacheVersion = "2.4.6"
     junitVersion = "4.12"
     concurrentlinkedhashmapVersion = "1.4.2"
@@ -479,7 +480,7 @@ tciTrigger {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.13'
     jarFile = 'gradle/wrapper/gradle-wrapper.jar'
 }
 
@@ -497,9 +498,9 @@ task buildscriptDependencies(type: org.gradle.api.tasks.diagnostics.DependencyRe
     }
 }
 
-apply plugin: 'net.gvmtool.sdkvendor'
-gvm {
-    api = "https://gvm-vendor.herokuapp.com"
+apply plugin: "io.sdkman.vendors"
+sdkman {
+    api = "https://vendors.sdkman.io"
     consumerKey = System.getenv("GVM_SDKVENDOR_KEY") ?: project.hasProperty("gvmSdkvendorKey") ? project.gvmSdkvendorKey : ''
     consumerToken = System.getenv("GVM_SDKVENDOR_TOKEN") ?: project.hasProperty("gvmSdkvendorToken") ? project.gvmSdkvendorToken : ''
     candidate = "grails"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri Nov 27 23:09:32 CET 2015
+#Tue May 10 14:14:04 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

gradlew.bat

@@ -3,8 +3,8 @@ dependencies {
         exclude group:'org.multiverse', module:'multiverse-core'
         exclude group:'org.codehaus.groovy', module: 'groovy-all'
     }
-    compile "io.projectreactor:reactor-core:$reactorVersion"
-    compile "io.projectreactor:reactor-stream:$reactorVersion"
+    compile "io.projectreactor:reactor-core:$reactorCoreVersion"
+    compile "io.projectreactor:reactor-stream:$reactorCoreVersion"
 }
 
 eclipse {

grails-async/build.gradle

@@ -1,14 +1,15 @@
 hibernate=4.3.10.7
-hibernate3=5.0.4
-hibernate4=5.0.4
-hibernate5=5.0.4
-mongodb=5.0.4
-cassandra=5.0.4
-neo4j=5.0.4
+hibernate3=5.0.6
+hibernate4=5.0.6
+hibernate5=5.0.6
+mongodb=5.0.6
+cassandra=5.0.6
+neo4j=5.0.6
 cache=3.0.2
-asset-pipeline=3.1.3
+asset-pipeline=3.2.1
+asset-pipeline-grails=2.8.2
 scaffolding=3.2.1
 fields=2.1.2
 geb=1.0.1
-views-json=1.0.8
-views-markup=1.0.8
+views-json=1.0.11
+views-markup=1.0.11

grails-bom/plugins.properties

@@ -47,6 +47,15 @@ interface ConfigMap extends Iterable<Map.Entry<String, Object>>, Map<String, Obj
      */
     def <T> T getProperty(String key, Class<T> targetType)
 
+    /**
+     * Return the property value associated with the given key, or {@code null}
+     * if the key cannot be resolved.
+     * @param key the property name to resolve
+     * @param targetType the expected type of the property value
+     * @see #getRequiredProperty(String, Class)
+     */
+    def <T> T getProperty(String key, Class<T> targetType, T defaultValue)
+
     /**
      * Return the property value associated with the given key, converted to the given
      * targetType (never {@code null}).

grails-bootstrap/src/main/groovy/grails/config/ConfigMap.groovy

@@ -254,7 +254,6 @@ class IOUtils extends SpringIOUtils {
                 def buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
                 if(rootPath.contains(buildClassespath)) {
                     return new File(rootPath - buildClassespath)
-
                 }
             } catch (FileNotFoundException fnfe) {
                 return null