Merge branch 'master' into GRAILS-10032

Author: jameskleeh

build.gradle

@@ -12,6 +12,7 @@ buildscript {
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
         classpath "gradle.plugin.io.sdkman:gradle-sdkvendor-plugin:1.0.0"
+        classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
     }
 }
 
@@ -45,10 +46,10 @@ ext {
     reactorVersion = '2.0.7.RELEASE'
 
     spockVersion = '1.0-groovy-2.4'
-    springBootVersion = "1.4.0.RC1"
+    springBootVersion = "1.4.0.RELEASE"
     springLoadedVersion = "1.2.6.RELEASE"
     springLoadedCommonOptions = "-Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
-    springVersion = "4.3.1.RELEASE"
+    springVersion = "4.3.2.RELEASE"
     ehcacheVersion = "2.4.6"
     junitVersion = "4.12"
     concurrentlinkedhashmapVersion = "1.4.2"
@@ -160,6 +161,11 @@ apply from: "gradle/idea.gradle"
 subprojects { project ->
     version = grailsVersion
     group = "org.grails"
+
+    configurations {
+        documentation
+    }
+
     ext.isTestSuite = project.name.startsWith("grails-test-suite")
     ext.isCiBuild = project.hasProperty("isCiBuild")
     ext.pomInfo = {
@@ -206,6 +212,7 @@ subprojects { project ->
     if(project.name == 'grails-bom') return
 
     apply plugin: 'groovy'
+    apply plugin: "io.github.groovylang.groovydoc"
     if(!isTestSuite) {
         apply plugin: 'com.bmuschko.nexus'
         apply plugin: 'maven-publish'
@@ -259,7 +266,18 @@ subprojects { project ->
         options.debug = true
     }
 
+    configure([groovydoc]) {
+        onlyIf {
+            !isTestSuite
+        }
+        classpath += configurations.documentation
+        jvmArgs "-Xmx512M"
+    }
+
     configure([javadoc]) {
+        onlyIf {
+            !isTestSuite
+        }
         options.encoding "UTF-8"
         options.docEncoding "UTF-8"
         options.charSet "UTF-8"
@@ -279,6 +297,10 @@ subprojects { project ->
     }
 
     dependencies {
+        documentation("org.fusesource.jansi:jansi:$jansiVersion")
+        documentation("jline:jline:$jlineVersion")
+        documentation "org.codehaus.groovy:groovy-ant:$groovyVersion"
+
         compile groovyDependency
 
         testCompile "org.codehaus.groovy:groovy-test:${groovyVersion}", {

gradle/docs.gradle

@@ -1,3 +1,11 @@
+buildscript {
+    repositories {
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
+    }
+}
 /**
  * Since Grails is a mixed Groovy/Java codebase the javadoc tool needs stubs in order for javadoc compilation to pass
  * This target generates a set of stubs for the Groovy sources
@@ -66,15 +74,16 @@ task javadoc(type:Javadoc) {
     verbose = false
 }
 
-task groovydoc(type:Groovydoc) {
-    def subs = subprojects.findAll { it.name != 'grails-dependencies' && it.name != 'grails-bom' && it.name != 'grails-compat' }
+task groovydoc(type:org.groovy.lang.groovydoc.tasks.GroovydocTask) {
+    def subs = subprojects.findAll {
+        it.name != 'grails-dependencies' && it.name != 'grails-bom' && it.name != 'grails-compat' && !it.name.startsWith("grails-test-suite") }
     classpath = files(subs.configurations.compile)
     groovyClasspath = files(subs.configurations.compile)
     destinationDir = file("$docs.destinationDir/api")
     windowTitle = "Grails $grailsVersion"
     docTitle = "Grails $grailsVersion"
     source subs.sourceSets.main.groovy.srcDirs
-    use = true
+    jvmArgs "-Xmx768M"
 // Can't make these link methods to work
 //    link("http://static.springsource.org/spring/docs/3.0.x/javadoc-api", "org.springframework.")
 //    link("http://download.oracle.com/javase/1.5.0/docs/api", "java." , "javax.")

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Jun 28 09:23:56 CEST 2016
+#Tue Aug 23 09:20:31 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line