Update Testcontainers to 2.0.1

This commit updates the following dependencies:

- Spring Boot back to 4.0.0-SNAPSHOT
- Testcontainers to 2.0.1
- Mockito to 5.20.0

Signed-off-by: onobc <[email protected]>

Author: onobc

gradle/libs.versions.toml

@@ -19,13 +19,13 @@ jacoco = "0.8.9"
 json-path = "2.9.0"
 junit = "6.0.0"
 hamcrest = "3.0"
-mockito = "5.17.0"
+mockito = "5.20.0"
 spring-dep-mgmt = "1.1.7"
-spring-boot = "4.0.0-M3"
-spring-boot-for-docs = "4.0.0-M3"
+spring-boot = "4.0.0-SNAPSHOT"
+spring-boot-for-docs = "4.0.0-SNAPSHOT"
 spring-cloud-stream = "5.0.0-SNAPSHOT"
 system-lambda = "1.2.1"
-testcontainers = "1.21.3"
+testcontainers = "2.0.1"
 # plugins
 antora = "1.0.0"
 antora-yml = "0.0.1"

integration-tests/integration-tests.gradle

@@ -16,9 +16,9 @@ dependencies {
 	intTestImplementation project(':spring-pulsar')
 	intTestImplementation project(':spring-pulsar-test')
 	intTestImplementation 'org.awaitility:awaitility'
-	intTestImplementation 'org.testcontainers:junit-jupiter'
-	intTestImplementation 'org.testcontainers:pulsar'
-	intTestImplementation 'org.testcontainers:rabbitmq'
+	intTestImplementation 'org.testcontainers:testcontainers-junit-jupiter'
+	intTestImplementation 'org.testcontainers:testcontainers-pulsar'
+	intTestImplementation 'org.testcontainers:testcontainers-rabbitmq'
 	intTestImplementation libs.spring.boot.starter.test
 	intTestImplementation libs.spring.boot.starter.amqp
 	// Exclude spring-pulsar from boot in order to use current changes in project

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/app/PulsarContainerWithSsl.java

@@ -18,7 +18,7 @@
 
 import java.time.Duration;
 
-import org.testcontainers.containers.PulsarContainer;
+import org.testcontainers.pulsar.PulsarContainer;
 import org.testcontainers.utility.MountableFile;
 
 import org.springframework.pulsar.test.support.PulsarTestContainerSupport;

spring-pulsar-test/spring-pulsar-test.gradle

@@ -6,15 +6,8 @@ description = 'Spring Pulsar Test Utilities Module'
 
 dependencies {
     implementation 'org.junit.jupiter:junit-jupiter-api'
-	// Testcontainers brings in commons-compress 1.24.0 which has 2 CVEs.
-	// Exclude and override version to 1.26.0 until TC updates to latest
-	// commons-compress.
-    implementation('org.testcontainers:pulsar') {
-		exclude group: 'org.apache.commons', module: 'commons-compress'
-	}
-    implementation('org.testcontainers:junit-jupiter') {
-		exclude group: 'org.apache.commons', module: 'commons-compress'
-	}
+    implementation('org.testcontainers:testcontainers-pulsar')
+    implementation('org.testcontainers:testcontainers-junit-jupiter')
 	implementation libs.commons.compress
     implementation project(':spring-pulsar')
     testImplementation 'org.assertj:assertj-core'

spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java

@@ -17,8 +17,8 @@
 package org.springframework.pulsar.test.support;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.PulsarContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.pulsar.PulsarContainer;
 import org.testcontainers.utility.DockerImageName;
 
 /**

spring-pulsar/spring-pulsar.gradle

@@ -39,16 +39,16 @@ dependencies {
 	testImplementation 'org.junit.jupiter:junit-jupiter'
 	testImplementation 'org.mockito:mockito-junit-jupiter'
 	testImplementation 'org.springframework:spring-test'
-	testImplementation 'org.testcontainers:junit-jupiter'
-	testImplementation 'org.testcontainers:pulsar'
+	testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
+	testImplementation 'org.testcontainers:testcontainers-pulsar'
 
 	// Output capture used by PulsarFunctionAdministrationTests
 	testImplementation libs.system.lambda
 	testRuntimeOnly libs.logback.classic
 
 	// Used by PulsarMixedTransactionTests (Pulsar + DB)
 	testImplementation 'org.springframework:spring-jdbc'
-	testImplementation "org.testcontainers:mysql"
+	testImplementation "org.testcontainers:testcontainers-mysql"
 	testImplementation 'mysql:mysql-connector-java:8.0.33'
 
 	// Used by UserRecordDe/serializer in test fixtures

spring-pulsar/src/main/java/org/springframework/pulsar/listener/adapter/AbstractPulsarMessageToSpringMessageAdapter.java

@@ -28,11 +28,11 @@
 import org.apache.pulsar.client.api.Reader;
 import org.jspecify.annotations.Nullable;
 
-import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.expression.BeanResolver;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.MapAccessor;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.support.StandardTypeConverter;
 import org.springframework.messaging.converter.MessageConversionException;
@@ -132,7 +132,6 @@ protected boolean isPulsarMessageList() {
 		return this.isPulsarMessageList;
 	}
 
-	@SuppressWarnings("removal")
 	public void setBeanResolver(BeanResolver beanResolver) {
 		this.evaluationContext.setBeanResolver(beanResolver);
 		this.evaluationContext.setTypeConverter(new StandardTypeConverter());