Upgrade deps to latest major/minor

artembilan · artembilan · commit 91460a6cc973 · 2025-10-21T18:43:22.000-04:00
* Fix deprecations for Testcontainers
* Remove Jackson 2 from the test scope
* Fix reported Jackson 2 usages to Jackson 3-based API
* Fix leftover usages of JUnit 4
* Mark `ReactiveStreamsTests.testPollableReactiveFlow()` as `@RetryingTest(10)`
* Remove `exclude group: 'org.hamcrest'` from `awaitility` as the one required for `await()` API
diff --git a/build.gradle b/build.gradle
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml
@@ -29,7 +29,7 @@
 		<int:queue />
 	</int:channel>
 
-	<bean id="jackson" class="org.springframework.amqp.support.converter.Jackson2JsonMessageConverter" />
+	<bean id="jackson" class="org.springframework.amqp.support.converter.JacksonJsonMessageConverter" />
 
 	<bean id="mapperIn" class="org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper"
 		factory-method="inboundMapper" />
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml
@@ -104,7 +104,7 @@
 		<property name="delegates">
 			<map>
 				<entry key="application/json">
-					<bean class="org.springframework.amqp.support.converter.Jackson2JsonMessageConverter" />
+					<bean class="org.springframework.amqp.support.converter.JacksonJsonMessageConverter" />
 				</entry>
 			</map>
 		</property>
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/RabbitTestContainer.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/RabbitTestContainer.java
@@ -20,8 +20,8 @@
 import java.time.Duration;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 /**
  * Provides a static {@link RabbitMQContainer} that can be shared across test classes.
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java
@@ -30,6 +30,7 @@
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.RetryingTest;
 import org.reactivestreams.Publisher;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
@@ -128,7 +129,7 @@ void testReactiveFlow() throws Exception {
 		assertThat(TestUtils.getPropertyValue(this.messageSource, "messagingTemplate.sendTimeout")).isEqualTo(256L);
 	}
 
-	@Test
+	@RetryingTest(10)
 	void testPollableReactiveFlow() throws Exception {
 		assertThat(this.reactiveTransformer).isInstanceOf(ReactiveStreamsConsumer.class);
 		this.reactiveTransformer.setTaskScheduler(new SimpleAsyncTaskScheduler());
diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java
@@ -21,8 +21,8 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mysql.MySQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -36,8 +36,8 @@ public interface DebeziumMySqlTestContainer {
 
 	int EXPECTED_DB_TX_COUNT = 52;
 
-	MySQLContainer<?> DEBEZIUM_MYSQL =
-			new MySQLContainer<>(
+	MySQLContainer DEBEZIUM_MYSQL =
+			new MySQLContainer(
 					DockerImageName.parse("debezium/example-mysql:3.0.0.Final")
 							.asCompatibleSubstituteFor("mysql"))
 					.withUsername("mysqluser")
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
@@ -20,15 +20,15 @@
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mysql.MySQLContainer;
 
 /**
- * The base contract for JUnit tests based on the container for MqSQL.
- * The Testcontainers 'reuse' option must be disabled,so, Ryuk container is started
+ * The base contract for JUnit-based tests on the container for MqSQL.
+ * The Testcontainers 'reuse' option must be disabled, so, Ryuk container is started
  * and will clean all the containers up from this test suite after JVM exit.
  * Since the MqSQL container instance is shared via static property, it is going to be
- * started only once per JVM, therefore the target Docker container is reused automatically.
+ * started only once per JVM; therefore, the target Docker container is reused automatically.
  *
  * @author Artem Bilan
  *
@@ -37,7 +37,7 @@
 @Testcontainers(disabledWithoutDocker = true)
 public interface MySqlContainerTest {
 
-	MySQLContainer<?> MY_SQL_CONTAINER = new MySQLContainer<>("mysql:8.0.29-oracle");
+	MySQLContainer MY_SQL_CONTAINER = new MySQLContainer("mysql:8.0.29-oracle");
 
 	@BeforeAll
 	static void startContainer() {
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/postgres/PostgresContainerTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/postgres/PostgresContainerTest.java
@@ -20,15 +20,15 @@
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 /**
  * The base contract for JUnit tests based on the container for Postgres.
  * The Testcontainers 'reuse' option must be disabled, so, Ryuk container is started
  * and will clean all the containers up from this test suite after JVM exit.
  * Since the Postgres container instance is shared via static property, it is going to be
- * started only once per JVM, therefore the target Docker container is reused automatically.
+ * started only once per JVM; therefore, the target Docker container is reused automatically.
  *
  * @author Artem Bilan
  * @author Rafael Winterhalter
@@ -39,7 +39,7 @@
 @Testcontainers(disabledWithoutDocker = true)
 public interface PostgresContainerTest {
 
-	PostgreSQLContainer<?> POSTGRES_CONTAINER = new PostgreSQLContainer<>("postgres:11")
+	PostgreSQLContainer POSTGRES_CONTAINER = new PostgreSQLContainer("postgres:11")
 			.withInitScript("org/springframework/integration/jdbc/schema-postgresql.sql");
 
 	@BeforeAll
diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java
@@ -27,8 +27,8 @@
 import org.bson.UuidRepresentation;
 import org.bson.conversions.Bson;
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mongodb.MongoDBContainer;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.annotation.Id;
@@ -52,7 +52,7 @@
  * The Testcontainers 'reuse' option must be disabled, so, Ryuk container is started
  * and will clean all the containers up from this test suite after JVM exit.
  * Since the Redis container instance is shared via static property, it is going to be
- * started only once per JVM, therefore the target Docker container is reused automatically.
+ * started only once per JVM; therefore, the target Docker container is reused automatically.
  *
  * @author Oleg Zhurakousky
  * @author Xavier Padro
diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java
@@ -21,9 +21,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
@@ -141,7 +139,7 @@ public void validateMessageHandlingWithDefaultUpdateCollection() {
 
 		this.personRepository.findAll()
 				.as(StepVerifier::create)
-				.consumeNextWith(p -> Assert.assertEquals(Optional.of(40), Optional.ofNullable(p.getAge())))
+				.consumeNextWith(p -> assertThat(p.getAge()).isEqualTo(40))
 				.verifyComplete();
 	}
 
@@ -181,7 +179,7 @@ public void validateMessageHandlingWithUpdateQueryCollection() {
 		this.client.sql("SELECT age,name FROM person where age=40")
 				.fetch().all()
 				.as(StepVerifier::create)
-				.consumeNextWith(response -> Assert.assertEquals("{AGE=40, NAME=Bob}", response.toString()))
+				.consumeNextWith(response -> assertThat(response.toString()).isEqualTo("{AGE=40, NAME=Bob}"))
 				.verifyComplete();
 
 	}
diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java
@@ -26,7 +26,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.AssertionFailedError;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -313,15 +312,15 @@ void testConcurrentModifications() throws Exception {
 				MessageGroup group = store1.addMessageToGroup(this.groupId, message);
 				if (group.getMessages().size() != 1) {
 					failures.add("ADD");
-					throw new AssertionFailedError("Failed on ADD");
+					throw new RuntimeException("Failed on ADD");
 				}
 			});
 			executor.execute(() -> {
 				store2.removeMessagesFromGroup(this.groupId, message);
 				MessageGroup group = store2.getMessageGroup(this.groupId);
 				if (!group.getMessages().isEmpty()) {
 					failures.add("REMOVE");
-					throw new AssertionFailedError("Failed on Remove");
+					throw new RuntimeException("Failed on Remove");
 				}
 			});
 
diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java
@@ -16,8 +16,8 @@
 
 package org.springframework.integration.redis.util;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
 
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
@@ -42,7 +42,7 @@ public byte[] serialize(Message<?> message) throws SerializationException {
 		try {
 			return this.objectMapper.writeValueAsBytes(message);
 		}
-		catch (JsonProcessingException e) {
+		catch (JacksonException e) {
 			throw new SerializationException("Fail to serialize 'message' to json.", e);
 		}
 	}
