diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 7691750..ae3ccd4 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.samples.spring spring-rabbit-helloworld - 2.1.5.RELEASE + 2.1.6.RELEASE jar Spring AMQP Hello World https://www.spring.io @@ -17,7 +17,7 @@ true 5.1.6.RELEASE - 2.1.5.RELEASE + 2.1.6.RELEASE UTF-8 1.8 false diff --git a/helloworld/pom.xml-e b/helloworld/pom.xml-e deleted file mode 100644 index aae99c8..0000000 --- a/helloworld/pom.xml-e +++ /dev/null @@ -1,183 +0,0 @@ - - - 4.0.0 - org.springframework.samples.spring - spring-rabbit-helloworld - 2.1.5.RELEASE - jar - Spring AMQP Hello World - https://www.spring.io - - - - - true - 5.1.3.RELEASE - 2.1.5.RELEASE - UTF-8 - 1.8 - false - - - - - - org.springframework.amqp - spring-amqp - ${spring.amqp.version} - - - org.springframework - spring-core - - - - - org.springframework.amqp - spring-rabbit - ${spring.amqp.version} - - - org.springframework - spring-core - - - org.springframework - spring-messaging - - - org.springframework - spring-tx - - - org.springframework - spring-context - - - - - - org.springframework - spring-core - ${spring.framework.version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-messaging - ${spring.framework.version} - - - org.springframework - spring-tx - ${spring.framework.version} - - - org.springframework - spring-test - ${spring.framework.version} - test - - - cglib - cglib-nodep - 2.2 - runtime - - - - - junit - junit - 4.12 - test - - - - org.slf4j - slf4j-api - 1.7.22 - - - org.slf4j - jcl-over-slf4j - 1.7.22 - runtime - - - org.slf4j - slf4j-log4j12 - 1.7.22 - runtime - - - log4j - log4j - 1.2.14 - runtime - - - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.M1B - - - maven-assembly-plugin - false - - - project - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.9 - - - - **/*Tests.java - - - **/Abstract*.java - - - - - - - diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java index 7621357..690e63f 100644 --- a/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java +++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java @@ -21,7 +21,7 @@ public class HelloWorldConfiguration { connectionFactory.setPassword("guest"); return connectionFactory; } - + @Bean public AmqpAdmin amqpAdmin() { return new RabbitAdmin(connectionFactory()); @@ -33,7 +33,7 @@ public class HelloWorldConfiguration { //The routing key is set to the name of the queue by the broker for the default exchange. template.setRoutingKey(this.helloWorldQueueName); //Where we will synchronously receive messages from - template.setQueue(this.helloWorldQueueName); + template.setDefaultReceiveQueue(this.helloWorldQueueName); return template; } @@ -44,37 +44,37 @@ public class HelloWorldConfiguration { } /* - @Bean + @Bean public Binding binding() { return declare(new Binding(helloWorldQueue(), defaultDirectExchange())); }*/ - - /* + + /* @Bean public TopicExchange helloExchange() { return declare(new TopicExchange("hello.world.exchange")); }*/ - + /* public Queue declareUniqueQueue(String namePrefix) { Queue queue = new Queue(namePrefix + "-" + UUID.randomUUID()); rabbitAdminTemplate().declareQueue(queue); return queue; } - + // if the default exchange isn't configured to your liking.... @Bean Binding declareP2PBinding(Queue queue, DirectExchange exchange) { return declare(new Binding(queue, exchange, queue.getName())); } - + @Bean Binding declarePubSubBinding(String queuePrefix, FanoutExchange exchange) { return declare(new Binding(declareUniqueQueue(queuePrefix), exchange)); } - + @Bean Binding declarePubSubBinding(UniqueQueue uniqueQueue, TopicExchange exchange) { return declare(new Binding(uniqueQueue, exchange)); } - + @Bean Binding declarePubSubBinding(String queuePrefix, TopicExchange exchange, String routingKey) { return declare(new Binding(declareUniqueQueue(queuePrefix), exchange, routingKey)); }*/ diff --git a/log4j2/pom.xml b/log4j2/pom.xml index d9f0c5f..2d217bb 100644 --- a/log4j2/pom.xml +++ b/log4j2/pom.xml @@ -5,7 +5,7 @@ org.springframework.amqp.samples log4j2 - 2.1.5.RELEASE + 2.1.6.RELEASE jar log4j2 @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE + 2.1.4.RELEASE diff --git a/log4j2/pom.xml-e b/log4j2/pom.xml-e deleted file mode 100644 index d9f0c5f..0000000 --- a/log4j2/pom.xml-e +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - - org.springframework.amqp.samples - log4j2 - 2.1.5.RELEASE - jar - - log4j2 - Spring Boot with Spring AMQP Log4J2 Appender - - - org.springframework.boot - spring-boot-starter-parent - 1.5.3.RELEASE - - - - - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-amqp - - - org.springframework.boot - spring-boot-starter-logging - - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot - - true - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - diff --git a/pom.xml b/pom.xml index 99f0c52..b8d31a4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.amqp spring-amqp-samples Spring AMQP Samples - 2.1.5.RELEASE + 2.1.6.RELEASE pom helloworld diff --git a/pom.xml-e b/pom.xml-e deleted file mode 100644 index 99f0c52..0000000 --- a/pom.xml-e +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - org.springframework.amqp - spring-amqp-samples - Spring AMQP Samples - 2.1.5.RELEASE - pom - - helloworld - stocks - log4j2 - spring-rabbit-confirms-returns - spring-rabbit-json - spring-rabbit-global-errorhandler - - - UTF-8 - - - - staging - - /${java.io.tmpdir}/spring-amqp/dist - - - - spring-site-staging - file:///${java.io.tmpdir}/spring-amqp/docs/${project.version} - - - spring-milestone-staging - file:///${java.io.tmpdir}/spring-amqp/milestone - - - spring-snapshot-staging - file:///${java.io.tmpdir}/spring-amqp/snapshot - - - - - - https://github.com/SpringSource/spring-amqp-samples - scm:git:git://github.com/SpringSource/spring-amqp-samples.git - scm:git:git://github.com/SpringSource/spring-amqp-samples.git - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.0.0.RELEASE - - - - - - repository.springframework.maven.snapshots - Spring Framework Repository Including Snapshots - https://repo.spring.io/libs-snapshot - - true - - - - diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml index 6f65b91..a488860 100644 --- a/spring-rabbit-confirms-returns/pom.xml +++ b/spring-rabbit-confirms-returns/pom.xml @@ -5,7 +5,7 @@ org.springframework.amqp.samples spring-rabbit-confirms-returns - 2.1.5.RELEASE + 2.1.6.RELEASE jar spring-rabbit-confirms-returns @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.6.RELEASE + 2.1.4.RELEASE diff --git a/spring-rabbit-confirms-returns/pom.xml-e b/spring-rabbit-confirms-returns/pom.xml-e deleted file mode 100644 index 6f65b91..0000000 --- a/spring-rabbit-confirms-returns/pom.xml-e +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - org.springframework.amqp.samples - spring-rabbit-confirms-returns - 2.1.5.RELEASE - jar - - spring-rabbit-confirms-returns - Demonstrates Configuration for Confirms and Returns - - - org.springframework.boot - spring-boot-starter-parent - 2.0.6.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/spring-rabbit-confirms-returns/src/main/java/org/springframework/amqp/samples/confirms/SpringRabbitConfirmsReturnsApplication.java b/spring-rabbit-confirms-returns/src/main/java/org/springframework/amqp/samples/confirms/SpringRabbitConfirmsReturnsApplication.java index 313dcd5..6223313 100644 --- a/spring-rabbit-confirms-returns/src/main/java/org/springframework/amqp/samples/confirms/SpringRabbitConfirmsReturnsApplication.java +++ b/spring-rabbit-confirms-returns/src/main/java/org/springframework/amqp/samples/confirms/SpringRabbitConfirmsReturnsApplication.java @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.connection.CorrelationData; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.rabbit.support.CorrelationData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml index d6b1438..88b1fed 100644 --- a/spring-rabbit-global-errorhandler/pom.xml +++ b/spring-rabbit-global-errorhandler/pom.xml @@ -5,7 +5,7 @@ com.example spring-rabbit-global-errorhandler - 2.1.5.RELEASE + 2.1.6.RELEASE jar spring-rabbit-global-errorhandler @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.6.RELEASE + 2.1.4.RELEASE diff --git a/spring-rabbit-global-errorhandler/pom.xml-e b/spring-rabbit-global-errorhandler/pom.xml-e deleted file mode 100644 index d6b1438..0000000 --- a/spring-rabbit-global-errorhandler/pom.xml-e +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - com.example - spring-rabbit-global-errorhandler - 2.1.5.RELEASE - jar - - spring-rabbit-global-errorhandler - Shows how to configure a custom error handler applied to listener beans - - - org.springframework.boot - spring-boot-starter-parent - 2.0.6.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - com.fasterxml.jackson.core - jackson-databind - 2.9.8 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml index 2b92d32..ac49f56 100644 --- a/spring-rabbit-json/pom.xml +++ b/spring-rabbit-json/pom.xml @@ -5,7 +5,7 @@ com.example spring-rabbit-json - 2.1.5.RELEASE + 2.1.6.RELEASE jar spring-rabbit-json @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.6.RELEASE + 2.1.4.RELEASE diff --git a/spring-rabbit-json/pom.xml-e b/spring-rabbit-json/pom.xml-e deleted file mode 100644 index 2b92d32..0000000 --- a/spring-rabbit-json/pom.xml-e +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - - com.example - spring-rabbit-json - 2.1.5.RELEASE - jar - - spring-rabbit-json - Receiving JSON from non-Spring Applications - - - org.springframework.boot - spring-boot-starter-parent - 2.0.6.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - com.fasterxml.jackson.core - jackson-databind - 2.9.8 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - repository.springframework.maven.snapshots - Spring Framework Repository Including Snapshots - https://repo.spring.io/libs-snapshot - - true - - - - diff --git a/stocks/pom.xml b/stocks/pom.xml index 89bf279..ea7ed19 100644 --- a/stocks/pom.xml +++ b/stocks/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.samples.spring spring-rabbit-stocks - 2.1.5.RELEASE + 2.1.6.RELEASE war Spring Rabbit Stocks https://www.spring.io @@ -16,7 +16,7 @@ true 5.1.6.RELEASE - 2.1.5.RELEASE + 2.1.6.RELEASE UTF-8 1.8 false diff --git a/stocks/pom.xml-e b/stocks/pom.xml-e deleted file mode 100644 index 89bf279..0000000 --- a/stocks/pom.xml-e +++ /dev/null @@ -1,218 +0,0 @@ - - - 4.0.0 - org.springframework.samples.spring - spring-rabbit-stocks - 2.1.5.RELEASE - war - Spring Rabbit Stocks - https://www.spring.io - - - - - true - 5.1.6.RELEASE - 2.1.5.RELEASE - UTF-8 - 1.8 - false - - - - - - org.springframework.amqp - spring-amqp - ${spring.amqp.version} - - - org.springframework - spring-core - - - - - org.springframework.amqp - spring-rabbit - ${spring.amqp.version} - - - org.springframework - spring-core - - - org.springframework - spring-messaging - - - org.springframework - spring-tx - - - org.springframework - spring-context - - - org.springframework - spring-web - - - - - - org.springframework - spring-test - ${spring.framework.version} - test - - - org.springframework - spring-context-support - ${spring.framework.version} - runtime - - - org.springframework - spring-aop - ${spring.framework.version} - - - org.springframework - spring-oxm - ${spring.framework.version} - - - org.springframework - spring-messaging - ${spring.framework.version} - - - org.springframework - spring-tx - ${spring.framework.version} - - - org.springframework - spring-webmvc - ${spring.framework.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet - jstl - 1.1.2 - runtime - - - standard - taglibs - 1.1.2 - jar - runtime - - - cglib - cglib-nodep - 2.2 - - - org.aspectj - aspectjrt - 1.5.4 - - - org.aspectj - aspectjweaver - 1.5.4 - - - - com.fasterxml.jackson.core - jackson-databind - 2.9.8 - runtime - - - - junit - junit - 4.8.1 - test - - - - log4j - log4j - 1.2.14 - runtime - - - - com.jgoodies - forms - 1.2.1 - - - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.M1B - - - maven-assembly-plugin - false - - - project - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.9 - - - - **/*Tests.java - - - **/Abstract*.java - - - - - - -