Upgrade to Gradle 3.3 and other build adjustments

build.gradle

@@ -3,7 +3,8 @@ buildscript {
 		maven { url 'http://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.5.RELEASE'
+		classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
 	}
 }
 
@@ -38,6 +39,14 @@ compileTestJava {
 	targetCompatibility = 1.8
 }
 
+sourceSets {
+	test {
+		resources {
+			srcDirs = ['src/test/resources', 'src/test/java']
+		}
+	}
+}
+
 if (project.hasProperty('platformVersion')) {
 	apply plugin: 'spring-io'
 
@@ -48,15 +57,20 @@ if (project.hasProperty('platformVersion')) {
 			}
 		}
 	}
+
+	springIoDependencyVersionMappingCheck {
+		configuration = configurations.testRuntime
+		failOnUnmappedDirectDependency = false
+	}
 }
 
 ext {
-	assertjVersion = '3.5.2'
+	assertjVersion = '3.6.2'
 	awsSdkVersion = '1.11.42'
 	servletApiVersion = '3.1.0'
-	slf4jVersion = '1.7.21'
+	slf4jVersion = '1.7.22'
 	springCloudAwsVersion = '1.1.3.RELEASE'
-	springIntegrationVersion = '4.3.4.RELEASE'
+	springIntegrationVersion = '4.3.7.RELEASE'
 
 	idPrefix = 'aws'
 
@@ -73,7 +87,7 @@ ext.javadocLinks = [
 ] as String[]
 
 jacoco {
-	toolVersion = "0.7.7.201606060606"
+	toolVersion = "0.7.8"
 }
 
 checkstyle {
@@ -124,14 +138,6 @@ javadoc {
 	logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
 }
 
-sourceSets {
-	test {
-		resources {
-			srcDirs = ['src/test/resources', 'src/test/java']
-		}
-	}
-}
-
 // enable all compiler warnings; individual projects may customize further
 ext.xLintArg = '-Xlint:all,-options'
 [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Oct 12 19:15:34 EDT 2016
+#Tue Feb 07 15:09:04 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,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

@@ -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