Upgrade Versions; Prepare for Milestone Release

Author: garyrussell

build.gradle

@@ -39,7 +39,7 @@ ext {
 	modifiedFiles =
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-	assertjVersion = '3.22.0'
+	assertjVersion = '3.23.1'
 	assertkVersion = '0.24'
 	awaitilityVersion = '4.2.0'
 	commonsCompressVersion = '1.20'
@@ -48,24 +48,24 @@ ext {
 	googleJsr305Version = '3.0.2'
 	hamcrestVersion = '2.2'
 	hibernateValidationVersion = '7.0.4.Final'
-	jacksonBomVersion = '2.13.3'
+	jacksonBomVersion = '2.13.4'
 	jaywayJsonPathVersion = '2.6.0'
 	junit4Version = '4.13.2'
-	junitJupiterVersion = '5.8.2'
-	log4jVersion = '2.17.2'
+	junitJupiterVersion = '5.9.0'
+	log4jVersion = '2.18.0'
 	logbackVersion = '1.2.3'
 	lz4Version = '1.8.0'
-	micrometerVersion = '1.10.0-SNAPSHOT'
-	micrometerTracingVersion = '1.0.0-SNAPSHOT'
-	mockitoVersion = '4.5.1'
+	micrometerVersion = '1.10.0-M6'
+	micrometerTracingVersion = '1.0.0-M8'
+	mockitoVersion = '4.8.0'
 	rabbitmqStreamVersion = '0.7.0'
-	rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1'
+	rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.16.0'
 	rabbitmqHttpClientVersion = '3.12.1'
-	reactorVersion = '2020.0.18'
+	reactorVersion = '2022.0.0-M6'
 	snappyVersion = '1.1.8.4'
-	springDataVersion = '2022.0.0-M3'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
-	springRetryVersion = '1.3.3'
+	springDataVersion = '2022.0.0-M6'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M6'
+	springRetryVersion = '2.0.0-M1'
 	zstdJniVersion = '1.5.0-2'
 }
 

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/config/RetryInterceptorBuilderSupportTests.java

@@ -25,6 +25,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.junit.jupiter.api.Test;
@@ -103,7 +104,9 @@ public void testWithCustomBackOffPolicy() {
 						.build();
 
 		assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.retryPolicy.maxAttempts")).isEqualTo(5);
-		assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod")).isEqualTo(1000L);
+		assertThat(TestUtils
+				.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod", Supplier.class).get())
+						.isEqualTo(1000L);
 	}
 
 	@Test
@@ -120,7 +123,9 @@ public void testWithCustomNewMessageIdentifier() throws Exception {
 						.build();
 
 		assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.retryPolicy.maxAttempts")).isEqualTo(5);
-		assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod")).isEqualTo(1000L);
+		assertThat(TestUtils
+				.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod", Supplier.class).get())
+						.isEqualTo(1000L);
 		final AtomicInteger count = new AtomicInteger();
 		Foo delegate = createDelegate(interceptor, count);
 		Message message = MessageBuilder.withBody("".getBytes()).setMessageId("foo").setRedelivered(false).build();