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

Migrate main to SI-6.4.0

Browse Source 
* Upgrade all the respective dependencies
* Fix deprecation for latest ActiveMQ Artemis dependency
This commit is contained in:
Artem Bilan
2024-06-18 15:40:00 -04:00
parent 7dee4333ff
commit 4f664ecab2
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java
View File

@@ -49,7 +49,7 @@ public abstract class ActiveMQMultiContextTests {
private static final EmbeddedActiveMQ broker = new EmbeddedActiveMQ();
static {
amqFactory.setDeserializationWhiteList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
amqFactory.setDeserializationAllowList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD);
amqFactory.setRetryInterval(0);
}

44
build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
maven { url 'https://repo.spring.io/snapshot' }
}
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin:1.1.4'
classpath 'io.spring.gradle:dependency-management-plugin:1.1.5'
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
classpath 'org.gretty:gretty:4.0.3'
}
@@ -216,53 +216,53 @@ subprojects { subproject ->
}
ext {
artemisVersion = '2.31.2'
aspectjVersion = '1.9.20.1'
artemisVersion = '2.33.0'
aspectjVersion = '1.9.22.1'
commonsDigesterVersion = '2.1'
commonsDbcpVersion = '2.11.0'
commonsDbcpVersion = '2.12.0'
commonsFileUploadVersion = '1.5'
commonsIoVersion = '2.15.0'
commonsIoVersion = '2.16.1'
commonsLangVersion = '3.12.0'
commonsPoolVersion = '2.11.1'
c3p0Version = '0.9.5.5'
derbyVersion = '10.16.1.1'
hamcrestVersion = '2.2'
hibernateVersion = '6.3.1.Final'
hibernateVersion = '6.5.2.Final'
hibernateValidatorVersion = '8.0.0.Final'
ftpServerVersion = '1.2.0'
flexjsonVersion = '2.0'
groovyVersion = '4.0.15'
hsqldbVersion = '2.7.2'
groovyVersion = '4.0.21'
hsqldbVersion = '2.7.3'
h2Version = '2.2.224'
jacksonVersion = '2.15.3'
jaxbVersion = '4.0.4'
jacksonVersion = '2.17.1'
jaxbVersion = '4.0.5'
jodaTimeVersion = '1.6'
jtaVersion = '2.0.0'
jtdsVersion = '1.2.6'
jmsApiVersion = '3.1.0'
jrubyVersion = '9.4.3.0'
jrubyVersion = '9.4.7.0'
jpaApiVersion = '3.1.0'
jstlVersion = '1.2'
junitVersion = '4.13.2'
junitJupiterVersion = '5.10.1'
junitJupiterVersion = '5.10.2'
jythonVersion = '2.7.3'
log4jVersion = '2.21.1'
mailVersion = '2.0.2'
mockitoVersion = '5.7.0'
mongoDriverVersion = '4.11.1'
log4jVersion = '2.23.1'
mailVersion = '2.0.3'
mockitoVersion = '5.12.0'
mongoDriverVersion = '5.1.1'
openJpaVersion = '2.4.0'
oracleDriverVersion = '23.3.0.23.09'
postgresVersion = '42.7.2'
postgresVersion = '42.7.3'
slf4jVersion = '1.7.30'
springCloudVersion = '2022.0.4'
springIntegrationVersion = '6.2.0'
springCloudVersion = '2023.0.2'
springIntegrationVersion = '6.4.0-SNAPSHOT'
set('spring-integration.version', "$springIntegrationVersion")
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
springVersion = '6.1.0'
springSecurityVersion = '6.2.0'
springVersion = '6.2.0-SNAPSHOT'
springSecurityVersion = '6.4.0-SNAPSHOT'
springWebFlowVersion = '3.0.0'
testcontainersVersion = '1.19.2'
testcontainersVersion = '1.19.8'
tilesJspVersion = '2.2.1'
}

4
gradle.properties
View File

@@ -1,5 +1,5 @@
version=6.2.0
springBootVersion=3.2.0-SNAPSHOT
version=6.4.0
springBootVersion=3.3.0
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
org.gradle.caching=true
org.gradle.parallel=true