diff --git a/circle.yml b/circle.yml index dbc7d711..a6360356 100644 --- a/circle.yml +++ b/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: diff --git a/pom.xml b/pom.xml index f4d96534..905bed43 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 2.5 1.2 1.6.1 - 3.1 + 3.6 2.10.4 4.5.3 1.6.0 @@ -104,6 +104,7 @@ 2.0.1 4.12 1.2.17 + 2.11.0 1.9 1.3.28 4.2.1 @@ -121,11 +122,6 @@ - - commons-logging - commons-logging - ${commons-logging.version} - commons-io commons-io @@ -187,7 +183,7 @@ - springnext + spring-buildsnapshot 1.9.0.RC2 5.0.8.BUILD-SNAPSHOT @@ -221,6 +217,42 @@ + + springnext + + 1.9.0.RC2 + 5.1.0.BUILD-SNAPSHOT + 5.0.7.BUILD-SNAPSHOT + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-release + Spring Releases + https://repo.spring.io/release + + false + + + + + + distribute diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml index f4a241aa..1952e8b6 100644 --- a/spring-ws-core/pom.xml +++ b/spring-ws-core/pom.xml @@ -10,7 +10,6 @@ 3.0.2.BUILD-SNAPSHOT - org.springframework.ws spring-ws-core jar @@ -157,9 +156,9 @@ - log4j - log4j - ${log4j.version} + org.apache.logging.log4j + log4j-api + ${log4j2.version} test diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java index b353b2fa..25a5713e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java @@ -488,7 +488,7 @@ public class WebServiceTemplateTest { 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); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java deleted file mode 100644 index ac58ba01..00000000 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2005-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.ws.server.endpoint.interceptor; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PropertyConfigurator; -import org.apache.log4j.spi.LoggingEvent; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.ws.MockWebServiceMessage; -import org.springframework.ws.MockWebServiceMessageFactory; -import org.springframework.ws.context.DefaultMessageContext; -import org.springframework.ws.context.MessageContext; - -@Ignore -public class PayloadLoggingInterceptorTest { - - private PayloadLoggingInterceptor interceptor; - - private CountingAppender appender; - - private MessageContext messageContext; - - @Before - public void setUp() throws Exception { - interceptor = new PayloadLoggingInterceptor(); - appender = new CountingAppender(); - BasicConfigurator.configure(appender); - Logger.getRootLogger().setLevel(Level.DEBUG); - MockWebServiceMessage request = new MockWebServiceMessage(""); - messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - appender.reset(); - } - - @After - public void tearDown() throws Exception { - BasicConfigurator.resetConfiguration(); - ClassPathResource resource = new ClassPathResource("log4j.properties"); - PropertyConfigurator.configure(resource.getURL()); - } - - @Test - public void testHandleRequestDisabled() throws Exception { - interceptor.setLogRequest(false); - int eventCount = appender.getCount(); - interceptor.handleRequest(messageContext, null); - Assert.assertEquals("PayloadLoggingInterceptor logged when disabled", appender.getCount(), eventCount); - } - - @Test - public void testHandleRequestEnabled() throws Exception { - int eventCount = appender.getCount(); - interceptor.handleRequest(messageContext, null); - Assert.assertTrue("PayloadLoggingInterceptor did not log", appender.getCount() > eventCount); - } - - @Test - public void testHandleResponseDisabled() throws Exception { - MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse(); - response.setPayload(""); - interceptor.setLogResponse(false); - int eventCount = appender.getCount(); - interceptor.handleResponse(messageContext, null); - Assert.assertEquals("PayloadLoggingInterceptor logged when disabled", appender.getCount(), eventCount); - } - - @Test - public void testHandleResponseEnabled() throws Exception { - MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse(); - response.setPayload(""); - int eventCount = appender.getCount(); - interceptor.handleResponse(messageContext, null); - Assert.assertTrue("PayloadLoggingInterceptor did not log", appender.getCount() > eventCount); - } - - private static class CountingAppender extends AppenderSkeleton { - - private int count; - - public int getCount() { - return count; - } - - public void reset() { - count = 0; - } - - @Override - protected void append(LoggingEvent loggingEvent) { - count++; - } - - @Override - public boolean requiresLayout() { - return false; - } - - @Override - public void close() { - } - } -} \ No newline at end of file diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java deleted file mode 100644 index d715c955..00000000 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright 2005-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.ws.soap.server.endpoint.interceptor; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PropertyConfigurator; -import org.apache.log4j.spi.LoggingEvent; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.ws.context.DefaultMessageContext; -import org.springframework.ws.context.MessageContext; -import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; - -@Ignore -public class SoapEnvelopeLoggingInterceptorTest { - - private SoapEnvelopeLoggingInterceptor interceptor; - - private CountingAppender appender; - - private MessageContext messageContext; - - @Before - public void setUp() throws Exception { - interceptor = new SoapEnvelopeLoggingInterceptor(); - appender = new SoapEnvelopeLoggingInterceptorTest.CountingAppender(); - BasicConfigurator.configure(appender); - Logger.getRootLogger().setLevel(Level.DEBUG); - SaajSoapMessageFactory factory = new SaajSoapMessageFactory(); - factory.afterPropertiesSet(); - messageContext = new DefaultMessageContext(factory); - appender.reset(); - } - - @After - public void tearDown() throws Exception { - BasicConfigurator.resetConfiguration(); - ClassPathResource resource = new ClassPathResource("log4j.properties"); - PropertyConfigurator.configure(resource.getURL()); - } - - @Test - public void testHandleRequestDisabled() throws Exception { - interceptor.setLogRequest(false); - int eventCount = appender.getCount(); - interceptor.handleRequest(messageContext, null); - Assert.assertEquals("interceptor logged when disabled", appender.getCount(), eventCount); - } - - @Test - public void testHandleRequestEnabled() throws Exception { - int eventCount = appender.getCount(); - interceptor.handleRequest(messageContext, null); - Assert.assertTrue("interceptor did not log", appender.getCount() > eventCount); - } - - @Test - public void testHandleResponseDisabled() throws Exception { - messageContext.getResponse(); - interceptor.setLogResponse(false); - int eventCount = appender.getCount(); - interceptor.handleResponse(messageContext, null); - Assert.assertEquals("interceptor logged when disabled", appender.getCount(), eventCount); - } - - @Test - public void testHandleResponseEnabled() throws Exception { - messageContext.getResponse(); - int eventCount = appender.getCount(); - interceptor.handleResponse(messageContext, null); - Assert.assertTrue("interceptor did not log", appender.getCount() > eventCount); - } - - @Test - public void testHandleFaultDisabled() throws Exception { - messageContext.getResponse(); - interceptor.setLogFault(false); - int eventCount = appender.getCount(); - interceptor.handleFault(messageContext, null); - Assert.assertEquals("interceptor logged when disabled", appender.getCount(), eventCount); - } - - @Test - public void testHandleFaultEnabled() throws Exception { - messageContext.getResponse(); - int eventCount = appender.getCount(); - interceptor.handleResponse(messageContext, null); - Assert.assertTrue("interceptor did not log", appender.getCount() > eventCount); - } - - private static class CountingAppender extends AppenderSkeleton { - - private int count; - - public int getCount() { - return count; - } - - public void reset() { - count = 0; - } - - @Override - protected void append(LoggingEvent loggingEvent) { - count++; - } - - @Override - public boolean requiresLayout() { - return false; - } - - @Override - public void close() { - } - } -} diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java index d5904b52..d414078c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java @@ -16,7 +16,6 @@ package org.springframework.ws.transport.support; -import java.net.URI; import javax.xml.namespace.QName; import org.junit.Assert; @@ -45,6 +44,7 @@ public class WebServiceMessageReceiverObjectSupportTest { @Before public void setUp() throws Exception { + receiverSupport = new MyReceiverSupport(); messageFactory = new MockWebServiceMessageFactory(); receiverSupport.setMessageFactory(messageFactory); @@ -54,7 +54,7 @@ public class WebServiceMessageReceiverObjectSupportTest { @Test public void handleConnectionResponse() throws Exception { - expect(connectionMock.getUri()).andReturn(new URI("http://example.com")); + expect(connectionMock.receive(messageFactory)).andReturn(request); connectionMock.setFaultCode(null); connectionMock.send(isA(WebServiceMessage.class)); @@ -80,7 +80,6 @@ public class WebServiceMessageReceiverObjectSupportTest { public void handleConnectionFaultResponse() throws Exception { final QName faultCode = SoapVersion.SOAP_11.getClientOrSenderFaultName(); - expect(connectionMock.getUri()).andReturn(new URI("http://example.com")); expect(connectionMock.receive(messageFactory)).andReturn(request); connectionMock.setFaultCode(faultCode); connectionMock.send(isA(WebServiceMessage.class)); @@ -106,7 +105,7 @@ public class WebServiceMessageReceiverObjectSupportTest { @Test public void handleConnectionNoResponse() throws Exception { - expect(connectionMock.getUri()).andReturn(new URI("http://example.com")); + expect(connectionMock.receive(messageFactory)).andReturn(request); connectionMock.close(); diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml index 29c0001d..7b3185bd 100644 --- a/spring-ws-security/pom.xml +++ b/spring-ws-security/pom.xml @@ -10,7 +10,6 @@ 3.0.2.BUILD-SNAPSHOT - org.springframework.ws spring-ws-security jar diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml index 89d9a409..50ea8956 100644 --- a/spring-ws-support/pom.xml +++ b/spring-ws-support/pom.xml @@ -10,7 +10,6 @@ 3.0.2.BUILD-SNAPSHOT - org.springframework.ws spring-ws-support jar diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml index 39a9f31d..9ebc95e7 100644 --- a/spring-ws-test/pom.xml +++ b/spring-ws-test/pom.xml @@ -10,7 +10,6 @@ 3.0.2.BUILD-SNAPSHOT - org.springframework.ws spring-ws-test jar diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml index 7f761f00..898903f0 100644 --- a/spring-xml/pom.xml +++ b/spring-xml/pom.xml @@ -10,7 +10,6 @@ 3.0.2.BUILD-SNAPSHOT - org.springframework.ws spring-xml jar