Skip to content

Commit bb908d8

Browse files
committed
Upgrade dependencies; prepare for release
* Adapt `RabbitTestContainer` to the deprecations in the Testcontainers
1 parent bdefd8a commit bb908d8

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

Diff for: build.gradle

+24-24
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ plugins {
2020
id 'io.spring.nohttp' version '0.0.11' apply false
2121
id 'org.ajoberstar.grgit' version '4.1.1'
2222
id 'io.spring.dependency-management' version '1.1.3'
23-
id 'com.jfrog.artifactory' version '5.1.6' apply false
24-
id 'org.jetbrains.dokka' version '1.9.0'
23+
id 'com.jfrog.artifactory' version '5.1.10' apply false
24+
id 'org.jetbrains.dokka' version "$kotlinVersion"
2525
id 'org.antora' version '1.0.0'
2626
id 'io.spring.antora.generate-antora-yml' version '0.0.1'
2727
}
@@ -54,18 +54,18 @@ ext {
5454
modifiedFiles.finalizeValueOnRead()
5555

5656
apacheSshdVersion = '2.10.0'
57-
artemisVersion = '2.30.0'
57+
artemisVersion = '2.31.0'
5858
aspectjVersion = '1.9.20.1'
5959
assertjVersion = '3.24.2'
6060
assertkVersion = '0.27.0'
61-
avroVersion = '1.11.2'
61+
avroVersion = '1.11.3'
6262
awaitilityVersion = '4.2.0'
63-
camelVersion = '4.0.0'
63+
camelVersion = '4.1.0'
6464
commonsDbcp2Version = '2.10.0'
65-
commonsIoVersion = '2.13.0'
66-
commonsNetVersion = '3.9.0'
65+
commonsIoVersion = '2.14.0'
66+
commonsNetVersion = '3.10.0'
6767
curatorVersion = '5.5.0'
68-
debeziumVersion = '2.3.3.Final'
68+
debeziumVersion = '2.4.0.Final'
6969
derbyVersion = '10.16.1.1'
7070
findbugsVersion = '3.0.1'
7171
ftpServerVersion = '1.2.0'
@@ -77,10 +77,10 @@ ext {
7777
hibernateVersion = '6.3.1.Final'
7878
hsqldbVersion = '2.7.2'
7979
h2Version = '2.2.224'
80-
jacksonVersion = '2.15.2'
80+
jacksonVersion = '2.15.3'
8181
jaxbVersion = '4.0.3'
8282
jcifsVersion = '2.1.36'
83-
jeroMqVersion = '0.5.3'
83+
jeroMqVersion = '0.5.4'
8484
jmsApiVersion = '3.1.0'
8585
jpaApiVersion = '3.1.0'
8686
jrubyVersion = '9.4.3.0'
@@ -93,32 +93,32 @@ ext {
9393
lettuceVersion = '6.2.6.RELEASE'
9494
log4jVersion = '2.20.0'
9595
mailVersion = '2.0.2'
96-
micrometerTracingVersion = '1.2.0-SNAPSHOT'
97-
micrometerVersion = '1.12.0-SNAPSHOT'
98-
mockitoVersion = '5.5.0'
96+
micrometerTracingVersion = '1.2.0-RC1'
97+
micrometerVersion = '1.12.0-RC1'
98+
mockitoVersion = '5.6.0'
9999
mongoDriverVersion = '4.11.0'
100100
mysqlVersion = '8.0.33'
101101
oracleVersion = '23.3.0.23.09'
102102
pahoMqttClientVersion = '1.2.5'
103103
postgresVersion = '42.6.0'
104-
protobufVersion = '3.24.3'
104+
protobufVersion = '3.24.4'
105105
r2dbch2Version = '1.0.0.RELEASE'
106-
reactorVersion = '2023.0.0-SNAPSHOT'
106+
reactorVersion = '2023.0.0-RC1'
107107
resilience4jVersion = '2.1.0'
108108
romeToolsVersion = '2.1.0'
109109
rsocketVersion = '1.1.4'
110110
servletApiVersion = '6.0.0'
111111
smackVersion = '4.4.6'
112-
springAmqpVersion = '3.1.0-SNAPSHOT'
113-
springDataVersion = '2023.1.0-SNAPSHOT'
112+
springAmqpVersion = '3.1.0-RC1'
113+
springDataVersion = '2023.1.0-RC1'
114114
springGraphqlVersion = '1.2.3'
115-
springKafkaVersion = '3.1.0-SNAPSHOT'
116-
springRetryVersion = '2.0.3'
117-
springSecurityVersion = '6.2.0-SNAPSHOT'
118-
springVersion = '6.1.0-SNAPSHOT'
115+
springKafkaVersion = '3.1.0-RC1'
116+
springRetryVersion = '2.0.4'
117+
springSecurityVersion = '6.2.0-RC2'
118+
springVersion = '6.1.0-RC1'
119119
springWsVersion = '4.0.6'
120-
testcontainersVersion = '1.19.0'
121-
tomcatVersion = '10.1.13'
120+
testcontainersVersion = '1.19.1'
121+
tomcatVersion = '10.1.15'
122122
xmlUnitVersion = '2.9.1'
123123
xstreamVersion = '1.4.20'
124124
ztZipVersion = '1.16'
@@ -369,7 +369,7 @@ configure(javaProjects) { subproject ->
369369

370370
checkstyle {
371371
configDirectory.set(rootProject.file('src/checkstyle'))
372-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.3'
372+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.4'
373373
}
374374

375375
jar {

Diff for: spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/RabbitTestContainer.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 the original author or authors.
2+
* Copyright 2022-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.integration.amqp.support;
1818

19+
import java.io.IOException;
1920
import java.time.Duration;
2021

2122
import org.junit.jupiter.api.BeforeAll;
@@ -27,19 +28,20 @@
2728
*
2829
* @author Chris Bono
2930
* @author Gary Russell
31+
* @author Artem Bilan
3032
*/
3133
@Testcontainers(disabledWithoutDocker = true)
3234
public interface RabbitTestContainer {
3335

3436
RabbitMQContainer RABBITMQ = new RabbitMQContainer("rabbitmq:management")
3537
.withExposedPorts(5672, 15672, 5552)
3638
.withEnv("RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS", "-rabbitmq_stream advertised_host localhost")
37-
.withPluginsEnabled("rabbitmq_stream")
3839
.withStartupTimeout(Duration.ofMinutes(2));
3940

4041
@BeforeAll
41-
static void startContainer() {
42+
static void startContainer() throws IOException, InterruptedException {
4243
RABBITMQ.start();
44+
RABBITMQ.execInContainer("rabbitmq-plugins", "enable", "rabbitmq_stream");
4345
}
4446

4547
static int amqpPort() {

0 commit comments

Comments
 (0)