Upgrade dependencies to the latest major/minor

* Remove redundant now `com.github.spotbugs` Gradle plugin
* Fix Debezium tests for latest Debezium state

Author: artembilan

.github/dependabot.yml

@@ -19,7 +19,6 @@ updates:
           - patch
         patterns:
           - org.gradle.*
-          - com.github.spotbugs
           - io.spring.*
           - org.antora
           - com.google.protobuf

build.gradle

@@ -21,7 +21,6 @@ plugins {
     id 'org.jetbrains.dokka' version '1.9.20'
     id 'org.antora' version '1.0.0'
     id 'io.spring.antora.generate-antora-yml' version '0.0.1'
-    id 'com.github.spotbugs' version '6.1.13'
     id 'com.google.protobuf' version '0.9.5' apply false
     id 'io.freefair.aggregate-javadoc' version '8.13.1'
     id 'io.spring.nullability' version '0.0.2' apply false
@@ -47,18 +46,18 @@ ext {
     linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration.git'
 
     apacheSshdVersion = '2.15.0'
-    artemisVersion = '2.41.0'
+    artemisVersion = '2.42.0'
     aspectjVersion = '1.9.24'
     assertjVersion = '3.27.3'
     assertkVersion = '0.28.1'
     avroVersion = '1.12.0'
     awaitilityVersion = '4.3.0'
-    camelVersion = '4.12.0'
+    camelVersion = '4.13.0'
     commonsDbcp2Version = '2.13.0'
-    commonsIoVersion = '2.19.0'
+    commonsIoVersion = '2.20.0'
     commonsNetVersion = '3.11.1'
     curatorVersion = '5.8.0'
-    debeziumVersion = '3.1.3.Final'
+    debeziumVersion = '3.2.0.Final'
     derbyVersion = '10.16.1.1'
     ftpServerVersion = '1.2.1'
     graalvmVersion = '24.2.2'
@@ -79,11 +78,11 @@ ext {
     jrubyVersion = '10.0.1.0'
     jsonpathVersion = '2.9.0'
     junit4Version = '4.13.2'
-    junitJupiterVersion = '5.12.2'
+    junitJupiterVersion = '5.13.4'
     kotlinCoroutinesVersion = '1.10.2'
     kryoVersion = '5.6.2'
     lettuceVersion = '6.7.1.RELEASE'
-    log4jVersion = '2.24.3'
+    log4jVersion = '2.25.1'
     mailVersion = '2.0.3'
     micrometerTracingVersion = '1.6.0-M1'
     micrometerVersion = '1.16.0-M1'
@@ -101,14 +100,14 @@ ext {
     rsocketVersion = '1.1.5'
     servletApiVersion = '6.1.0'
     smackVersion = '4.4.8'
-    springAmqpVersion = '4.0.0-SNAPSHOT'
+    springAmqpVersion = '4.0.0-M3'
     springDataVersion = '2025.1.0-M4'
-    springGraphqlVersion = '1.4.1'
-    springKafkaVersion = '4.0.0-SNAPSHOT'
+    springGraphqlVersion = '2.0.0-M1'
+    springKafkaVersion = '4.0.0-M3'
     springRetryVersion = '2.0.12'
-    springSecurityVersion = '7.0.0-SNAPSHOT'
+    springSecurityVersion = '7.0.0-M1'
     springVersion = '7.0.0-M7'
-    springWsVersion = '5.0.0-SNAPSHOT'
+    springWsVersion = '5.0.0-M1'
     testcontainersVersion = '1.21.3'
     tomcatVersion = '11.0.9'
     xmlUnitVersion = '2.10.3'
@@ -288,10 +287,6 @@ configure(javaProjects) { subproject ->
             api project(':spring-integration-core')
         }
 
-        def spotbugsAnnotations = "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
-        compileOnly spotbugsAnnotations
-        testCompileOnly spotbugsAnnotations
-
         testImplementation("org.awaitility:awaitility:$awaitilityVersion") {
             exclude group: 'org.hamcrest'
         }
@@ -345,7 +340,7 @@ configure(javaProjects) { subproject ->
 
     checkstyle {
         configDirectory.set(rootProject.file('src/checkstyle'))
-        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.25.0'
+        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.26.1'
     }
 
     jar {

spring-integration-debezium/src/test/java/org/springframework/integration/debezium/dsl/DebeziumDslTests.java

@@ -39,7 +39,6 @@
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-import org.springframework.util.CollectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -64,12 +63,8 @@ void dslFromBuilder() throws InterruptedException {
 		assertThat(config.payloads).hasSize(EXPECTED_DB_TX_COUNT);
 		assertThat(config.headerKeys).hasSize(EXPECTED_DB_TX_COUNT);
 
-		config.headerKeys.forEach(keys -> {
-			assertThat(keys).contains("debezium_destination", "id", "contentType", "debezium_key", "timestamp");
-			if (keys.size() > 5) {
-				assertThat(keys).contains("__name", "__db", "__table");
-			}
-		});
+		config.headerKeys.forEach(keys ->
+				assertThat(keys).contains("debezium_destination", "id", "contentType", "debezium_key", "timestamp"));
 	}
 
 	@Test
@@ -84,10 +79,7 @@ void dslBatch() throws InterruptedException {
 				.isLessThan(EXPECTED_DB_TX_COUNT);
 
 		config.batchHeaderKeys.stream()
-				.filter(headerNames -> !CollectionUtils.isEmpty(headerNames))
-				.forEach(headerNames -> {
-					assertThat(headerNames).contains("__name", "__db", "__table");
-				});
+				.forEach(headerNames -> assertThat(headerNames).isNotEmpty());
 	}
 
 	@Configuration

spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java

@@ -79,7 +79,7 @@ void batchMode() {
 			assertThat(changeEvent.destination()).startsWith("my-topic");
 			if (i > 15) {
 				assertThat(changeEvent.destination()).contains(".inventory");
-				assertThat(headerKeys).hasSize(4).contains("__name", "__db", "__op", "__table");
+				assertThat(headerKeys).hasSize(7).contains("__name", "__db", "__op", "__table");
 			}
 		}
 	}