Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies; prepare for release

Browse Source 
* Include Gradle to `8.9`
* Fix ActiveMQ-based tests for its deprecation
This commit is contained in:
Artem Bilan
2024-07-16 12:54:29 -04:00
parent 6173bfa59d
commit 42f4579b2a
7 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build.gradle
View File

@@ -53,19 +53,19 @@ ext {
}
modifiedFiles.finalizeValueOnRead()
apacheSshdVersion = '2.12.1'
artemisVersion = '2.33.0'
apacheSshdVersion = '2.13.1'
artemisVersion = '2.35.0'
aspectjVersion = '1.9.22.1'
assertjVersion = '3.26.3'
assertkVersion = '0.28.1'
avroVersion = '1.11.3'
awaitilityVersion = '4.2.1'
camelVersion = '4.6.0'
camelVersion = '4.7.0'
commonsDbcp2Version = '2.12.0'
commonsIoVersion = '2.16.1'
commonsNetVersion = '3.10.0'
curatorVersion = '5.6.0'
debeziumVersion = '2.6.2.Final'
commonsNetVersion = '3.11.1'
curatorVersion = '5.7.0'
debeziumVersion = '2.7.0.Final'
derbyVersion = '10.16.1.1'
ftpServerVersion = '1.2.0'
graalvmVersion = '24.0.2'
@@ -92,33 +92,33 @@ ext {
lettuceVersion = '6.3.2.RELEASE'
log4jVersion = '2.23.1'
mailVersion = '2.0.3'
micrometerTracingVersion = '1.4.0-SNAPSHOT'
micrometerVersion = '1.14.0-SNAPSHOT'
micrometerTracingVersion = '1.4.0-M1'
micrometerVersion = '1.14.0-M1'
mockitoVersion = '5.12.0'
mongoDriverVersion = '5.1.2'
mysqlVersion = '8.4.0'
oracleVersion = '23.3.0.23.09'
mysqlVersion = '9.0.0'
oracleVersion = '23.4.0.24.05'
pahoMqttClientVersion = '1.2.5'
postgresVersion = '42.7.3'
protobufVersion = '4.27.2'
r2dbch2Version = '1.0.0.RELEASE'
reactorVersion = '2024.0.0-SNAPSHOT'
reactorVersion = '2024.0.0-M4'
resilience4jVersion = '2.2.0'
romeToolsVersion = '2.1.0'
rsocketVersion = '1.1.4'
servletApiVersion = '6.0.0'
smackVersion = '4.4.8'
springAmqpVersion = '3.2.0-SNAPSHOT'
springDataVersion = '2024.1.0-SNAPSHOT'
springAmqpVersion = '3.2.0-M1'
springDataVersion = '2024.0.2'
springGraphqlVersion = '1.3.2'
springKafkaVersion = '3.3.0-SNAPSHOT'
springKafkaVersion = '3.3.0-M1'
springRetryVersion = '2.0.7'
springSecurityVersion = '6.4.0-SNAPSHOT'
springVersion = '6.2.0-SNAPSHOT'
springSecurityVersion = '6.4.0-M1'
springVersion = '6.2.0-M5'
springWsVersion = '4.0.11'
testcontainersVersion = '1.19.8'
tomcatVersion = '10.1.26'
xmlUnitVersion = '2.9.1'
xmlUnitVersion = '2.10.0'
xstreamVersion = '1.4.20'
ztZipVersion = '1.17'

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

7
gradlew vendored
View File

@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

2
gradlew.bat vendored
View File

@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java
View File

@@ -65,8 +65,8 @@ public abstract class ActiveMQMultiContextTests {
.addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()))
.addAddressSetting("#",
new AddressSettings()
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
.setExpiryAddress(SimpleString.toSimpleString("expiry")));
.setDeadLetterAddress(SimpleString.of("dla"))
.setExpiryAddress(SimpleString.of("expiry")));
broker.setConfiguration(configuration).start();
connectionFactory.setCacheConsumers(false);
}

4
spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java
View File

@@ -85,8 +85,8 @@ public class StompServerIntegrationTests {
.addAcceptorConfiguration("stomp", "tcp://127.0.0.1:" + TransportConstants.DEFAULT_STOMP_PORT)
.addAddressSetting("#",
new AddressSettings()
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
.setExpiryAddress(SimpleString.toSimpleString("expiry")));
.setDeadLetterAddress(SimpleString.of("dla"))
.setExpiryAddress(SimpleString.of("expiry")));
broker.setConfiguration(configuration).start();
stompClient = new ReactorNettyTcpStompClient("127.0.0.1", TransportConstants.DEFAULT_STOMP_PORT);