From 1ebde8eceb0180f9cce48b98829e222c6d997f03 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 16 May 2022 10:37:47 -0400 Subject: [PATCH] Upgrade Versions; Prepare for Milestone Release --- build.gradle | 22 +++++++++---------- .../EnableRabbitIntegrationTests.java | 3 +-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 1e7fecd5..2ce43489 100644 --- a/build.gradle +++ b/build.gradle @@ -39,33 +39,33 @@ ext { modifiedFiles = files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } - assertjVersion = '3.21.0' + assertjVersion = '3.22.0' assertkVersion = '0.24' - awaitilityVersion = '4.1.1' + awaitilityVersion = '4.2.0' commonsCompressVersion = '1.20' commonsHttpClientVersion = '4.5.13' commonsPoolVersion = '2.11.1' googleJsr305Version = '3.0.2' hamcrestVersion = '2.2' - hibernateValidationVersion = '6.2.3.Final' - jacksonBomVersion = '2.13.2.20220328' + hibernateValidationVersion = '7.0.4.Final' + jacksonBomVersion = '2.13.3' jaywayJsonPathVersion = '2.6.0' junit4Version = '4.13.2' junitJupiterVersion = '5.8.2' - log4jVersion = '2.17.1' + log4jVersion = '2.17.2' logbackVersion = '1.2.3' lz4Version = '1.8.0' - micrometerVersion = '1.10.0-SNAPSHOT' - micrometerTracingVersion = '1.0.0-SNAPSHOT' - mockitoVersion = '4.0.0' + micrometerVersion = '1.10.0-M2' + micrometerTracingVersion = '1.0.0-M5' + mockitoVersion = '4.5.1' rabbitmqStreamVersion = '0.4.0' rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1' rabbitmqHttpClientVersion = '3.12.1' - reactorVersion = '2020.0.17' + reactorVersion = '2020.0.18' snappyVersion = '1.1.8.4' springDataVersion = '2022.0.0-M3' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M3' - springRetryVersion = '1.3.2' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4' + springRetryVersion = '1.3.3' zstdJniVersion = '1.5.0-2' } diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java index 3b2bee26..84196b36 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java @@ -42,8 +42,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.validation.Valid; - import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; @@ -149,6 +147,7 @@ import com.rabbitmq.http.client.domain.QueueInfo; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import jakarta.validation.Valid; /** *