SWS-1027 - Fix log-based errors

Author: gregturn

circle.yml

@@ -18,6 +18,15 @@ jobs:
             name: Java 8 - Test Spring.NEXT
             command: ./mvnw -Pspringnext clean test
 
+   java_8_test_spring_buildsnapshot:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Java 8 - Test Spring.NEXT
+            command: ./mvnw -Pspring-buildsnapshot clean test
+
    java_10_test_current:
      docker:
        - image: circleci/openjdk:10.0.1-jdk-node-browsers
@@ -36,6 +45,15 @@ jobs:
             name: Java 10 - Test Spring.NEXT
             command: ./mvnw -Pspringnext clean test
 
+   java_10_test_spring_buildsnapshot:
+     docker:
+       - image: circleci/openjdk:10.0.1-jdk-node-browsers
+     steps:
+        - checkout
+        - run:
+            name: Java 10 - Test Spring.NEXT
+            command: ./mvnw -Pspring-buildsnapshot clean test
+
    deploy:
      docker:
        - image: circleci/openjdk:8u141
@@ -52,12 +70,16 @@ workflows:
       - java_10_test_current
       - java_8_test_spring_next
       - java_10_test_spring_next
+      - java_8_test_spring_buildsnapshot
+      - java_10_test_spring_buildsnapshot
       - deploy:
           requires:
             - java_8_test_current
             - java_10_test_current
             - java_8_test_spring_next
             - java_10_test_spring_next
+            - java_8_test_spring_buildsnapshot
+            - java_10_test_spring_buildsnapshot
 
 general:
   branches:

pom.xml

@@ -93,7 +93,7 @@
 		<commons-io.version>2.5</commons-io.version>
 		<commons-logging.version>1.2</commons-logging.version>
 		<dom4j.version>1.6.1</dom4j.version>
-		<easymock.version>3.1</easymock.version>
+		<easymock.version>3.6</easymock.version>
 		<ehcache.version>2.10.4</ehcache.version>
 		<httpclient.version>4.5.3</httpclient.version>
 		<javax-mail.version>1.6.0</javax-mail.version>
@@ -104,6 +104,7 @@
 		<jms.version>2.0.1</jms.version>
 		<junit.version>4.12</junit.version>
 		<log4j.version>1.2.17</log4j.version>
+		<log4j2.version>2.11.0</log4j2.version>
 		<mock-javamail.version>1.9</mock-javamail.version>
 		<saaj-impl.version>1.3.28</saaj-impl.version>
 		<smack.version>4.2.1</smack.version>
@@ -121,11 +122,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>${commons-logging.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -187,7 +183,7 @@
 
 	<profiles>
 		<profile>
-			<id>springnext</id>
+			<id>spring-buildsnapshot</id>
 			<properties>
 				<aspectj.version>1.9.0.RC2</aspectj.version>
 				<spring.version>5.0.8.BUILD-SNAPSHOT</spring.version>
@@ -221,6 +217,42 @@
 			</repositories>
 		</profile>
 
+		<profile>
+			<id>springnext</id>
+			<properties>
+				<aspectj.version>1.9.0.RC2</aspectj.version>
+				<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
+				<spring-security.version>5.0.7.BUILD-SNAPSHOT</spring-security.version>
+			</properties>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/snapshot</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-release</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
+
+
 		<profile>
 			<id>distribute</id>
 

spring-ws-core/pom.xml

@@ -10,7 +10,6 @@
 		<version>3.0.2.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.springframework.ws</groupId>
 	<artifactId>spring-ws-core</artifactId>
 	<packaging>jar</packaging>
 
@@ -157,9 +156,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j2.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -488,7 +488,7 @@ public boolean supports(URI uri) {
 		connectionMock.send(isA(WebServiceMessage.class));
 		expect(connectionMock.hasError()).andReturn(false);
 		expect(connectionMock.receive(messageFactory)).andReturn(null);
-		expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
+//		expect(connectionMock.getUri()).andReturn(new URI("http://example.com"));
 		connectionMock.close();
 
 		replay(connectionMock, extractorMock, providerMock);