Skip to content

Commit 42f4579

Browse files
committed
Upgrade dependencies; prepare for release
* Include Gradle to `8.9` * Fix ActiveMQ-based tests for its deprecation
1 parent 6173bfa commit 42f4579

File tree

7 files changed

+30
-25
lines changed

7 files changed

+30
-25
lines changed

build.gradle

+17-17
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ ext {
5353
}
5454
modifiedFiles.finalizeValueOnRead()
5555

56-
apacheSshdVersion = '2.12.1'
57-
artemisVersion = '2.33.0'
56+
apacheSshdVersion = '2.13.1'
57+
artemisVersion = '2.35.0'
5858
aspectjVersion = '1.9.22.1'
5959
assertjVersion = '3.26.3'
6060
assertkVersion = '0.28.1'
6161
avroVersion = '1.11.3'
6262
awaitilityVersion = '4.2.1'
63-
camelVersion = '4.6.0'
63+
camelVersion = '4.7.0'
6464
commonsDbcp2Version = '2.12.0'
6565
commonsIoVersion = '2.16.1'
66-
commonsNetVersion = '3.10.0'
67-
curatorVersion = '5.6.0'
68-
debeziumVersion = '2.6.2.Final'
66+
commonsNetVersion = '3.11.1'
67+
curatorVersion = '5.7.0'
68+
debeziumVersion = '2.7.0.Final'
6969
derbyVersion = '10.16.1.1'
7070
ftpServerVersion = '1.2.0'
7171
graalvmVersion = '24.0.2'
@@ -92,33 +92,33 @@ ext {
9292
lettuceVersion = '6.3.2.RELEASE'
9393
log4jVersion = '2.23.1'
9494
mailVersion = '2.0.3'
95-
micrometerTracingVersion = '1.4.0-SNAPSHOT'
96-
micrometerVersion = '1.14.0-SNAPSHOT'
95+
micrometerTracingVersion = '1.4.0-M1'
96+
micrometerVersion = '1.14.0-M1'
9797
mockitoVersion = '5.12.0'
9898
mongoDriverVersion = '5.1.2'
99-
mysqlVersion = '8.4.0'
100-
oracleVersion = '23.3.0.23.09'
99+
mysqlVersion = '9.0.0'
100+
oracleVersion = '23.4.0.24.05'
101101
pahoMqttClientVersion = '1.2.5'
102102
postgresVersion = '42.7.3'
103103
protobufVersion = '4.27.2'
104104
r2dbch2Version = '1.0.0.RELEASE'
105-
reactorVersion = '2024.0.0-SNAPSHOT'
105+
reactorVersion = '2024.0.0-M4'
106106
resilience4jVersion = '2.2.0'
107107
romeToolsVersion = '2.1.0'
108108
rsocketVersion = '1.1.4'
109109
servletApiVersion = '6.0.0'
110110
smackVersion = '4.4.8'
111-
springAmqpVersion = '3.2.0-SNAPSHOT'
112-
springDataVersion = '2024.1.0-SNAPSHOT'
111+
springAmqpVersion = '3.2.0-M1'
112+
springDataVersion = '2024.0.2'
113113
springGraphqlVersion = '1.3.2'
114-
springKafkaVersion = '3.3.0-SNAPSHOT'
114+
springKafkaVersion = '3.3.0-M1'
115115
springRetryVersion = '2.0.7'
116-
springSecurityVersion = '6.4.0-SNAPSHOT'
117-
springVersion = '6.2.0-SNAPSHOT'
116+
springSecurityVersion = '6.4.0-M1'
117+
springVersion = '6.2.0-M5'
118118
springWsVersion = '4.0.11'
119119
testcontainersVersion = '1.19.8'
120120
tomcatVersion = '10.1.26'
121-
xmlUnitVersion = '2.9.1'
121+
xmlUnitVersion = '2.10.0'
122122
xstreamVersion = '1.4.20'
123123
ztZipVersion = '1.17'
124124

gradle/wrapper/gradle-wrapper.jar

51 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public static void startUp() throws Exception {
6565
.addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()))
6666
.addAddressSetting("#",
6767
new AddressSettings()
68-
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
69-
.setExpiryAddress(SimpleString.toSimpleString("expiry")));
68+
.setDeadLetterAddress(SimpleString.of("dla"))
69+
.setExpiryAddress(SimpleString.of("expiry")));
7070
broker.setConfiguration(configuration).start();
7171
connectionFactory.setCacheConsumers(false);
7272
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public static void setup() throws Exception {
8585
.addAcceptorConfiguration("stomp", "tcp://127.0.0.1:" + TransportConstants.DEFAULT_STOMP_PORT)
8686
.addAddressSetting("#",
8787
new AddressSettings()
88-
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
89-
.setExpiryAddress(SimpleString.toSimpleString("expiry")));
88+
.setDeadLetterAddress(SimpleString.of("dla"))
89+
.setExpiryAddress(SimpleString.of("expiry")));
9090
broker.setConfiguration(configuration).start();
9191

9292
stompClient = new ReactorNettyTcpStompClient("127.0.0.1", TransportConstants.DEFAULT_STOMP_PORT);

0 commit comments

Comments
 (0)