Skip to content

Commit 4f664ec

Browse files
committedJun 18, 2024·
Migrate main to SI-6.4.0
* Upgrade all the respective dependencies * Fix deprecation for latest ActiveMQ Artemis dependency
1 parent 7dee433 commit 4f664ec

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed
 

‎basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public abstract class ActiveMQMultiContextTests {
4949
private static final EmbeddedActiveMQ broker = new EmbeddedActiveMQ();
5050

5151
static {
52-
amqFactory.setDeserializationWhiteList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
52+
amqFactory.setDeserializationAllowList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
5353
amqFactory.setRetryInterval(0);
5454
}
5555

‎build.gradle

+22-22
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
maven { url 'https://repo.spring.io/snapshot' }
77
}
88
dependencies {
9-
classpath 'io.spring.gradle:dependency-management-plugin:1.1.4'
9+
classpath 'io.spring.gradle:dependency-management-plugin:1.1.5'
1010
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
1111
classpath 'org.gretty:gretty:4.0.3'
1212
}
@@ -216,53 +216,53 @@ subprojects { subproject ->
216216
}
217217

218218
ext {
219-
artemisVersion = '2.31.2'
220-
aspectjVersion = '1.9.20.1'
219+
artemisVersion = '2.33.0'
220+
aspectjVersion = '1.9.22.1'
221221
commonsDigesterVersion = '2.1'
222-
commonsDbcpVersion = '2.11.0'
222+
commonsDbcpVersion = '2.12.0'
223223
commonsFileUploadVersion = '1.5'
224-
commonsIoVersion = '2.15.0'
224+
commonsIoVersion = '2.16.1'
225225
commonsLangVersion = '3.12.0'
226226
commonsPoolVersion = '2.11.1'
227227
c3p0Version = '0.9.5.5'
228228
derbyVersion = '10.16.1.1'
229229
hamcrestVersion = '2.2'
230-
hibernateVersion = '6.3.1.Final'
230+
hibernateVersion = '6.5.2.Final'
231231
hibernateValidatorVersion = '8.0.0.Final'
232232
ftpServerVersion = '1.2.0'
233233
flexjsonVersion = '2.0'
234-
groovyVersion = '4.0.15'
235-
hsqldbVersion = '2.7.2'
234+
groovyVersion = '4.0.21'
235+
hsqldbVersion = '2.7.3'
236236
h2Version = '2.2.224'
237-
jacksonVersion = '2.15.3'
238-
jaxbVersion = '4.0.4'
237+
jacksonVersion = '2.17.1'
238+
jaxbVersion = '4.0.5'
239239
jodaTimeVersion = '1.6'
240240
jtaVersion = '2.0.0'
241241
jtdsVersion = '1.2.6'
242242
jmsApiVersion = '3.1.0'
243-
jrubyVersion = '9.4.3.0'
243+
jrubyVersion = '9.4.7.0'
244244
jpaApiVersion = '3.1.0'
245245
jstlVersion = '1.2'
246246
junitVersion = '4.13.2'
247-
junitJupiterVersion = '5.10.1'
247+
junitJupiterVersion = '5.10.2'
248248
jythonVersion = '2.7.3'
249-
log4jVersion = '2.21.1'
250-
mailVersion = '2.0.2'
251-
mockitoVersion = '5.7.0'
252-
mongoDriverVersion = '4.11.1'
249+
log4jVersion = '2.23.1'
250+
mailVersion = '2.0.3'
251+
mockitoVersion = '5.12.0'
252+
mongoDriverVersion = '5.1.1'
253253
openJpaVersion = '2.4.0'
254254
oracleDriverVersion = '23.3.0.23.09'
255-
postgresVersion = '42.7.2'
255+
postgresVersion = '42.7.3'
256256
slf4jVersion = '1.7.30'
257-
springCloudVersion = '2022.0.4'
258-
springIntegrationVersion = '6.2.0'
257+
springCloudVersion = '2023.0.2'
258+
springIntegrationVersion = '6.4.0-SNAPSHOT'
259259
set('spring-integration.version', "$springIntegrationVersion")
260260
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
261261
springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
262-
springVersion = '6.1.0'
263-
springSecurityVersion = '6.2.0'
262+
springVersion = '6.2.0-SNAPSHOT'
263+
springSecurityVersion = '6.4.0-SNAPSHOT'
264264
springWebFlowVersion = '3.0.0'
265-
testcontainersVersion = '1.19.2'
265+
testcontainersVersion = '1.19.8'
266266
tilesJspVersion = '2.2.1'
267267
}
268268

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version=6.2.0
2-
springBootVersion=3.2.0-SNAPSHOT
1+
version=6.4.0
2+
springBootVersion=3.3.0
33
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
44
org.gradle.caching=true
55
org.gradle.parallel=true

0 commit comments

Comments
 (0)