Skip to content

Commit 5b74db8

Browse files
committed
Upgrade dependencies; improve Redis Streams tests
1 parent 3e50190 commit 5b74db8

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

build.gradle

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ ext {
4949
apacheSshdVersion = '2.5.1'
5050
aspectjVersion = '1.9.6'
5151
assertjVersion = '3.17.2'
52-
assertkVersion = '0.22'
52+
assertkVersion = '0.23'
5353
avroVersion = '1.10.0'
5454
awaitilityVersion = '4.0.3'
55-
commonsDbcp2Version = '2.7.0'
55+
commonsDbcp2Version = '2.8.0'
5656
commonsIoVersion = '2.8.0'
5757
commonsNetVersion = '3.7'
5858
curatorVersion = '4.3.0'
5959
derbyVersion = '10.14.2.0'
6060
ftpServerVersion = '1.1.1'
6161
googleJsr305Version = '3.0.2'
62-
groovyVersion = '3.0.5'
62+
groovyVersion = '3.0.6'
6363
hamcrestVersion = '2.2'
64-
hazelcastVersion = '4.0.2'
65-
hibernateVersion = '5.4.21.Final'
64+
hazelcastVersion = '4.0.3'
65+
hibernateVersion = '5.4.22.Final'
6666
hsqldbVersion = '2.5.1'
6767
h2Version = '1.4.200'
68-
jacksonVersion = '2.11.2'
68+
jacksonVersion = '2.11.3'
6969
javaxActivationVersion = '1.2.0'
7070
javaxAnnotationVersion= '1.3.2'
7171
jaxbVersion = '2.3.3'
@@ -76,36 +76,36 @@ ext {
7676
jrubyVersion = '9.2.13.0'
7777
jschVersion = '0.1.55'
7878
jsonpathVersion = '2.4.0'
79-
junit4Version = '4.13'
79+
junit4Version = '4.13.1'
8080
junitJupiterVersion = '5.7.0'
8181
jythonVersion = '2.7.2'
8282
kryoShadedVersion = '4.0.2'
83-
lettuceVersion = '6.0.0.RC2'
83+
lettuceVersion = '6.0.0.RELEASE'
8484
log4jVersion = '2.13.3'
8585
mailVersion = '1.6.5'
86-
micrometerVersion = '1.5.4'
87-
mockitoVersion = '3.5.10'
86+
micrometerVersion = '1.5.5'
87+
mockitoVersion = '3.5.13'
8888
mongoDriverVersion = '4.1.0'
8989
mysqlVersion = '8.0.21'
9090
pahoMqttClientVersion = '1.2.4'
91-
postgresVersion = '42.2.14'
91+
postgresVersion = '42.2.17'
9292
r2dbch2Version='0.8.4.RELEASE'
93-
reactorVersion = '2020.0.0-SNAPSHOT'
94-
resilience4jVersion = '1.5.0'
93+
reactorVersion = '2020.0.0-RC2'
94+
resilience4jVersion = '1.6.1'
9595
romeToolsVersion = '1.15.0'
96-
rsocketVersion = '1.1.0-M2'
96+
rsocketVersion = '1.1.0-RC1'
9797
saajVersion = '1.5.2'
9898
servletApiVersion = '4.0.1'
99-
smackVersion = '4.3.4'
99+
smackVersion = '4.3.5'
100100
soapVersion = '1.4.0'
101101
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.0-SNAPSHOT'
102102
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-SNAPSHOT'
103103
springKafkaVersion = '2.6.2-SNAPSHOT'
104104
springRetryVersion = '1.3.0'
105-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0'
106-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
105+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.1'
106+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-RC2'
107107
springWsVersion = '3.0.10.RELEASE'
108-
tomcatVersion = "9.0.38"
108+
tomcatVersion = "9.0.39"
109109
xstreamVersion = '1.4.13'
110110

111111
javaProjects = subprojects - project(':spring-integration-bom')

spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
* @since 5.4
6565
*/
6666
@RunWith(SpringRunner.class)
67-
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
67+
@DirtiesContext
6868
public class ReactiveRedisStreamMessageProducerTests extends RedisAvailableTests {
6969

70-
private static final String STREAM_KEY = "myStream";
70+
private static final String STREAM_KEY = ReactiveRedisStreamMessageProducerTests.class.getSimpleName() + ".stream";
7171

72-
private static final String CONSUMER = "consumer";
72+
private static final String CONSUMER = ReactiveRedisStreamMessageProducerTests.class.getSimpleName() + ".consumer";
7373

7474
@Autowired
7575
FluxMessageChannel fluxMessageChannel;

spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
@DirtiesContext
5757
public class ReactiveRedisStreamMessageHandlerTests extends RedisAvailableTests {
5858

59-
private static final String STREAM_KEY = "myStream";
59+
private static final String STREAM_KEY = ReactiveRedisStreamMessageHandlerTests.class.getSimpleName() + ".stream";
6060

6161
@Autowired
6262
@Qualifier("streamChannel")

0 commit comments

Comments
 (0)