Skip to content

Commit 32ec26e

Browse files
committed
Upgrade to the latest deps; RCs
* Downgrade Tomcat to `10.0.23` since SF-6.0.0-RC3 is not compatible yet * Exclude `jakarta.activation` and `com.sun.mail` transitive deps to avoid classpath conflict with Jakarta EE 10
1 parent 60f453e commit 32ec26e

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

build.gradle

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
id 'io.spring.nohttp' version '0.0.10' apply false
2121
id 'org.ajoberstar.grgit' version '4.1.1'
2222
id 'io.spring.dependency-management' version '1.1.0'
23-
id 'com.jfrog.artifactory' version '4.29.1' apply false
23+
id 'com.jfrog.artifactory' version '4.29.2' apply false
2424
id 'org.jetbrains.dokka' version "$kotlinVersion"
2525
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
2626
id 'org.asciidoctor.jvm.gems' version '3.3.2'
@@ -61,25 +61,25 @@ ext {
6161
commonsDbcp2Version = '2.9.0'
6262
commonsIoVersion = '2.11.0'
6363
commonsNetVersion = '3.8.0'
64-
curatorVersion = '5.3.0'
64+
curatorVersion = '5.4.0'
6565
derbyVersion = '10.16.1.1'
6666
findbugsVersion = '3.0.1'
6767
ftpServerVersion = '1.2.0'
68-
graalvmVersion = '22.2.0'
68+
graalvmVersion = '22.3.0'
6969
greenmailVersion = '2.0.0-alpha-2'
7070
groovyVersion = '4.0.6'
7171
hamcrestVersion = '2.2'
72-
hazelcastVersion = '5.1.4'
72+
hazelcastVersion = '5.2.0'
7373
hibernateVersion = '6.1.5.Final'
74-
hsqldbVersion = '2.7.0'
74+
hsqldbVersion = '2.7.1'
7575
h2Version = '2.1.214'
7676
jacksonVersion = '2.14.0'
7777
jaxbVersion = '4.0.1'
7878
jcifsVersion = '2.1.32'
7979
jeroMqVersion = '0.5.2'
8080
jmsApiVersion = '3.1.0'
8181
jpaApiVersion = '3.1.0'
82-
jrubyVersion = '9.3.8.0'
82+
jrubyVersion = '9.3.9.0'
8383
jsonpathVersion = '2.7.0'
8484
junit4Version = '4.13.2'
8585
junitJupiterVersion = '5.9.1'
@@ -91,9 +91,9 @@ ext {
9191
mailVersion = '1.0.0'
9292
micrometerVersion = '1.10.0'
9393
micrometerTracingVersion = '1.0.0'
94-
mockitoVersion = '4.8.0'
94+
mockitoVersion = '4.8.1'
9595
mongoDriverVersion = '4.7.2'
96-
mysqlVersion = '8.0.30'
96+
mysqlVersion = '8.0.31'
9797
pahoMqttClientVersion = '1.2.5'
9898
postgresVersion = '42.5.0'
9999
r2dbch2Version = '1.0.0.RC1'
@@ -103,16 +103,16 @@ ext {
103103
rsocketVersion = '1.1.3'
104104
servletApiVersion = '6.0.0'
105105
smackVersion = '4.4.6'
106-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
107-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
108-
springGraphqlVersion = '1.1.0-SNAPSHOT'
106+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
107+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC2'
108+
springGraphqlVersion = '1.1.0-RC1'
109109
springKafkaVersion = '3.0.0-RC2'
110-
springRetryVersion = '2.0.0-SNAPSHOT'
111-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
112-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
113-
springWsVersion = '4.0.0-SNAPSHOT'
110+
springRetryVersion = '2.0.0-RC2'
111+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
112+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC3'
113+
springWsVersion = '4.0.0-RC1'
114114
testcontainersVersion = '1.17.5'
115-
tomcatVersion = '10.1.1'
115+
tomcatVersion = '10.0.23'
116116
xmlUnitVersion = '2.9.0'
117117
xstreamVersion = '1.4.19'
118118

@@ -137,7 +137,7 @@ allprojects {
137137

138138
ext.javadocLinks = [
139139
'https://docs.oracle.com/en/java/javase/17/docs/api/',
140-
'https://jakarta.ee/specifications/platform/9/apidocs/',
140+
'https://jakarta.ee/specifications/platform/10/apidocs/',
141141
'https://docs.spring.io/spring-framework/docs/current/javadoc-api',
142142
'https://docs.spring.io/spring-amqp/docs/current/api/',
143143
'https://docs.spring.io/spring-data/data-mongo/docs/current/api/',
@@ -369,7 +369,7 @@ configure(javaProjects) { subproject ->
369369

370370
checkstyle {
371371
configDirectory.set(rootProject.file('src/checkstyle'))
372-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.3.3'
372+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.4'
373373
}
374374

375375
jar {
@@ -789,7 +789,10 @@ project('spring-integration-mail') {
789789

790790
providedImplementation "org.eclipse.angus:jakarta.mail:$mailVersion"
791791

792-
testImplementation "com.icegreen:greenmail:$greenmailVersion"
792+
testImplementation ("com.icegreen:greenmail:$greenmailVersion") {
793+
exclude group: 'com.sun.mail'
794+
exclude group: 'jakarta.activation'
795+
}
793796

794797
testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
795798
}
@@ -1020,6 +1023,7 @@ project('spring-integration-ws') {
10201023
api 'org.springframework:spring-webmvc'
10211024
api("org.springframework.ws:spring-ws-core:$springWsVersion") {
10221025
exclude group: 'org.springframework'
1026+
exclude group: 'com.sun.activation'
10231027
}
10241028

10251029
providedImplementation "com.sun.xml.bind:jaxb-impl:$jaxbVersion"

0 commit comments

Comments
 (0)