Upgrade dependencies; prepare for release
* Adapt `RabbitTestContainer` to the deprecations in the Testcontainers
This commit is contained in:
Artem Bilan
48
build.gradle
48
build.gradle
@@ -20,8 +20,8 @@ plugins {
|
||||
id 'io.spring.nohttp' version '0.0.11' apply false
|
||||
id 'org.ajoberstar.grgit' version '4.1.1'
|
||||
id 'io.spring.dependency-management' version '1.1.3'
|
||||
id 'com.jfrog.artifactory' version '5.1.6' apply false
|
||||
id 'org.jetbrains.dokka' version '1.9.0'
|
||||
id 'com.jfrog.artifactory' version '5.1.10' apply false
|
||||
id 'org.jetbrains.dokka' version "$kotlinVersion"
|
||||
id 'org.antora' version '1.0.0'
|
||||
id 'io.spring.antora.generate-antora-yml' version '0.0.1'
|
||||
}
|
||||
@@ -54,18 +54,18 @@ ext {
|
||||
modifiedFiles.finalizeValueOnRead()
|
||||
|
||||
apacheSshdVersion = '2.10.0'
|
||||
artemisVersion = '2.30.0'
|
||||
artemisVersion = '2.31.0'
|
||||
aspectjVersion = '1.9.20.1'
|
||||
assertjVersion = '3.24.2'
|
||||
assertkVersion = '0.27.0'
|
||||
avroVersion = '1.11.2'
|
||||
avroVersion = '1.11.3'
|
||||
awaitilityVersion = '4.2.0'
|
||||
camelVersion = '4.0.0'
|
||||
camelVersion = '4.1.0'
|
||||
commonsDbcp2Version = '2.10.0'
|
||||
commonsIoVersion = '2.13.0'
|
||||
commonsNetVersion = '3.9.0'
|
||||
commonsIoVersion = '2.14.0'
|
||||
commonsNetVersion = '3.10.0'
|
||||
curatorVersion = '5.5.0'
|
||||
debeziumVersion = '2.3.3.Final'
|
||||
debeziumVersion = '2.4.0.Final'
|
||||
derbyVersion = '10.16.1.1'
|
||||
findbugsVersion = '3.0.1'
|
||||
ftpServerVersion = '1.2.0'
|
||||
@@ -77,10 +77,10 @@ ext {
|
||||
hibernateVersion = '6.3.1.Final'
|
||||
hsqldbVersion = '2.7.2'
|
||||
h2Version = '2.2.224'
|
||||
jacksonVersion = '2.15.2'
|
||||
jacksonVersion = '2.15.3'
|
||||
jaxbVersion = '4.0.3'
|
||||
jcifsVersion = '2.1.36'
|
||||
jeroMqVersion = '0.5.3'
|
||||
jeroMqVersion = '0.5.4'
|
||||
jmsApiVersion = '3.1.0'
|
||||
jpaApiVersion = '3.1.0'
|
||||
jrubyVersion = '9.4.3.0'
|
||||
@@ -93,32 +93,32 @@ ext {
|
||||
lettuceVersion = '6.2.6.RELEASE'
|
||||
log4jVersion = '2.20.0'
|
||||
mailVersion = '2.0.2'
|
||||
micrometerTracingVersion = '1.2.0-SNAPSHOT'
|
||||
micrometerVersion = '1.12.0-SNAPSHOT'
|
||||
mockitoVersion = '5.5.0'
|
||||
micrometerTracingVersion = '1.2.0-RC1'
|
||||
micrometerVersion = '1.12.0-RC1'
|
||||
mockitoVersion = '5.6.0'
|
||||
mongoDriverVersion = '4.11.0'
|
||||
mysqlVersion = '8.0.33'
|
||||
oracleVersion = '23.3.0.23.09'
|
||||
pahoMqttClientVersion = '1.2.5'
|
||||
postgresVersion = '42.6.0'
|
||||
protobufVersion = '3.24.3'
|
||||
protobufVersion = '3.24.4'
|
||||
r2dbch2Version = '1.0.0.RELEASE'
|
||||
reactorVersion = '2023.0.0-SNAPSHOT'
|
||||
reactorVersion = '2023.0.0-RC1'
|
||||
resilience4jVersion = '2.1.0'
|
||||
romeToolsVersion = '2.1.0'
|
||||
rsocketVersion = '1.1.4'
|
||||
servletApiVersion = '6.0.0'
|
||||
smackVersion = '4.4.6'
|
||||
springAmqpVersion = '3.1.0-SNAPSHOT'
|
||||
springDataVersion = '2023.1.0-SNAPSHOT'
|
||||
springAmqpVersion = '3.1.0-RC1'
|
||||
springDataVersion = '2023.1.0-RC1'
|
||||
springGraphqlVersion = '1.2.3'
|
||||
springKafkaVersion = '3.1.0-SNAPSHOT'
|
||||
springRetryVersion = '2.0.3'
|
||||
springSecurityVersion = '6.2.0-SNAPSHOT'
|
||||
springVersion = '6.1.0-SNAPSHOT'
|
||||
springKafkaVersion = '3.1.0-RC1'
|
||||
springRetryVersion = '2.0.4'
|
||||
springSecurityVersion = '6.2.0-RC2'
|
||||
springVersion = '6.1.0-RC1'
|
||||
springWsVersion = '4.0.6'
|
||||
testcontainersVersion = '1.19.0'
|
||||
tomcatVersion = '10.1.13'
|
||||
testcontainersVersion = '1.19.1'
|
||||
tomcatVersion = '10.1.15'
|
||||
xmlUnitVersion = '2.9.1'
|
||||
xstreamVersion = '1.4.20'
|
||||
ztZipVersion = '1.16'
|
||||
@@ -369,7 +369,7 @@ configure(javaProjects) { subproject ->
|
||||
|
||||
checkstyle {
|
||||
configDirectory.set(rootProject.file('src/checkstyle'))
|
||||
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.3'
|
||||
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.4'
|
||||
}
|
||||
|
||||
jar {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2022 the original author or authors.
|
||||
* Copyright 2022-2023 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.
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package org.springframework.integration.amqp.support;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.Duration;
|
||||
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
@@ -27,6 +28,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
|
||||
*
|
||||
* @author Chris Bono
|
||||
* @author Gary Russell
|
||||
* @author Artem Bilan
|
||||
*/
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
public interface RabbitTestContainer {
|
||||
@@ -34,12 +36,12 @@ public interface RabbitTestContainer {
|
||||
RabbitMQContainer RABBITMQ = new RabbitMQContainer("rabbitmq:management")
|
||||
.withExposedPorts(5672, 15672, 5552)
|
||||
.withEnv("RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS", "-rabbitmq_stream advertised_host localhost")
|
||||
.withPluginsEnabled("rabbitmq_stream")
|
||||
.withStartupTimeout(Duration.ofMinutes(2));
|
||||
|
||||
@BeforeAll
|
||||
static void startContainer() {
|
||||
static void startContainer() throws IOException, InterruptedException {
|
||||
RABBITMQ.start();
|
||||
RABBITMQ.execInContainer("rabbitmq-plugins", "enable", "rabbitmq_stream");
|
||||
}
|
||||
|
||||
static int amqpPort() {
|
||||
|
||||
Reference in New Issue
Block a user