Upgrade dependencies; prepare for release

Fix XML configs for new `Mockito.mock()` factory method
This commit is contained in:
abilan
2022-12-20 16:25:06 -05:00
parent 49a9b7e314
commit 52d43ea8ed
29 changed files with 70 additions and 63 deletions

View File

@@ -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 {

View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="rabbitConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory" type="java.lang.Class"/>
</bean>
<amqp:channel id="channelWithInterceptor"
@@ -47,11 +47,9 @@
shutdown-timeout="0"/>
<bean id="inMapper" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.amqp.support.AmqpHeaderMapper"/>
<constructor-arg value="org.springframework.integration.amqp.support.AmqpHeaderMapper" type="java.lang.Class"/>
</bean>
<bean id="outMapper" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.amqp.support.AmqpHeaderMapper"/>
</bean>
<bean id="outMapper" parent="inMapper"/>
</beans>

View File

@@ -52,7 +52,7 @@
</int:channel>
<bean id="rabbitConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -13,14 +13,15 @@
connection-factory="rabbitConnectionFactory" message-converter="testConverter"/>
<bean id="rabbitConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"
type="java.lang.Class"/>
</bean>
<bean id="testConverter"
class="org.springframework.integration.amqp.config.AmqpInboundGatewayParserTests$TestConverter"/>
<bean id="amqpTemplate" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.core.AmqpTemplate"/>
<constructor-arg value="org.springframework.amqp.core.AmqpTemplate" type="java.lang.Class"/>
</bean>
<si-amqp:inbound-gateway id="autoStartFalseGateway" request-channel="requests" queue-names="test"

View File

@@ -18,7 +18,7 @@
<rabbit:template id="amqpTemplate" connection-factory="connectionFactory"/>
<bean id="connectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory" type="java.lang.Class"/>
</bean>
<amqp:outbound-channel-adapter id="withHeaderMapperCustomHeaders" channel="requestChannel"
@@ -29,7 +29,7 @@
mapped-request-headers="foo*"/>
<bean id="customHeaderMapper" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.amqp.support.AmqpHeaderMapper"/>
<constructor-arg value="org.springframework.integration.amqp.support.AmqpHeaderMapper" type="java.lang.Class"/>
</bean>
<amqp:outbound-channel-adapter id="withCustomHeaderMapper"

View File

@@ -63,7 +63,9 @@
directory="${java.io.tmpdir}"/>
<bean id="predicate" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileWritingMessageHandler.MessageFlushPredicate" />
<constructor-arg
value="org.springframework.integration.file.FileWritingMessageHandler.MessageFlushPredicate"
type="java.lang.Class"/>
</bean>
<file:outbound-channel-adapter id="usageChannel"

View File

@@ -21,7 +21,7 @@
</si:channel>
<beans:bean id="validator" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.springframework.validation.Validator"/>
<beans:constructor-arg value="org.springframework.validation.Validator" type="java.lang.Class"/>
</beans:bean>
<inbound-channel-adapter id="defaultAdapter" channel="requests" error-channel="errorChannel"

View File

@@ -113,11 +113,13 @@
socket-factory-support="socketFactorySupport" />
<bean id="socketSupport" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.ip.tcp.connection.TcpSocketSupport" />
<constructor-arg value="org.springframework.integration.ip.tcp.connection.TcpSocketSupport"
type="java.lang.Class"/>
</bean>
<bean id="socketFactorySupport" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport" />
<constructor-arg value="org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport"
type="java.lang.Class"/>
</bean>
<ip:tcp-inbound-channel-adapter id="testInTcp"

View File

@@ -8,7 +8,8 @@
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mockCf" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory" />
<constructor-arg value="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory"
type="java.lang.Class"/>
</bean>
<int-ip:tcp-outbound-channel-adapter

View File

@@ -56,8 +56,8 @@ import org.springframework.messaging.MessagingException;
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.backoff.NoBackOffPolicy;
import org.springframework.retry.listener.RetryListenerSupport;
import org.springframework.retry.policy.SimpleRetryPolicy;
import org.springframework.retry.support.RetryTemplate;
@@ -392,7 +392,7 @@ class InboundGatewayTests {
retryTemplate.setRetryPolicy(retryPolicy);
retryTemplate.setBackOffPolicy(new NoBackOffPolicy());
final CountDownLatch retryCountLatch = new CountDownLatch(retryPolicy.getMaxAttempts());
retryTemplate.registerListener(new RetryListener() {
retryTemplate.registerListener(new RetryListenerSupport() {
@Override
public <T, E extends Throwable> void onError(RetryContext context, RetryCallback<T, E> callback,

View File

@@ -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 <T, E extends Throwable> void onError(RetryContext context, RetryCallback<T, E> callback,

View File

@@ -58,11 +58,12 @@
<bean id="mockCollectionCallback" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.mongodb.outbound.MessageCollectionCallback"/>
<constructor-arg value="org.springframework.integration.mongodb.outbound.MessageCollectionCallback"
type="java.lang.Class"/>
</bean>
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
<constructor-arg value="#{T(org.mockito.Answers).RETURNS_MOCKS}"/>
</bean>

View File

@@ -68,7 +68,7 @@
<channel id="failureChannel"/>
<beans:bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="java.util.Comparator"/>
<beans:constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</beans:bean>
<sftp:inbound-channel-adapter id="sftpAdapter"

View File

@@ -30,6 +30,7 @@
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -74,6 +74,6 @@
</int-sftp:outbound-channel-adapter>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -86,7 +86,7 @@
/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
<bean id="mputFilter" class="org.springframework.integration.file.filters.RegexPatternFileListFilter">

View File

@@ -32,7 +32,7 @@
</int:channel>
<bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.Comparator"/>
<constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</bean>
<int-sftp:inbound-streaming-channel-adapter id="contextLoadsWithNoComparator"

View File

@@ -39,7 +39,7 @@
</int-smb:inbound-channel-adapter>
<bean id="filter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int:poller fixed-rate="3000" id="smbPoller" />

View File

@@ -29,7 +29,7 @@
</int-smb:inbound-channel-adapter>
<bean id="filter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.entries.EntryListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int:channel id="smbIn">

View File

@@ -32,7 +32,7 @@
</int-smb:inbound-channel-adapter>
<bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.Comparator"/>
<constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</bean>
<int-smb:inbound-channel-adapter
@@ -60,7 +60,7 @@
</int:channel>
<bean id="entryListFilter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int:poller fixed-rate="10000" default="true"/>

View File

@@ -44,7 +44,7 @@
<int:publish-subscribe-channel id="smbPubSubChannel"/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -8,7 +8,8 @@
http://www.springframework.org/schema/integration/smb https://www.springframework.org/schema/integration/smb/spring-integration-smb.xsd">
<bean id="sf" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory"/>
<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory"
type="java.lang.Class"/>
</bean>
<bean id="csf" class="org.springframework.integration.file.remote.session.CachingSessionFactory">
@@ -86,7 +87,7 @@
/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
<bean id="mputFilter" class="org.springframework.integration.file.filters.RegexPatternFileListFilter">

View File

@@ -32,7 +32,7 @@
</int:channel>
<bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.Comparator"/>
<constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</bean>
<int-smb:inbound-streaming-channel-adapter id="contextLoadsWithNoComparator"

View File

@@ -12,7 +12,7 @@
https://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd">
<bean id="stompSessionManager" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.stomp.StompSessionManager"/>
<constructor-arg value="org.springframework.integration.stomp.StompSessionManager" type="java.lang.Class"/>
</bean>
<bean id="stompHeaderMapper" class="org.springframework.integration.stomp.support.StompHeaderMapper"/>

View File

@@ -34,15 +34,15 @@
</int-websocket:server-container>
<bean id="handshakeHandler" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler" />
<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler" type="java.lang.Class"/>
</bean>
<bean id="handshakeInterceptor" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor" />
<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor" type="java.lang.Class"/>
</bean>
<bean id="sockJsMessageCodec" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec" />
<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec" type="java.lang.Class"/>
</bean>
<bean id="decoratorFactory"
@@ -57,7 +57,7 @@
use-broker="true" />
<bean id="webSocketClient" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.web.socket.client.WebSocketClient" />
<constructor-arg value="org.springframework.web.socket.client.WebSocketClient" type="java.lang.Class"/>
</bean>
<int-websocket:client-container id="clientWebSocketContainer"

View File

@@ -23,7 +23,7 @@
</channel>
<beans:bean id="stanzaFilter" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.jivesoftware.smack.filter.StanzaFilter"/>
<beans:constructor-arg value="org.jivesoftware.smack.filter.StanzaFilter" type="java.lang.Class"/>
</beans:bean>

View File

@@ -8,7 +8,7 @@
xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
<bean id="testConnection" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.jivesoftware.smack.XMPPConnection"/>
<constructor-arg value="org.jivesoftware.smack.XMPPConnection" type="java.lang.Class"/>
</bean>
<int:channel id="outboundEventChannel"/>

View File

@@ -8,7 +8,7 @@
xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
<bean id="testConnection" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.jivesoftware.smack.XMPPConnection"/>
<constructor-arg value="org.jivesoftware.smack.XMPPConnection" type="java.lang.Class"/>
</bean>
<int-xmpp:presence-inbound-channel-adapter channel="outChannel"

View File

@@ -8,7 +8,7 @@
xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
<bean id="testConnection" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.jivesoftware.smack.XMPPConnection"/>
<constructor-arg value="org.jivesoftware.smack.XMPPConnection" type="java.lang.Class"/>
</bean>
<int:channel id="pollingChannel">