Upgrade dependencies; fix compatibility in tests

Author: artembilan

build.gradle

@@ -47,7 +47,7 @@ ext {
 	modifiedFiles =
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-	activeMqVersion = '5.16.1'
+	activeMqVersion = '5.16.2'
 	apacheSshdVersion = '2.5.1'
 	aspectjVersion = '1.9.6'
 	assertjVersion = '3.17.2'
@@ -79,35 +79,35 @@ ext {
 	jschVersion = '0.1.55'
 	jsonpathVersion = '2.4.0'
 	junit4Version = '4.13.2'
-	junitJupiterVersion = '5.7.1'
+	junitJupiterVersion = '5.7.2'
 	jythonVersion = '2.7.2'
 	kryoShadedVersion = '4.0.2'
-	lettuceVersion = '6.0.4.RELEASE'
+	lettuceVersion = '6.0.5.RELEASE'
 	log4jVersion = '2.13.3'
 	mailVersion = '1.6.7'
-	micrometerVersion = '1.5.12'
+	micrometerVersion = '1.5.14'
 	mockitoVersion = '3.6.28'
 	mongoDriverVersion = '4.1.2'
 	mysqlVersion = '8.0.23'
 	pahoMqttClientVersion = '1.2.5'
 	postgresVersion = '42.2.19'
 	r2dbch2Version='0.8.4.RELEASE'
-	reactorVersion = '2020.0.6'
+	reactorVersion = '2020.0.7'
 	resilience4jVersion = '1.6.1'
 	romeToolsVersion = '1.15.0'
 	rsocketVersion = '1.1.0'
 	saajVersion = '1.5.2'
 	servletApiVersion = '4.0.1'
 	smackVersion = '4.3.5'
 	soapVersion = '1.4.0'
-	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.6'
-	springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.8'
-	springKafkaVersion = '2.6.7'
+	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.7'
+	springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.9'
+	springKafkaVersion = '2.6.8'
 	springRetryVersion = '1.3.1'
 	springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.6'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.6'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.7'
 	springWsVersion = '3.0.10.RELEASE'
-	tomcatVersion = "9.0.45"
+	tomcatVersion = "9.0.46"
 	xstreamVersion = '1.4.16'
 
 	javaProjects = subprojects - project(':spring-integration-bom')
@@ -126,7 +126,7 @@ allprojects {
 		if (version.endsWith('SNAPSHOT')) {
 			maven { url 'https://repo.spring.io/snapshot' }
 		}
-//		maven { url 'https://repo.spring.io/libs-staging-local' }
+		maven { url 'https://repo.spring.io/libs-staging-local' }
 	}
 
 	ext.javadocLinks = [

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -17,7 +17,7 @@
 package org.springframework.integration.amqp.channel;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -30,7 +30,7 @@
 import java.util.List;
 
 import org.apache.commons.logging.Log;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.core.Message;
@@ -56,7 +56,6 @@
  */
 public class DispatcherHasNoSubscribersTests {
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testPtP() throws Exception {
 		final Channel channel = mock(Channel.class);
@@ -79,14 +78,10 @@ public void testPtP() throws Exception {
 		amqpChannel.afterPropertiesSet();
 
 		MessageListener listener = (MessageListener) container.getMessageListener();
-		try {
-			listener.onMessage(new Message("Hello world!".getBytes(), null));
-			fail("Exception expected");
-		}
-		catch (MessageDeliveryException e) {
-			assertThat(e.getMessage())
-					.contains("Dispatcher has no subscribers for amqp-channel 'noSubscribersChannel'.");
-		}
+
+		assertThatExceptionOfType(MessageDeliveryException.class)
+				.isThrownBy(() -> listener.onMessage(new Message("Hello world!".getBytes())))
+				.withMessageContaining("Dispatcher has no subscribers for amqp-channel 'noSubscribersChannel'.");
 	}
 
 	@Test
@@ -99,24 +94,23 @@ public void testPubSub() {
 		SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
 		container.setConnectionFactory(connectionFactory);
 		AmqpTemplate amqpTemplate = mock(AmqpTemplate.class);
-		PublishSubscribeAmqpChannel amqpChannel = new PublishSubscribeAmqpChannel("noSubscribersChannel",
-				container, amqpTemplate);
+		PublishSubscribeAmqpChannel amqpChannel =
+				new PublishSubscribeAmqpChannel("noSubscribersChannel", container, amqpTemplate);
 		amqpChannel.setBeanName("noSubscribersChannel");
 		amqpChannel.setBeanFactory(mock(BeanFactory.class));
 		amqpChannel.afterPropertiesSet();
 
 		List<String> logList = insertMockLoggerInListener(amqpChannel);
 		MessageListener listener = (MessageListener) container.getMessageListener();
-		listener.onMessage(new Message("Hello world!".getBytes(), null));
+		listener.onMessage(new Message("Hello world!".getBytes()));
 		verifyLogReceived(logList);
 	}
 
-	private List<String> insertMockLoggerInListener(
-			PublishSubscribeAmqpChannel channel) {
-		SimpleMessageListenerContainer container = TestUtils.getPropertyValue(
-				channel, "container", SimpleMessageListenerContainer.class);
+	private static List<String> insertMockLoggerInListener(PublishSubscribeAmqpChannel channel) {
+		SimpleMessageListenerContainer container =
+				TestUtils.getPropertyValue(channel, "container", SimpleMessageListenerContainer.class);
 		Log logger = mock(Log.class);
-		final ArrayList<String> logList = new ArrayList<String>();
+		final ArrayList<String> logList = new ArrayList<>();
 		doAnswer(invocation -> {
 			String message = invocation.getArgument(0);
 			if (message.startsWith("Dispatcher has no subscribers")) {
@@ -131,7 +125,7 @@ private List<String> insertMockLoggerInListener(
 		return logList;
 	}
 
-	private void verifyLogReceived(final List<String> logList) {
+	private static void verifyLogReceived(final List<String> logList) {
 		assertThat(logList.size() > 0).as("Failed to get expected exception").isTrue();
 		boolean expectedExceptionFound = false;
 		while (logList.size() > 0) {

spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java

@@ -183,13 +183,10 @@ public void testIdleWithServerGuts(ImapMailReceiver receiver, boolean mapped, bo
 		receiver.setMaxFetchSize(1);
 		receiver.setShouldDeleteMessages(false);
 		receiver.setShouldMarkMessagesAsRead(true);
-		receiver.setCancelIdleInterval(1);
 		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
 		setUpScheduler(receiver, taskScheduler);
 		receiver.setUserFlag("testSIUserFlag");
 		receiver.afterPropertiesSet();
-		LogAccessor logger = spy(TestUtils.getPropertyValue(receiver, "logger", LogAccessor.class));
-		new DirectFieldAccessor(receiver).setPropertyValue("logger", logger);
 		ImapIdleChannelAdapter adapter = new ImapIdleChannelAdapter(receiver);
 		QueueChannel channel = new QueueChannel();
 		adapter.setOutputChannel(channel);
@@ -235,7 +232,6 @@ public void testIdleWithServerGuts(ImapMailReceiver receiver, boolean mapped, bo
 		}
 		assertThat(channel.receive(20000)).isNotNull(); // new message after idle
 		assertThat(channel.receive(100)).isNull(); // no new message after second and third idle
-		verify(logger).debug("Canceling IDLE");
 
 		adapter.stop();
 		taskScheduler.shutdown();