From aaa55b1bc7b67d753159606e99cec6c569567c2c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 19 Jul 2021 09:53:11 -0400 Subject: [PATCH] Upgrade versions; prepare for release --- build.gradle | 22 +++++++++---------- ...istenerContainerRetryIntegrationTests.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index b3b356bd..8fd06409 100644 --- a/build.gradle +++ b/build.gradle @@ -39,32 +39,32 @@ ext { modifiedFiles = files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } - assertjVersion = '3.19.0' + assertjVersion = '3.20.2' assertkVersion = '0.24' - awaitilityVersion = '4.0.3' + awaitilityVersion = '4.1.0' commonsCompressVersion = '1.20' commonsHttpClientVersion = '4.5.13' - commonsPoolVersion = '2.9.0' + commonsPoolVersion = '2.10.0' googleJsr305Version = '3.0.2' hamcrestVersion = '2.2' hibernateValidationVersion = '6.2.0.Final' - jacksonBomVersion = '2.12.3' + jacksonBomVersion = '2.12.4' jaywayJsonPathVersion = '2.4.0' junit4Version = '4.13.2' junitJupiterVersion = '5.7.2' log4jVersion = '2.14.1' logbackVersion = '1.2.3' lz4Version = '1.8.0' - micrometerVersion = '1.7.0' - mockitoVersion = '3.9.0' + micrometerVersion = '1.8.0-M1' + mockitoVersion = '3.11.2' protonJVersion = '0.33.8' rabbitmqStreamVersion = '0.1.0' - rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.12.0' - rabbitmqHttpClientVersion = '3.9.0.RELEASE' - reactorVersion = '2020.0.7' + rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.0' + rabbitmqHttpClientVersion = '3.11.0' + reactorVersion = '2020.0.9' snappyVersion = '1.1.8.4' - springDataCommonsVersion = '2.5.1' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.8' + springDataCommonsVersion = '2.6.0-M1' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.9' springRetryVersion = '1.3.1' zstdJniVersion = '1.5.0-2' } diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerContainerRetryIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerContainerRetryIntegrationTests.java index 53fcd32c..56635753 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerContainerRetryIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerContainerRetryIntegrationTests.java @@ -166,7 +166,7 @@ public class MessageListenerContainerRetryIntegrationTests { // The container should have shutdown, so there are now no active consumers assertThatThrownBy(() -> doTestStatefulRetry(messageCount, txSize, failFrequency, concurrentConsumers)) .hasMessageContaining("expected: 1") - .hasMessageContaining("but was : 0"); + .hasMessageContaining("but was: 0"); } @RepeatedTest(10)