Skip to content

Commit f44eb37

Browse files
committed
Revert "Revert AMQP Upgrade until Cairo released"
This reverts commit 8853e06.
1 parent 8853e06 commit f44eb37

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ subprojects { subproject ->
133133
romeToolsVersion = '1.8.0'
134134
servletApiVersion = '4.0.0'
135135
smackVersion = '4.2.2'
136-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE'
136+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.0.BUILD-SNAPSHOT'
137137
springDataJpaVersion = '2.1.0.BUILD-SNAPSHOT'
138138
springDataMongoVersion = '2.1.0.BUILD-SNAPSHOT'
139139
springDataRedisVersion = '2.1.0.BUILD-SNAPSHOT'

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
2121

2222
import org.springframework.amqp.core.AcknowledgeMode;
2323
import org.springframework.amqp.core.Message;
24-
import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
2524
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
25+
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
2626
import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException;
2727
import org.springframework.amqp.support.AmqpHeaders;
2828
import org.springframework.amqp.support.converter.MessageConverter;

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@
2525
import org.springframework.amqp.core.Message;
2626
import org.springframework.amqp.core.MessagePostProcessor;
2727
import org.springframework.amqp.core.MessageProperties;
28-
import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
2928
import org.springframework.amqp.rabbit.core.RabbitTemplate;
3029
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
30+
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
3131
import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException;
3232
import org.springframework.amqp.support.AmqpHeaders;
3333
import org.springframework.amqp.support.converter.MessageConverter;

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,10 +30,10 @@
3030
import org.springframework.amqp.core.AcknowledgeMode;
3131
import org.springframework.amqp.core.Message;
3232
import org.springframework.amqp.core.MessageProperties;
33-
import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
3433
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
3534
import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
3635
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
36+
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
3737
import org.springframework.amqp.support.AmqpHeaders;
3838
import org.springframework.beans.factory.annotation.Autowired;
3939
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -51,6 +51,7 @@
5151
* @author Mark Fisher
5252
* @author Artem Bilan
5353
* @author Gary Russell
54+
*
5455
* @since 2.1
5556
*/
5657
@ContextConfiguration

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,9 +31,9 @@
3131
import org.springframework.amqp.core.Address;
3232
import org.springframework.amqp.core.Message;
3333
import org.springframework.amqp.core.MessageProperties;
34-
import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
3534
import org.springframework.amqp.rabbit.core.RabbitTemplate;
3635
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
36+
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
3737
import org.springframework.amqp.support.converter.MessageConverter;
3838
import org.springframework.amqp.support.converter.SimpleMessageConverter;
3939
import org.springframework.beans.factory.annotation.Autowired;

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2017 the original author or authors.
2+
* Copyright 2013-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -48,10 +48,10 @@
4848
import org.springframework.amqp.core.MessageProperties;
4949
import org.springframework.amqp.rabbit.connection.Connection;
5050
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
51-
import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
5251
import org.springframework.amqp.rabbit.core.RabbitTemplate;
5352
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
5453
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
54+
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
5555
import org.springframework.amqp.support.AmqpHeaders;
5656
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
5757
import org.springframework.amqp.support.converter.MessageConversionException;
@@ -81,6 +81,7 @@
8181
/**
8282
* @author Artem Bilan
8383
* @author Gary Russell
84+
*
8485
* @since 3.0
8586
*/
8687
public class InboundEndpointTests {

0 commit comments

Comments
 (0)