Skip to content

Commit edca625

Browse files
garyrussellgaryrussell
committed
Upgrade Versions; Prepare for Milestone Release
1 parent 57276fc commit edca625

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

‎build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ext {
3939
modifiedFiles =
4040
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4141

42-
assertjVersion = '3.22.0'
42+
assertjVersion = '3.23.1'
4343
assertkVersion = '0.24'
4444
awaitilityVersion = '4.2.0'
4545
commonsCompressVersion = '1.20'
@@ -48,24 +48,24 @@ ext {
4848
googleJsr305Version = '3.0.2'
4949
hamcrestVersion = '2.2'
5050
hibernateValidationVersion = '7.0.4.Final'
51-
jacksonBomVersion = '2.13.3'
51+
jacksonBomVersion = '2.13.4'
5252
jaywayJsonPathVersion = '2.6.0'
5353
junit4Version = '4.13.2'
54-
junitJupiterVersion = '5.8.2'
55-
log4jVersion = '2.17.2'
54+
junitJupiterVersion = '5.9.0'
55+
log4jVersion = '2.18.0'
5656
logbackVersion = '1.2.3'
5757
lz4Version = '1.8.0'
58-
micrometerVersion = '1.10.0-SNAPSHOT'
59-
micrometerTracingVersion = '1.0.0-SNAPSHOT'
60-
mockitoVersion = '4.5.1'
58+
micrometerVersion = '1.10.0-M6'
59+
micrometerTracingVersion = '1.0.0-M8'
60+
mockitoVersion = '4.8.0'
6161
rabbitmqStreamVersion = '0.7.0'
62-
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1'
62+
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.16.0'
6363
rabbitmqHttpClientVersion = '3.12.1'
64-
reactorVersion = '2020.0.18'
64+
reactorVersion = '2022.0.0-M6'
6565
snappyVersion = '1.1.8.4'
66-
springDataVersion = '2022.0.0-M3'
67-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
68-
springRetryVersion = '1.3.3'
66+
springDataVersion = '2022.0.0-M6'
67+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M6'
68+
springRetryVersion = '2.0.0-M1'
6969
zstdJniVersion = '1.5.0-2'
7070
}
7171

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.concurrent.CountDownLatch;
2626
import java.util.concurrent.TimeUnit;
2727
import java.util.concurrent.atomic.AtomicInteger;
28+
import java.util.function.Supplier;
2829

2930
import org.aopalliance.intercept.MethodInterceptor;
3031
import org.junit.jupiter.api.Test;
@@ -103,7 +104,9 @@ public void testWithCustomBackOffPolicy() {
103104
.build();
104105

105106
assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.retryPolicy.maxAttempts")).isEqualTo(5);
106-
assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod")).isEqualTo(1000L);
107+
assertThat(TestUtils
108+
.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod", Supplier.class).get())
109+
.isEqualTo(1000L);
107110
}
108111

109112
@Test
@@ -120,7 +123,9 @@ public void testWithCustomNewMessageIdentifier() throws Exception {
120123
.build();
121124

122125
assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.retryPolicy.maxAttempts")).isEqualTo(5);
123-
assertThat(TestUtils.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod")).isEqualTo(1000L);
126+
assertThat(TestUtils
127+
.getPropertyValue(interceptor, "retryOperations.backOffPolicy.backOffPeriod", Supplier.class).get())
128+
.isEqualTo(1000L);
124129
final AtomicInteger count = new AtomicInteger();
125130
Foo delegate = createDelegate(interceptor, count);
126131
Message message = MessageBuilder.withBody("".getBytes()).setMessageId("foo").setRedelivered(false).build();

0 commit comments

Comments
 (0)