SWS-995 - Upgrade all point releases

Additional, upgrade:

* Gradle 4.0
* CircleCI 2.0 (using latest Java 8 JDK, even though artifacts are Java 7)
* Plugins
* Any outstanding test cases that are broken for Spring IO Platform (Athens and Brussels)

Author: gregturn

build.gradle

@@ -3,9 +3,9 @@ buildscript {
 		maven { url 'http://repo.springsource.org/plugins-release' }
 	}
 	dependencies {
-		classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
+		classpath 'io.spring.gradle:propdeps-plugin:0.0.9.RELEASE'
 		classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 	}
 }
 
@@ -169,7 +169,7 @@ project('spring-xml') {
 
 		//XML
 		optional("org.apache.ws.xmlschema:xmlschema-core:2.1.0")
-		optional("jaxen:jaxen:1.1.4")
+		optional("jaxen:jaxen:1.1.6")
 	}
 }
 
@@ -187,7 +187,7 @@ project('spring-ws-core') {
 		testCompile("org.springframework:spring-test:$springVersion")
 
 		// XML
-		optional("org.jdom:jdom2:2.0.5")
+		optional("org.jdom:jdom2:2.0.6")
 		optional("dom4j:dom4j:1.6.1")
 		optional("xom:xom:1.2.5") {
 			exclude group: 'xml-apis', module: 'xml-apis'
@@ -203,17 +203,17 @@ project('spring-ws-core') {
 		}
 
 		// WSDL
-		optional("wsdl4j:wsdl4j:1.6.1")
+		optional("wsdl4j:wsdl4j:1.6.3")
 
 		// Transport
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional("org.apache.httpcomponents:httpclient:4.3.4")
+		optional("org.apache.httpcomponents:httpclient:4.3.6")
 		optional("commons-httpclient:commons-httpclient:3.1")
 		testCompile("org.mortbay.jetty:jetty:6.1.26")
 
-		testCompile("log4j:log4j:1.2.16")
-		testCompile("org.aspectj:aspectjrt:1.6.9")
-		testRuntime("org.aspectj:aspectjweaver:1.6.9")
+		testCompile("log4j:log4j:1.2.17")
+		testCompile("org.aspectj:aspectjrt:1.6.12")
+		testRuntime("org.aspectj:aspectjweaver:1.6.12")
 	}
 }
 
@@ -258,18 +258,18 @@ project('spring-ws-security') {
 
 		// Spring Security
 		compile("org.springframework.security:spring-security-core:$springSecurityVersion")
-		optional("net.sf.ehcache:ehcache:2.8.4")
+		optional("net.sf.ehcache:ehcache:2.8.9")
 
 		// WS-Security
 		optional("com.sun.xml.wss:xws-security:3.0") {
 			exclude group: 'javax.xml.crypto', module: 'xmldsig'
 		}
 
 		compile("org.apache.ws.security:wss4j:1.6.19")
-		compile("org.apache.wss4j:wss4j-ws-security-dom:2.1.4")
+		compile("org.apache.wss4j:wss4j-ws-security-dom:2.1.11")
 
 		// SOAP
-		provided("com.sun.xml.messaging.saaj:saaj-impl:1.3.19") // required for XWSS
+		provided("com.sun.xml.messaging.saaj:saaj-impl:1.3.28") // required for XWSS
 		optional("org.apache.ws.commons.axiom:axiom-api:$axiomVersion")
 		optional("org.apache.ws.commons.axiom:axiom-impl:$axiomVersion") {
 			exclude group: 'org.codehaus.woodstox', module: 'wstx-asl'
@@ -461,9 +461,4 @@ configure(rootProject) {
 		archives schemaZip
 		archives distZip
 	}
-
-	task wrapper(type: Wrapper) {
-		description = 'Generates gradlew[.bat] scripts'
-		gradleVersion = '2.8'
-	}
 }

circle.yml

@@ -1,20 +1,14 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8u141
+    steps:
+      - checkout
+      - run: ./gradlew clean build
+      - run: ./gradlew -Pprofile=spring4-next clean build
+
 general:
   branches:
     ignore:
       - gh-pages # list of branches to ignore
-
-dependencies:
-  cache_directories:
-    - "~/.m2"
-
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-
-test:
-  override:
-    - ./gradlew clean build
-    - ./gradlew -Pprofile=spring4-next clean build
-    - ./gradlew -Pprofile=spring5 clean build

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Jan 20 16:03:00 CST 2016
+#Thu Oct 05 08:58:22 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# 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"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -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
@@ -150,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 "$@")
+
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

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,10 +46,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.
@@ -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

gradlew.bat

@@ -34,7 +34,6 @@
 import org.springframework.ws.client.support.interceptor.ClientInterceptor;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.support.TestUtilities;
 import org.springframework.ws.transport.FaultAwareWebServiceConnection;
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageSender;
@@ -486,9 +485,7 @@ public boolean supports(URI uri) {
 
 		reset(connectionMock);
 
-		if (!TestUtilities.SPRING5) {
-			expect(connectionMock.getUri()).andReturn(providerUri);
-		}
+		expect(connectionMock.getUri()).andReturn(providerUri);
 
 		connectionMock.send(isA(WebServiceMessage.class));
 		expect(connectionMock.hasError()).andReturn(false);

spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java

@@ -28,7 +28,6 @@
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.support.TestUtilities;
 import org.springframework.ws.transport.FaultAwareWebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageReceiver;
 
@@ -55,9 +54,7 @@ public void setUp() throws Exception {
 
 	@Test
 	public void handleConnectionResponse() throws Exception {
-		if (!TestUtilities.SPRING5) {
-			expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
-		}
+		expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
 		expect(connectionMock.receive(messageFactory)).andReturn(request);
 		connectionMock.setFaultCode(null);
 		connectionMock.send(isA(WebServiceMessage.class));
@@ -83,9 +80,7 @@ public void receive(MessageContext messageContext) throws Exception {
 	public void handleConnectionFaultResponse() throws Exception {
 		final QName faultCode = SoapVersion.SOAP_11.getClientOrSenderFaultName();
 
-		if (!TestUtilities.SPRING5) {
-			expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
-		}
+		expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
 		expect(connectionMock.receive(messageFactory)).andReturn(request);
 		connectionMock.setFaultCode(faultCode);
 		connectionMock.send(isA(WebServiceMessage.class));
@@ -111,9 +106,7 @@ public void receive(MessageContext messageContext) throws Exception {
 
 	@Test
 	public void handleConnectionNoResponse() throws Exception {
-		if (!TestUtilities.SPRING5) {
-			expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
-		}
+		expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
 		expect(connectionMock.receive(messageFactory)).andReturn(request);
 		connectionMock.close();
 

spring-ws-core/src/test/java/org/springframework/ws/support/TestUtilities.java

@@ -2,5 +2,5 @@
  * Enable with "-Pprofile=spring4-next"
  */
 
-ext.springVersion = "4.3.10.RELEASE"
+ext.springVersion = "4.3.11.RELEASE"
 ext.springSecurityVersion = "4.2.3.RELEASE"