diff --git a/build.gradle b/build.gradle index 56a4e0ea6b..a640180086 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ subprojects { subproject -> springVersionDefault = '3.1.3.RELEASE' springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault - springAmqpVersion = '1.1.2.RELEASE' + springAmqpVersion = '1.1.3.RELEASE' springDataMongoVersion = '1.1.1.RELEASE' springDataRedisVersion = '1.0.2.RELEASE' springGemfireVersion = '1.1.1.RELEASE' diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java index ba8d596f60..321d766ddf 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java @@ -217,9 +217,9 @@ public class AmqpOutboundGatewayParserTests { @Test //INT-1029 public void amqpOutboundGatewayWithinChain() { ApplicationContext context = new ClassPathXmlApplicationContext("AmqpOutboundGatewayParserTests-context.xml", this.getClass()); - Object eventDrivernConsumer = context.getBean("chainWithRabbitOutboundGateway"); + Object eventDrivenConsumer = context.getBean("chainWithRabbitOutboundGateway"); - List chainHandlers = TestUtils.getPropertyValue(eventDrivernConsumer, "handler.handlers", List.class); + List chainHandlers = TestUtils.getPropertyValue(eventDrivenConsumer, "handler.handlers", List.class); AmqpOutboundEndpoint endpoint = (AmqpOutboundEndpoint) chainHandlers.get(0); @@ -228,8 +228,8 @@ public class AmqpOutboundGatewayParserTests { RabbitTemplate amqpTemplate = TestUtils.getPropertyValue(endpoint, "amqpTemplate", RabbitTemplate.class); amqpTemplate = Mockito.spy(amqpTemplate); - Mockito.doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { + Mockito.doAnswer(new Answer() { + public org.springframework.amqp.core.Message answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; MessageProperties properties = amqpRequestMessage.getMessageProperties();