From 5b74db841787e9937b8d40a871e788ebe7d4b1a2 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 13 Oct 2020 16:58:54 -0400
Subject: [PATCH] Upgrade dependencies; improve Redis Streams tests

---
 build.gradle                                  | 36 +++++++++----------
 ...activeRedisStreamMessageProducerTests.java |  6 ++--
 ...eactiveRedisStreamMessageHandlerTests.java |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index d3ea54b441..57861e7c98 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,23 +49,23 @@ ext {
 	apacheSshdVersion = '2.5.1'
 	aspectjVersion = '1.9.6'
 	assertjVersion = '3.17.2'
-	assertkVersion = '0.22'
+	assertkVersion = '0.23'
 	avroVersion = '1.10.0'
 	awaitilityVersion = '4.0.3'
-	commonsDbcp2Version = '2.7.0'
+	commonsDbcp2Version = '2.8.0'
 	commonsIoVersion = '2.8.0'
 	commonsNetVersion = '3.7'
 	curatorVersion = '4.3.0'
 	derbyVersion = '10.14.2.0'
 	ftpServerVersion = '1.1.1'
 	googleJsr305Version = '3.0.2'
-	groovyVersion = '3.0.5'
+	groovyVersion = '3.0.6'
 	hamcrestVersion = '2.2'
-	hazelcastVersion = '4.0.2'
-	hibernateVersion = '5.4.21.Final'
+	hazelcastVersion = '4.0.3'
+	hibernateVersion = '5.4.22.Final'
 	hsqldbVersion = '2.5.1'
 	h2Version = '1.4.200'
-	jacksonVersion = '2.11.2'
+	jacksonVersion = '2.11.3'
 	javaxActivationVersion = '1.2.0'
 	javaxAnnotationVersion= '1.3.2'
 	jaxbVersion = '2.3.3'
@@ -76,36 +76,36 @@ ext {
 	jrubyVersion = '9.2.13.0'
 	jschVersion = '0.1.55'
 	jsonpathVersion = '2.4.0'
-	junit4Version = '4.13'
+	junit4Version = '4.13.1'
 	junitJupiterVersion = '5.7.0'
 	jythonVersion = '2.7.2'
 	kryoShadedVersion = '4.0.2'
-	lettuceVersion = '6.0.0.RC2'
+	lettuceVersion = '6.0.0.RELEASE'
 	log4jVersion = '2.13.3'
 	mailVersion = '1.6.5'
-	micrometerVersion = '1.5.4'
-	mockitoVersion = '3.5.10'
+	micrometerVersion = '1.5.5'
+	mockitoVersion = '3.5.13'
 	mongoDriverVersion = '4.1.0'
 	mysqlVersion = '8.0.21'
 	pahoMqttClientVersion = '1.2.4'
-	postgresVersion = '42.2.14'
+	postgresVersion = '42.2.17'
 	r2dbch2Version='0.8.4.RELEASE'
-	reactorVersion = '2020.0.0-SNAPSHOT'
-	resilience4jVersion = '1.5.0'
+	reactorVersion = '2020.0.0-RC2'
+	resilience4jVersion = '1.6.1'
 	romeToolsVersion = '1.15.0'
-	rsocketVersion = '1.1.0-M2'
+	rsocketVersion = '1.1.0-RC1'
 	saajVersion = '1.5.2'
 	servletApiVersion = '4.0.1'
-	smackVersion = '4.3.4'
+	smackVersion = '4.3.5'
 	soapVersion = '1.4.0'
 	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.0-SNAPSHOT'
 	springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-SNAPSHOT'
 	springKafkaVersion = '2.6.2-SNAPSHOT'
 	springRetryVersion = '1.3.0'
-	springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
+	springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.1'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-RC2'
 	springWsVersion = '3.0.10.RELEASE'
-	tomcatVersion = "9.0.38"
+	tomcatVersion = "9.0.39"
 	xstreamVersion = '1.4.13'
 
 	javaProjects = subprojects - project(':spring-integration-bom')
diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java
index 748108907f..3bffa4d987 100644
--- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java
+++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java
@@ -64,12 +64,12 @@ import reactor.test.StepVerifier;
  * @since 5.4
  */
 @RunWith(SpringRunner.class)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@DirtiesContext
 public class ReactiveRedisStreamMessageProducerTests extends RedisAvailableTests {
 
-	private static final String STREAM_KEY = "myStream";
+	private static final String STREAM_KEY = ReactiveRedisStreamMessageProducerTests.class.getSimpleName() + ".stream";
 
-	private static final String CONSUMER = "consumer";
+	private static final String CONSUMER = ReactiveRedisStreamMessageProducerTests.class.getSimpleName() + ".consumer";
 
 	@Autowired
 	FluxMessageChannel fluxMessageChannel;
diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java
index 64362194aa..3edd930315 100644
--- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java
+++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java
@@ -56,7 +56,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @DirtiesContext
 public class ReactiveRedisStreamMessageHandlerTests extends RedisAvailableTests {
 
-	private static final String STREAM_KEY = "myStream";
+	private static final String STREAM_KEY = ReactiveRedisStreamMessageHandlerTests.class.getSimpleName() + ".stream";
 
 	@Autowired
 	@Qualifier("streamChannel")