diff --git a/build.gradle b/build.gradle index 7773c48380..87fb2fc2a4 100644 --- a/build.gradle +++ b/build.gradle @@ -142,7 +142,6 @@ subprojects { subproject -> servletApiVersion = '3.1.0' slf4jVersion = "1.7.21" tomcatVersion = "8.0.30" - smack3Version = '3.2.1' smackVersion = '4.1.6' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.0.BUILD-SNAPSHOT' // springCloudClusterVersion = '1.0.0.BUILD-SNAPSHOT' @@ -154,7 +153,7 @@ subprojects { subproject -> springSocialTwitterVersion = '1.1.1.RELEASE' springRetryVersion = '1.1.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.0.BUILD-SNAPSHOT' - springWsVersion = '2.2.4.RELEASE' + springWsVersion = '2.3.0.RELEASE' xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' zookeeperVersion = '3.4.7' @@ -311,7 +310,9 @@ project('spring-integration-core') { compile "org.springframework:spring-context:$springVersion" compile "org.springframework:spring-messaging:$springVersion" compile "org.springframework:spring-tx:$springVersion" - compile "org.springframework.retry:spring-retry:$springRetryVersion" + compile ("org.springframework.retry:spring-retry:$springRetryVersion") { + exclude group: 'org.springframework', module: 'spring-core' + } // compile ("org.springframework.cloud:spring-cloud-cluster-core:$springCloudClusterVersion", optional) compile ("io.projectreactor:reactor-stream:$reactorVersion", optional) compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional) @@ -668,12 +669,7 @@ project('spring-integration-ws') { exclude group: 'org.springframework', module: 'spring-web' exclude group: 'org.springframework', module: 'spring-webmvc' } - compile("javax.xml.soap:saaj-api:$saajApiVersion") { dep -> - optional dep - exclude group: 'javax.activation', module: 'activation' - } - compile("com.sun.xml.messaging.saaj:saaj-impl:$saajImplVersion", optional) - compile("javax.activation:activation:$javaxActivationVersion", optional) + testCompile "com.thoughtworks.xstream:xstream:$xstreamVersion" testCompile ("org.springframework.ws:spring-ws-support:$springWsVersion") { exclude group: 'org.springframework' @@ -682,8 +678,9 @@ project('spring-integration-ws') { exclude group: 'org.springframework' } testCompile "javax.jms:jms-api:$jmsApiVersion" - testCompile "org.igniterealtime.smack:smack:$smack3Version" - testCompile "org.igniterealtime.smack:smackx:$smack3Version" + testCompile "org.igniterealtime.smack:smack-tcp:$smackVersion" + testCompile "org.igniterealtime.smack:smack-java7:$smackVersion" + testCompile "org.igniterealtime.smack:smack-extensions:$smackVersion" testCompile "javax.mail:javax.mail-api:$javaxMailVersion" testRuntime "com.sun.mail:mailapi:$javaxMailVersion" } diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index ecbbb8f810..1398db07d3 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -35,23 +35,25 @@ import javax.jms.Queue; import javax.jms.Session; import org.hamcrest.Matchers; +import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.packet.Packet; +import org.jivesoftware.smack.packet.Stanza; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.messaging.MessageHandlingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHandlingException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.ws.client.WebServiceClientException; @@ -208,9 +210,9 @@ public class UriVariableTests { } @Test - public void testInt2720XmppUriVariables() { + public void testInt2720XmppUriVariables() throws SmackException.NotConnectedException { - Mockito.doThrow(new WebServiceIOException("intentional")).when(this.xmppConnection).sendPacket(Mockito.any(Packet.class)); + Mockito.doThrow(new WebServiceIOException("intentional")).when(this.xmppConnection).sendStanza(Mockito.any(Stanza.class)); Message message = MessageBuilder.withPayload("").setHeader("to", "user").build(); try { @@ -222,8 +224,8 @@ public class UriVariableTests { assertTrue(WebServiceIOException.class.equals(causeType)); // offline } - ArgumentCaptor argument = ArgumentCaptor.forClass(Packet.class); - Mockito.verify(this.xmppConnection).sendPacket(argument.capture()); + ArgumentCaptor argument = ArgumentCaptor.forClass(Stanza.class); + Mockito.verify(this.xmppConnection).sendStanza(argument.capture()); assertEquals("user@jabber.org", argument.getValue().getTo()); assertEquals("xmpp:user@jabber.org", this.interceptor.getLastUri().toString()); diff --git a/src/reference/asciidoc/ws.adoc b/src/reference/asciidoc/ws.adoc index 0439bb27fc..f856fae736 100644 --- a/src/reference/asciidoc/ws.adoc +++ b/src/reference/asciidoc/ws.adoc @@ -77,7 +77,8 @@ To configure an outbound Web Service Gateway, use the "outbound-gateway" element ---- NOTE: Notice that this example does not provide a 'reply-channel'. -If the Web Service were to return a non-empty response, the Message containing that response would be sent to the reply channel provided in the request Message's REPLY_CHANNEL header, and if that were not available a channel resolution Exception would be thrown. +If the Web Service were to return a non-empty response, the Message containing that response would be sent to the reply +channel provided in the request Message's `REPLY_CHANNEL` header, and if that were not available a channel resolution Exception would be thrown. If you want to send the reply to another channel instead, then provide a 'reply-channel' attribute on the 'outbound-gateway' element. TIP: When invoking a Web Service that returns an empty response after using a String payload for the request Message, _no reply Message will be sent by default_. @@ -152,7 +153,7 @@ _Controlling URI Encoding_ By default, the URL string is encoded (see http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/util/UriComponentsBuilder.html[UriComponentsBuilder]) to the URI object before sending the request. In some scenarios with a non-standard URI it is undesirable to perform the encoding. -Since _version 4.1 _ the `` provides an `encode-uri` attribute. +Since _version 4.1_ the `` provides an `encode-uri` attribute. To disable encoding the URL, this attribute should be set to `false` (by default it is `true`). If you wish to partially encode some of the URL, this can be achieved using an `expression` within a ``: [source,xml]