Upgrade deps including Gradle plugins

* Remove some deps which are now managed transitively from RabbitMQ `stream-client`

build.gradle

@@ -18,13 +18,13 @@ buildscript {
 plugins {
 	id 'base'
 	id 'idea'
-	id 'org.ajoberstar.grgit' version '5.2.2'
+	id 'org.ajoberstar.grgit' version '5.3.0'
 	id 'io.spring.nohttp' version '0.0.11'
 	id 'io.spring.dependency-management' version '1.1.6' apply false
 	id 'org.antora' version '1.0.0'
 	id 'io.spring.antora.generate-antora-yml' version '0.0.1'
 	id 'com.github.spotbugs' version '6.0.24'
-	id 'io.freefair.aggregate-javadoc' version '8.6'
+	id 'io.freefair.aggregate-javadoc' version '8.10.2'
 }
 
 description = 'Spring AMQP'
@@ -49,9 +49,9 @@ ext {
 	assertkVersion = '0.28.1'
 	awaitilityVersion = '4.2.2'
 	commonsCompressVersion = '1.27.1'
-	commonsHttpClientVersion = '5.3.1'
+	commonsHttpClientVersion = '5.4'
 	commonsPoolVersion = '2.12.0'
-	hamcrestVersion = '2.2'
+	hamcrestVersion = '3.0'
 	hibernateValidationVersion = '8.0.1.Final'
 	jacksonBomVersion = '2.18.0'
 	jaywayJsonPathVersion = '2.9.0'
@@ -60,20 +60,17 @@ ext {
 	kotlinCoroutinesVersion = '1.8.1'
 	log4jVersion = '2.24.1'
 	logbackVersion = '1.5.8'
-	lz4Version = '1.8.0'
 	micrometerDocsVersion = '1.0.4'
 	micrometerVersion = '1.14.0-SNAPSHOT'
 	micrometerTracingVersion = '1.4.0-SNAPSHOT'
-	mockitoVersion = '5.13.0'
-	rabbitmqStreamVersion = '0.15.0'
-	rabbitmqVersion = '5.21.0'
+	mockitoVersion = '5.14.1'
+	rabbitmqStreamVersion = '0.17.0'
+	rabbitmqVersion = '5.22.0'
 	reactorVersion = '2024.0.0-SNAPSHOT'
-	snappyVersion = '1.1.10.7'
-	springDataVersion = '2024.0.4'
+	springDataVersion = '2024.1.0-SNAPSHOT'
 	springRetryVersion = '2.0.9'
 	springVersion = '6.2.0-SNAPSHOT'
 	testcontainersVersion = '1.20.2'
-	zstdJniVersion = '1.5.6-6'
 
 	javaProjects = subprojects - project(':spring-amqp-bom')
 }
@@ -315,7 +312,7 @@ configure(javaProjects) { subproject ->
 
 	checkstyle {
 		configDirectory.set(rootProject.file("src/checkstyle"))
-		toolVersion = '10.8.0'
+		toolVersion = '10.18.2'
 	}
 
 	jar {
@@ -470,12 +467,10 @@ project('spring-rabbit-stream') {
 		testRuntimeOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 		testRuntimeOnly 'com.fasterxml.jackson.module:jackson-module-kotlin'
 		testRuntimeOnly "org.apache.commons:commons-compress:$commonsCompressVersion"
-		testRuntimeOnly "org.xerial.snappy:snappy-java:$snappyVersion"
-		testRuntimeOnly "org.lz4:lz4-java:$lz4Version"
-		testRuntimeOnly "com.github.luben:zstd-jni:$zstdJniVersion"
+
 		testImplementation "org.testcontainers:rabbitmq"
 		testImplementation "org.testcontainers:junit-jupiter"
-		testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
+		testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl'
 		testImplementation 'org.springframework:spring-webflux'
 		testImplementation 'io.micrometer:micrometer-observation-test'
 		testImplementation 'io.micrometer:micrometer-tracing-bridge-brave'

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -2833,7 +2833,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, BasicPropertie
 		return consumer;
 	}
 
-	private static class PendingReply {
+	private static final class PendingReply {
 
 		@Nullable
 		private volatile String savedReplyTo;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -183,7 +183,7 @@ void confirmAlwaysAfterReturn() throws InterruptedException {
 		assertThat(listener.calls).containsExactly("return", "confirm", "return", "confirm");
 	}
 
-	private static class TheListener implements Listener {
+	private static final class TheListener implements Listener {
 
 		private final UUID uuid = UUID.randomUUID();
 

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/BatchingRabbitTemplateTests.java

@@ -676,7 +676,7 @@ private int getStreamLevel(Object stream) throws Exception {
 		return TestUtils.getPropertyValue(zipStream, "def.level", Integer.class);
 	}
 
-	private static class HeaderPostProcessor implements MessagePostProcessor {
+	private static final class HeaderPostProcessor implements MessagePostProcessor {
 		@Override
 		public Message postProcessMessage(Message message) throws AmqpException {
 			message.getMessageProperties().getHeaders().put("someHeader", "someValue");

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java

@@ -1733,7 +1733,7 @@ private class PlannedException extends RuntimeException {
 	}
 
 	@SuppressWarnings("serial")
-	private class TestTransactionManager extends AbstractPlatformTransactionManager {
+	private final class TestTransactionManager extends AbstractPlatformTransactionManager {
 
 		@Override
 		protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateTests.java

@@ -742,7 +742,7 @@ protected void doRollback(DefaultTransactionStatus status) throws TransactionExc
 
 	}
 
-	private class DoNothingMPP implements MessagePostProcessor {
+	private static final class DoNothingMPP implements MessagePostProcessor {
 
 		@Override
 		public Message postProcessMessage(Message message) throws AmqpException {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/ErrorHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ private void doTest(Throwable cause) {
 				new MessageProperties())));
 	}
 
-	private static class Foo {
+	private static final class Foo {
 
 		@SuppressWarnings("unused")
 		public void foo(String foo) {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerTests.java

@@ -882,7 +882,7 @@ private void waitForConsumersToStop(Set<?> consumers) {
 	}
 
 	@SuppressWarnings("serial")
-	private static class TestTransactionManager extends AbstractPlatformTransactionManager {
+	private static final class TestTransactionManager extends AbstractPlatformTransactionManager {
 
 		@Override
 		protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapterTests.java

@@ -488,7 +488,7 @@ public void withHeaders(Foo foo, @Headers Map<String, Object> headers) {
 
 	}
 
-	private static class Foo {
+	private static final class Foo {
 
 		private String foo;