Upgrade dependencies to the latest minor versions

* Fix deprecation from AssertJ

Author: artembilan

build.gradle

@@ -52,54 +52,54 @@ ext {
                     }
     modifiedFiles.finalizeValueOnRead()
 
-    apacheSshdVersion = '2.11.0'
-    artemisVersion = '2.31.2'
+    apacheSshdVersion = '2.12.0'
+    artemisVersion = '2.32.0'
     aspectjVersion = '1.9.21.1'
-    assertjVersion = '3.24.2'
+    assertjVersion = '3.25.3'
     assertkVersion = '0.28.0'
     avroVersion = '1.11.3'
     awaitilityVersion = '4.2.0'
-    camelVersion = '4.3.0'
+    camelVersion = '4.4.0'
     commonsDbcp2Version = '2.11.0'
     commonsIoVersion = '2.15.1'
     commonsNetVersion = '3.10.0'
-    curatorVersion = '5.5.0'
+    curatorVersion = '5.6.0'
     debeziumVersion = '2.5.1.Final'
     derbyVersion = '10.16.1.1'
     ftpServerVersion = '1.2.0'
     graalvmVersion = '23.1.2'
     greenmailVersion = '2.1.0-alpha-4'
-    groovyVersion = '5.0.0-alpha-5'
+    groovyVersion = '4.0.18'
     hamcrestVersion = '2.2'
     hazelcastVersion = '5.3.6'
     hibernateVersion = '6.4.4.Final'
     hsqldbVersion = '2.7.2'
     h2Version = '2.2.224'
-    jacksonVersion = '2.15.4'
+    jacksonVersion = '2.16.1'
     jaxbVersion = '4.0.4'
     jcifsVersion = '2.1.37'
-    jeroMqVersion = '0.5.4'
+    jeroMqVersion = '0.6.0'
     jmsApiVersion = '3.1.0'
     jpaApiVersion = '3.1.0'
     jrubyVersion = '9.4.6.0'
     jsonpathVersion = '2.9.0'
     junit4Version = '4.13.2'
     junitJupiterVersion = '5.10.2'
     jythonVersion = '2.7.3'
-    kotlinCoroutinesVersion = '1.7.3'
-    kryoVersion = '5.5.0'
+    kotlinCoroutinesVersion = '1.8.0'
+    kryoVersion = '5.6.0'
     lettuceVersion = '6.3.1.RELEASE'
-    log4jVersion = '2.22.1'
+    log4jVersion = '2.23.0'
     mailVersion = '2.0.2'
     micrometerTracingVersion = '1.3.0-SNAPSHOT'
     micrometerVersion = '1.13.0-SNAPSHOT'
-    mockitoVersion = '5.8.0'
+    mockitoVersion = '5.10.0'
     mongoDriverVersion = '4.11.1'
-    mysqlVersion = '8.2.0'
+    mysqlVersion = '8.3.0'
     oracleVersion = '23.3.0.23.09'
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.7.2'
-    protobufVersion = '4.0.0-rc-2'
+    protobufVersion = '3.25.3'
     r2dbch2Version = '1.0.0.RELEASE'
     reactorVersion = '2023.0.3'
     resilience4jVersion = '2.2.0'
@@ -119,7 +119,7 @@ ext {
     tomcatVersion = '10.1.19'
     xmlUnitVersion = '2.9.1'
     xstreamVersion = '1.4.20'
-    ztZipVersion = '1.16'
+    ztZipVersion = '1.17'
 
     javaProjects = subprojects - project(':spring-integration-bom')
 }

spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-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.
@@ -20,8 +20,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -114,8 +114,7 @@ void testFileAggregator() {
 				.doesNotContainKey(IntegrationMessageHeaderAccessor.CORRELATION_ID);
 
 		assertThat(receive.getPayload())
-				.isInstanceOf(List.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.contains("SECOND LINE", "LAST LINE", "FIRST LINE");
 	}
 
@@ -133,8 +132,7 @@ void testEmptyFileAggregator() throws IOException {
 				.doesNotContainKey(IntegrationMessageHeaderAccessor.CORRELATION_ID);
 
 		assertThat(receive.getPayload())
-				.isInstanceOf(List.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.isEmpty();
 	}
 

spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 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.
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -194,7 +195,7 @@ public void testMultiPartFiles() throws Exception {
 						assertThat((Map<String, ?>) payload)
 								.hasSize(1)
 								.extracting((map) -> map.get("a1"))
-								.asList()
+								.asInstanceOf(InstanceOfAssertFactories.LIST)
 								.hasSize(2)
 								.satisfies((list) -> {
 									assertThat(list)

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -26,6 +26,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
@@ -301,8 +302,7 @@ public void testJsonRequestBody() throws Exception {
 
 		assertThat(message).isNotNull()
 				.extracting(Message::getPayload)
-				.isInstanceOf(List.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.hasSize(1)
 				.element(0)
 				.isInstanceOf(TestBean.class)

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -19,12 +19,12 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -281,8 +281,7 @@ public void testOutboundGatewayInsideChain() {
 		assertThat(reply)
 				.isNotNull()
 				.extracting(Message::getPayload)
-				.isInstanceOf(List.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.hasSize(1)
 				.element(0)
 				.isInstanceOf(Map.class)

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -38,6 +38,7 @@
 import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.hsqldb.HsqlException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -576,7 +577,10 @@ public void testMessageGroupStreamNoConnectionPoolLeak() throws NoSuchMethodExce
 					collectionArgumentResolver.resolveArgument(methodParameter,
 							new GenericMessage<>(pooledMessageStore.getMessageGroup(groupId).getMessages()));
 
-			assertThat(result).isInstanceOf(Collection.class).asList().hasSize(1).contains("test data");
+			assertThat(result)
+					.asInstanceOf(InstanceOfAssertFactories.LIST)
+					.hasSize(1)
+					.contains("test data");
 		}
 
 		pooledMessageStore.removeMessageGroup(groupId);

spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -49,7 +49,7 @@ public abstract class ActiveMQMultiContextTests {
 	private static final EmbeddedActiveMQ broker = new EmbeddedActiveMQ();
 
 	static {
-		amqFactory.setDeserializationWhiteList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
+		amqFactory.setDeserializationAllowList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
 		amqFactory.setRetryInterval(0);
 	}
 

spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 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.
@@ -86,7 +86,6 @@
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.ErrorMessage;
 import org.springframework.messaging.support.GenericMessage;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
@@ -558,10 +557,10 @@ void testConsumeAndProduceTransaction() throws Exception {
 		ProducerFactory pf = mock(ProducerFactory.class);
 		given(pf.transactionCapable()).willReturn(true);
 		willReturn(producer).given(pf).createProducer(isNull());
-		PlatformTransactionManager ptm = new KafkaTransactionManager(pf);
+		KafkaTransactionManager ptm = new KafkaTransactionManager(pf);
 		ContainerProperties props = new ContainerProperties("foo");
 		props.setGroupId("group");
-		props.setTransactionManager(ptm);
+		props.setKafkaAwareTransactionManager(ptm);
 		props.setAssignmentCommitOption(AssignmentCommitOption.ALWAYS);
 		final KafkaTemplate template = new KafkaTemplate(pf);
 		KafkaMessageListenerContainer container = new KafkaMessageListenerContainer<>(cf, props);
@@ -705,7 +704,7 @@ protected Producer createTransactionalProducer(String txIdPrefix) {
 		tm.setTransactionIdPrefix("tm.tx.id.");
 		ContainerProperties props = new ContainerProperties("foo");
 		props.setGroupId("group");
-		props.setTransactionManager(tm);
+		props.setKafkaAwareTransactionManager(tm);
 		props.setAssignmentCommitOption(AssignmentCommitOption.ALWAYS);
 		final KafkaTemplate template = new KafkaTemplate(pf);
 		template.setTransactionIdPrefix("template.tx.id.");

spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageGroupStoreTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.bson.Document;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -87,7 +88,7 @@ void groupIsForceReleaseAfterTimeoutWhenGroupConditionIsSet() {
 
 			assertThat(receive)
 					.extracting("payload")
-					.asList()
+					.asInstanceOf(InstanceOfAssertFactories.LIST)
 					.hasSize(1);
 		}
 	}

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -19,8 +19,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.python.core.PyTuple;
 
 import org.springframework.core.io.ClassPathResource;
@@ -41,7 +42,7 @@ public class PythonScriptExecutorTests {
 
 	private ScriptExecutor executor;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		this.executor = new PythonScriptExecutor();
 	}
@@ -77,7 +78,7 @@ public void test3() {
 		assertThat(obj)
 				.isNotNull()
 				.isInstanceOf(PyTuple.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.element(0)
 				.isEqualTo(1);
 	}
@@ -93,7 +94,7 @@ public void test3WithVariables() {
 		assertThat(obj)
 				.isNotNull()
 				.isInstanceOf(PyTuple.class)
-				.asList()
+				.asInstanceOf(InstanceOfAssertFactories.LIST)
 				.element(0)
 				.isEqualTo(1);
 	}