From 52d43ea8ed11d61aa035ec582011f8ce06c3a701 Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 20 Dec 2022 16:25:06 -0500 Subject: [PATCH] Upgrade dependencies; prepare for release Fix XML configs for new `Mockito.mock()` factory method --- build.gradle | 40 +++++++++---------- .../config/AmqpChannelParserTests-context.xml | 8 ++-- ...boundChannelAdapterParserTests-context.xml | 2 +- .../AmqpInboundGatewayParserTests-context.xml | 5 ++- ...boundChannelAdapterParserTests-context.xml | 4 +- ...boundChannelAdapterParserTests-context.xml | 4 +- ...boundChannelAdapterParserTests-context.xml | 2 +- .../ip/config/ParserTests-context.xml | 6 ++- .../tcp/TcpSendingNoSocketTests-context.xml | 3 +- .../kafka/inbound/InboundGatewayTests.java | 4 +- .../inbound/MessageDrivenAdapterTests.java | 4 +- ...goDbOutboundGatewayParserTests-context.xml | 5 ++- ...boundChannelAdapterParserTests-context.xml | 2 +- ...ChannelAdapterParserTests-context-fail.xml | 3 +- ...boundChannelAdapterParserTests-context.xml | 2 +- ...SftpOutboundGatewayParserTests-context.xml | 2 +- ...boundChannelAdapterParserTests-context.xml | 2 +- .../smb/SmbParserInboundTests-context.xml | 2 +- .../SmbParserInboundTests-fail-context.xml | 2 +- ...boundChannelAdapterParserTests-context.xml | 4 +- ...boundChannelAdapterParserTests-context.xml | 2 +- .../SmbOutboundGatewayParserTests-context.xml | 5 ++- ...boundChannelAdapterParserTests-context.xml | 2 +- .../StompAdaptersParserTests-context.xml | 2 +- .../config/WebSocketParserTests-context.xml | 8 ++-- ...boundChannelAdapterParserTests-context.xml | 2 +- ...boundChannelAdapterParserTests-context.xml | 2 +- ...boundChannelAdapterParserTests-context.xml | 2 +- ...boundChannelAdapterParserTests-context.xml | 2 +- 29 files changed, 70 insertions(+), 63 deletions(-) diff --git a/build.gradle b/build.gradle index 8c997b5590..44ed2b940e 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ ext { files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } apacheSshdVersion = '2.9.2' - artemisVersion = '2.27.0' + artemisVersion = '2.27.1' aspectjVersion = '1.9.9.1' assertjVersion = '3.23.1' assertkVersion = '0.25' @@ -68,13 +68,13 @@ ext { groovyVersion = '4.0.6' hamcrestVersion = '2.2' hazelcastVersion = '5.2.1' - hibernateVersion = '6.1.5.Final' + hibernateVersion = '6.1.6.Final' hsqldbVersion = '2.7.1' h2Version = '2.1.214' - jacksonVersion = '2.14.0' + jacksonVersion = '2.14.1' jaxbVersion = '4.0.1' jcifsVersion = '2.1.32' - jeroMqVersion = '0.5.2' + jeroMqVersion = '0.5.3' jmsApiVersion = '3.1.0' jpaApiVersion = '3.1.0' jrubyVersion = '9.3.9.0' @@ -84,33 +84,33 @@ ext { jythonVersion = '2.7.3' kotlinCoroutinesVersion = '1.6.4' kryoVersion = '5.3.0' - lettuceVersion = '6.2.1.RELEASE' + lettuceVersion = '6.2.2.RELEASE' log4jVersion = '2.19.0' mailVersion = '1.0.0' - micrometerVersion = '1.10.0' + micrometerVersion = '1.10.2' micrometerTracingVersion = '1.0.0' - mockitoVersion = '4.9.0' - mongoDriverVersion = '4.8.0' + mockitoVersion = '4.10.0' + mongoDriverVersion = '4.8.1' mysqlVersion = '8.0.31' pahoMqttClientVersion = '1.2.5' - postgresVersion = '42.5.0' + postgresVersion = '42.5.1' r2dbch2Version = '1.0.0.RELEASE' - reactorVersion = '2022.0.0' + reactorVersion = '2022.0.1' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' rsocketVersion = '1.1.3' servletApiVersion = '6.0.0' smackVersion = '4.4.6' - springAmqpVersion = '3.0.1-SNAPSHOT' - springDataVersion = '2022.0.1-SNAPSHOT' - springGraphqlVersion = '1.1.1-SNAPSHOT' - springKafkaVersion = '3.0.1-SNAPSHOT' - springRetryVersion = '2.0.1-SNAPSHOT' - springSecurityVersion = '6.0.1-SNAPSHOT' - springVersion = '6.0.3-SNAPSHOT' - springWsVersion = '4.0.1-SNAPSHOT' + springAmqpVersion = '3.0.0' + springDataVersion = '2022.0.0' + springGraphqlVersion = '1.1.1' + springKafkaVersion = '3.0.1' + springRetryVersion = '2.0.0' + springSecurityVersion = '6.0.1' + springVersion = '6.0.3' + springWsVersion = '4.0.0' testcontainersVersion = '1.17.6' - tomcatVersion = '10.1.1' + tomcatVersion = '10.1.4' xmlUnitVersion = '2.9.0' xstreamVersion = '1.4.19' @@ -369,7 +369,7 @@ configure(javaProjects) { subproject -> checkstyle { configDirectory.set(rootProject.file('src/checkstyle')) - toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.4' + toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.5.0' } jar { diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml index d0d472e041..3950249676 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + - - - + diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml index dc39073d6f..8b105f34e6 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml @@ -52,7 +52,7 @@ - + diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml index 27435b2658..23be1fb659 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml @@ -13,14 +13,15 @@ connection-factory="rabbitConnectionFactory" message-converter="testConverter"/> - + - + - + - + - + - + - + - + - + void onError(RetryContext context, RetryCallback callback, diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java index 818da37a39..7d726ad685 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java @@ -83,7 +83,7 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; import org.springframework.retry.RetryCallback; import org.springframework.retry.RetryContext; -import org.springframework.retry.RetryListener; +import org.springframework.retry.listener.RetryListenerSupport; import org.springframework.retry.policy.SimpleRetryPolicy; import org.springframework.retry.support.RetryTemplate; @@ -310,7 +310,7 @@ class MessageDrivenAdapterTests { retryPolicy.setMaxAttempts(2); retryTemplate.setRetryPolicy(retryPolicy); final CountDownLatch retryCountLatch = new CountDownLatch(retryPolicy.getMaxAttempts()); - retryTemplate.registerListener(new RetryListener() { + retryTemplate.registerListener(new RetryListenerSupport() { @Override public void onError(RetryContext context, RetryCallback callback, diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml index 92342e64f3..d6313b5806 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml @@ -58,11 +58,12 @@ - + - + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml index 20c4282798..082dfb5699 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests-context.xml @@ -68,7 +68,7 @@ - + - + + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml index 4df31812bd..6da6762fbc 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests-context.xml @@ -74,6 +74,6 @@ - + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml index 8a833ed79e..b906f41439 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests-context.xml @@ -86,7 +86,7 @@ /> - + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests-context.xml index 2d4b809ddb..4686c2182a 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests-context.xml @@ -32,7 +32,7 @@ - + - + diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml index 1f40b5fb17..53e3eda844 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml @@ -29,7 +29,7 @@ - + diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml index 0b4b4af56e..8e4a55d079 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml @@ -32,7 +32,7 @@ - + - + diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml index 11b84e6146..fdbfd32907 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml @@ -44,7 +44,7 @@ - + diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests-context.xml index 6652cee18d..19a708aba5 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests-context.xml +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests-context.xml @@ -8,7 +8,8 @@ http://www.springframework.org/schema/integration/smb https://www.springframework.org/schema/integration/smb/spring-integration-smb.xsd"> - + @@ -86,7 +87,7 @@ /> - + diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests-context.xml index 9436be9a56..a1b7f7e597 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests-context.xml @@ -32,7 +32,7 @@ - + - + diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml index bf4d4079dc..cb247ac12f 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml @@ -34,15 +34,15 @@ - + - + - + - + - + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests-context.xml index ba03e5f069..0549fce0ce 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests-context.xml @@ -8,7 +8,7 @@ xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp"> - + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests-context.xml index e0b22ab30d..d27cd22c61 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests-context.xml @@ -8,7 +8,7 @@ xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp"> - + - +