From bcb5395fa2887fdaa4735352e28997901eb05fc0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 3 Jun 2025 12:53:42 -0400 Subject: [PATCH] Upgrade dependencies to the latest major/minor * Upgrade to Checkstyle `10.25.0`; fix respective new violations --- build.gradle | 17 +++++++++-------- .../kafka/retrytopic/RetryTopicConfigurer.java | 4 ++-- src/checkstyle/checkstyle.xml | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 63ae0d30..558e0ff1 100644 --- a/build.gradle +++ b/build.gradle @@ -52,23 +52,23 @@ ext { modifiedFiles.finalizeValueOnRead() assertjVersion = '3.27.3' - awaitilityVersion = '4.2.2' + awaitilityVersion = '4.3.0' hamcrestVersion = '3.0' hibernateValidationVersion = '8.0.2.Final' - jacksonBomVersion = '2.18.4' + jacksonBomVersion = '2.19.0' jaywayJsonPathVersion = '2.9.0' junit4Version = '4.13.2' - junitJupiterVersion = '5.12.2' + junitJupiterVersion = '5.13.0' kafkaVersion = '4.0.0' kotlinCoroutinesVersion = '1.10.2' log4jVersion = '2.24.3' micrometerDocsVersion = '1.0.4' micrometerVersion = '1.15.0' micrometerTracingVersion = '1.5.0' - mockitoVersion = '5.15.2' - reactorVersion = '2024.0.6' + mockitoVersion = '5.18.0' + reactorVersion = '2025.0.0-SNAPSHOT' scalaVersion = '2.13' - springBootVersion = '3.3.8' // docs module + springBootVersion = '3.5.0' // docs module springDataVersion = '2025.1.0-SNAPSHOT' springRetryVersion = '2.0.12' springVersion = '7.0.0-SNAPSHOT' @@ -94,6 +94,7 @@ allprojects { maven { url 'https://repo.spring.io/milestone' } if (version.endsWith('SNAPSHOT')) { maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } // maven { url 'https://repository.apache.org/content/groups/staging/' } } @@ -195,8 +196,8 @@ configure(javaProjects) { subproject -> } checkstyle { - configDirectory.set(rootProject.file('src/checkstyle')) - toolVersion = '10.21.1' + configDirectory.set(file("${rootDir}/src/checkstyle")) + toolVersion = '10.25.0' } publishing { diff --git a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java index 0847b7f2..fa78ddf3 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java @@ -76,7 +76,7 @@ import org.springframework.kafka.support.TopicForRetryable; * ContainerProperties' idlePartitionEventInterval property. * property, a {@link org.springframework.kafka.event.ListenerContainerPartitionIdleEvent} * is published, which the {@link org.springframework.kafka.listener.KafkaConsumerBackoffManager} - * listens to in order to check whether or not it should unpause the partition. + * listens to in order to check whether it should unpause the partition. * *

If, when consumption is resumed, processing fails again, the message is forwarded to * the next topic and so on, until it gets to the dlt. @@ -498,7 +498,7 @@ public class RetryTopicConfigurer implements BeanFactoryAware { static class LoggingDltListenerHandlerMethod { - public static final String DEFAULT_DLT_METHOD_NAME = "logMessage"; + static final String DEFAULT_DLT_METHOD_NAME = "logMessage"; public void logMessage(Object message, @NonNull Acknowledgment ack) { if (message instanceof ConsumerRecord) { diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 6ef53f94..70bdd4d4 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -111,7 +111,7 @@ - +