Upgrade Gradle to 3.2.1

build.gradle

@@ -388,17 +388,17 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = "1.11"
+		gradleVersion = '3.2.1'
 
 		doLast() {
 			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
 			def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m"
 			File wrapperFile = file("gradlew")
 			wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=",
-				"GRADLE_OPTS=\"$gradleOpts \$GRADLE_OPTS\"\nDEFAULT_JVM_OPTS=")
+					"GRADLE_OPTS=\"$gradleOpts \$GRADLE_OPTS\"\nDEFAULT_JVM_OPTS=")
 			File wrapperBatFile = file("gradlew.bat")
 			wrapperBatFile.text = wrapperBatFile.text.replace("set DEFAULT_JVM_OPTS=",
-				"set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
+					"set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
 		}
 	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
-#Wed Jun 03 17:02:42 EDT 2015
+#Fri Jan 06 14:16:36 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,13 +6,31 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
-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.
+GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -31,6 +49,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -41,31 +60,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# 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\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -91,7 +90,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
@@ -115,6 +114,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -155,11 +155,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# 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" "$@"

gradlew.bat

@@ -8,15 +8,15 @@
 @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 GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
-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 GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -47,10 +47,9 @@ 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
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -61,11 +60,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

spring-binding/src/main/java/org/springframework/binding/convert/converters/ArrayToCollection.java

@@ -33,7 +33,7 @@ import org.springframework.core.GenericCollectionTypeResolver;
  * Special converter that converts from a source array to a target collection. Supports the selection of an
  * "approximate" collection implementation when a target collection interface such as <code>List.class</code> is
  * specified. Supports type conversion of array elements when a concrete parameterized collection class is provided,
- * such as <code>IntegerList<Integer>.class</code>.
+ * such as {@code IntegerList<Integer>.class}.
  * 
  * Note that type erasure prevents arbitrary access to generic collection element type information at runtime,
  * preventing the ability to convert elements for collections declared as properties.

spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java

@@ -174,8 +174,8 @@ import org.springframework.webflow.execution.ScopeType;
  * </ul>
  * 
  * <p>
- * <b>FormAction configurable properties</b><br>
  * <table border="1">
+ * <caption>FormAction configurable properties</caption>
  * <tr>
  * <td><b>name</b></td>
  * <td><b>default</b></td>

spring-webflow/src/main/java/org/springframework/webflow/action/ResultObjectBasedEventFactory.java

@@ -21,8 +21,9 @@ import org.springframework.webflow.execution.RequestContext;
 
 /**
  * Result object-to-event adapter interface that tries to do a sensible conversion of the result object into a web flow
- * event. It uses the following conversion table:
+ * event. It uses the following:
  * <table border="1">
+ * <caption>Conversion Table</caption>
  * <tr>
  * <th>Result object type</th>
  * <th>Event id</th>
@@ -40,11 +41,6 @@ import org.springframework.webflow.execution.RequestContext;
  * <td>&nbsp;</td>
  * </tr>
  * <tr>
- * <td>{@link org.springframework.core.enums.LabeledEnum}</td>
- * <td>{@link org.springframework.core.enums.LabeledEnum#getLabel()}</td>
- * <td>The result object will included in the event as an attribute named "result".</td>
- * </tr>
- * <tr>
  * <td>{@link java.lang.Enum}</td>
  * <td>{@link java.lang.Enum#name()}</td>
  * <td>The result object will included in the event as an attribute named "result".</td>

spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java

@@ -30,8 +30,9 @@ import org.springframework.webflow.core.collection.AttributeMap;
  * <p>
  * This implementation extracts the filename and removes the file extension from the request URL. The results will be
  * used as the flow Id that must be unique throughout the application.
- * 
- * For example the URLs
+ *
+ * <p>
+ * For example the URLs:
  * 
  * <pre>
  * 	http://someHost/someApp/someServlet/foo
@@ -40,8 +41,8 @@ import org.springframework.webflow.core.collection.AttributeMap;
  * </pre>
  * 
  * will all treat the filename "foo" as the flow id.
- * </p>
- * 
+ *
+ * <p>
  * <strong>Note:</strong> Because this class only treats a filename as a flow id, clashes can result. For example:
  * 
  * <pre>

spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java

@@ -29,7 +29,7 @@ import org.springframework.webflow.execution.RequestContext;
  * A path from one {@link TransitionableState state} to another {@link State state}.
  * <p>
  * When executed a transition takes a flow execution from its current state, called the <i>source state</i>, to another
- * state, called the </i>target state</i>. A transition may become eligible for execution on the occurrence of an
+ * state, called the <i>target state</i>. A transition may become eligible for execution on the occurrence of an
  * {@link Event} from within a transitionable source state.
  * <p>
  * When an event occurs within this transition's source <code>TransitionableState</code> the determination of the
@@ -246,4 +246,4 @@ public class Transition extends AnnotatedObject implements TransitionDefinition
 		return new ToStringCreator(this).append("on", getMatchingCriteria()).append("to", getTargetStateResolver())
 				.toString();
 	}
-}
+}

spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java

@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
 /**
  * The default document loader strategy for XSD-based XML documents with validation enabled by default.
  * <p>
- * Note: full XSD support requires JDK 5.0 or a capable parser such as Xerces 2.0. JDK 1.4 or < do not fully support XSD
+ * Note: full XSD support requires JDK 5.0 or a capable parser such as Xerces 2.0. JDK 1.4 or less do not fully support XSD
  * out of the box. To use this implementation on JDK 1.4 make sure Xerces is available in your classpath or disable XSD
  * validation by {@link #setValidating(boolean) setting the validating property to false}.
  * 

spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutorImpl.java

@@ -39,8 +39,8 @@ import org.springframework.webflow.execution.repository.FlowExecutionRepository;
  * This object is a facade or entry point into the Spring Web Flow execution system and makes the overall system easier
  * to use. The name <i>executor</i> was chosen as <i>executors drive executions</i>.
  * <p>
- * <b>Commonly used configurable properties</b><br>
  * <table border="1">
+ * <caption>Commonly used configurable properties</caption>
  * <tr>
  * <td><b>name</b></td>
  * <td><b>description</b></td>
@@ -62,8 +62,7 @@ import org.springframework.webflow.execution.repository.FlowExecutionRepository;
  * <td>None</td>
  * </tr>
  * </table>
- * </p>
- * 
+ *
  * @see FlowDefinitionLocator
  * @see FlowExecutionFactory
  * @see FlowExecutionRepository
@@ -191,4 +190,4 @@ public class FlowExecutorImpl implements FlowExecutor {
 				.toString());
 	}
 
-}
+}