diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index b775572..9b98a0a 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.springframework.samples.spring
spring-rabbit-helloworld
- 3.0.0-M3
+ 3.0.0-M4
jar
Spring AMQP Hello World
https://www.spring.io
@@ -16,7 +16,7 @@
true
- 3.0.0-M3
+ 3.0.0-M4
UTF-8
1.8
false
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index 9cdefbf..2a01837 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -5,7 +5,7 @@
org.springframework.amqp.samples
log4j2
- 3.0.0-M3
+ 3.0.0-M4
jar
log4j2
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.0-M2
+ 3.0.0-M4
@@ -22,7 +22,7 @@
UTF-8
1.8
5.3.13
- 3.0.0-M3
+ 3.0.0-M4
diff --git a/pom.xml b/pom.xml
index 1d75353..b0a8138 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.springframework.amqp
spring-amqp-samples
Spring AMQP Samples
- 3.0.0-M3
+ 3.0.0-M4
pom
helloworld
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index 67462a4..5708db5 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
- 3.0.0-M3
+ 3.0.0-M4
jar
spring-rabbit-confirms-returns
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.0-M2
+ 3.0.0-M4
@@ -22,7 +22,7 @@
UTF-8
UTF-8
1.8
- 3.0.0-M3
+ 3.0.0-M4
@@ -43,6 +43,12 @@
${spring.amqp.version}
+
+ io.micrometer
+ micrometer-observation
+ 1.10.0-M5
+
+
org.springframework.boot
spring-boot-starter-test
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 55f0ef3..0b08f42 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
@@ -67,7 +67,7 @@ public class SpringRabbitConfirmsReturnsApplication {
return message;
}, correlationData);
correlationData.getFuture().get(10, TimeUnit.SECONDS);
- System.out.println("Return received:" + correlationData.getReturnedMessage());
+ System.out.println("Return received:" + correlationData.getReturned());
}
private void setupCallbacks() {
@@ -79,9 +79,10 @@ public class SpringRabbitConfirmsReturnsApplication {
System.out.println("Received " + (ack ? " ack " : " nack ") + "for correlation: " + correlation);
}
});
- this.rabbitTemplate.setReturnCallback((message, replyCode, replyText, exchange, routingKey) -> {
- System.out.println("Returned: " + message + "\nreplyCode: " + replyCode
- + "\nreplyText: " + replyText + "\nexchange/rk: " + exchange + "/" + routingKey);
+ this.rabbitTemplate.setReturnsCallback(returned -> {
+ System.out.println("Returned: " + returned.getMessage() + "\nreplyCode: " + returned.getReplyCode()
+ + "\nreplyText: " + returned.getReplyText() + "\nexchange/rk: "
+ + returned.getExchange() + "/" + returned.getRoutingKey());
});
}
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 87a39ea..114d1ec 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
- 3.0.0-M3
+ 3.0.0-M4
jar
spring-rabbit-global-errorhandler
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.0-M2
+ 3.0.0-M4
@@ -22,7 +22,7 @@
UTF-8
UTF-8
1.8
- 3.0.0-M3
+ 3.0.0-M4
@@ -48,6 +48,12 @@
${spring.amqp.version}
+
+ io.micrometer
+ micrometer-observation
+ 1.10.0-M5
+
+
org.springframework.boot
spring-boot-starter-test
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 52f32e7..cf60772 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -5,7 +5,7 @@
com.example
spring-rabbit-json
- 3.0.0-M3
+ 3.0.0-M4
jar
spring-rabbit-json
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.0-M2
+ 3.0.0-M4
@@ -22,7 +22,7 @@
UTF-8
UTF-8
1.8
- 3.0.0-M3
+ 3.0.0-M4
@@ -48,6 +48,12 @@
${spring.amqp.version}
+
+ io.micrometer
+ micrometer-observation
+ 1.10.0-M5
+
+
org.springframework.boot
spring-boot-starter-test
diff --git a/stocks/pom.xml b/stocks/pom.xml
index c3192b5..abcd784 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.springframework.samples.spring
spring-rabbit-stocks
- 3.0.0-M3
+ 3.0.0-M4
war
Spring Rabbit Stocks
https://www.spring.io
@@ -16,7 +16,7 @@
true
6.0.0-M2
- 3.0.0-M3
+ 3.0.0-M4
UTF-8
1.8
false