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
This commit is contained in:
42
build.gradle
42
build.gradle
@@ -20,7 +20,7 @@ plugins {
|
||||
id 'io.spring.nohttp' version '0.0.10' apply false
|
||||
id 'org.ajoberstar.grgit' version '4.1.1'
|
||||
id 'io.spring.dependency-management' version '1.1.0'
|
||||
id 'com.jfrog.artifactory' version '4.29.1' apply false
|
||||
id 'com.jfrog.artifactory' version '4.29.2' apply false
|
||||
id 'org.jetbrains.dokka' version "$kotlinVersion"
|
||||
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
|
||||
id 'org.asciidoctor.jvm.gems' version '3.3.2'
|
||||
@@ -61,17 +61,17 @@ ext {
|
||||
commonsDbcp2Version = '2.9.0'
|
||||
commonsIoVersion = '2.11.0'
|
||||
commonsNetVersion = '3.8.0'
|
||||
curatorVersion = '5.3.0'
|
||||
curatorVersion = '5.4.0'
|
||||
derbyVersion = '10.16.1.1'
|
||||
findbugsVersion = '3.0.1'
|
||||
ftpServerVersion = '1.2.0'
|
||||
graalvmVersion = '22.2.0'
|
||||
graalvmVersion = '22.3.0'
|
||||
greenmailVersion = '2.0.0-alpha-2'
|
||||
groovyVersion = '4.0.6'
|
||||
hamcrestVersion = '2.2'
|
||||
hazelcastVersion = '5.1.4'
|
||||
hazelcastVersion = '5.2.0'
|
||||
hibernateVersion = '6.1.5.Final'
|
||||
hsqldbVersion = '2.7.0'
|
||||
hsqldbVersion = '2.7.1'
|
||||
h2Version = '2.1.214'
|
||||
jacksonVersion = '2.14.0'
|
||||
jaxbVersion = '4.0.1'
|
||||
@@ -79,7 +79,7 @@ ext {
|
||||
jeroMqVersion = '0.5.2'
|
||||
jmsApiVersion = '3.1.0'
|
||||
jpaApiVersion = '3.1.0'
|
||||
jrubyVersion = '9.3.8.0'
|
||||
jrubyVersion = '9.3.9.0'
|
||||
jsonpathVersion = '2.7.0'
|
||||
junit4Version = '4.13.2'
|
||||
junitJupiterVersion = '5.9.1'
|
||||
@@ -91,9 +91,9 @@ ext {
|
||||
mailVersion = '1.0.0'
|
||||
micrometerVersion = '1.10.0'
|
||||
micrometerTracingVersion = '1.0.0'
|
||||
mockitoVersion = '4.8.0'
|
||||
mockitoVersion = '4.8.1'
|
||||
mongoDriverVersion = '4.7.2'
|
||||
mysqlVersion = '8.0.30'
|
||||
mysqlVersion = '8.0.31'
|
||||
pahoMqttClientVersion = '1.2.5'
|
||||
postgresVersion = '42.5.0'
|
||||
r2dbch2Version = '1.0.0.RC1'
|
||||
@@ -103,16 +103,16 @@ ext {
|
||||
rsocketVersion = '1.1.3'
|
||||
servletApiVersion = '6.0.0'
|
||||
smackVersion = '4.4.6'
|
||||
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
|
||||
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
|
||||
springGraphqlVersion = '1.1.0-SNAPSHOT'
|
||||
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
|
||||
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC2'
|
||||
springGraphqlVersion = '1.1.0-RC1'
|
||||
springKafkaVersion = '3.0.0-RC2'
|
||||
springRetryVersion = '2.0.0-SNAPSHOT'
|
||||
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
|
||||
springWsVersion = '4.0.0-SNAPSHOT'
|
||||
springRetryVersion = '2.0.0-RC2'
|
||||
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC3'
|
||||
springWsVersion = '4.0.0-RC1'
|
||||
testcontainersVersion = '1.17.5'
|
||||
tomcatVersion = '10.1.1'
|
||||
tomcatVersion = '10.0.23'
|
||||
xmlUnitVersion = '2.9.0'
|
||||
xstreamVersion = '1.4.19'
|
||||
|
||||
@@ -137,7 +137,7 @@ allprojects {
|
||||
|
||||
ext.javadocLinks = [
|
||||
'https://docs.oracle.com/en/java/javase/17/docs/api/',
|
||||
'https://jakarta.ee/specifications/platform/9/apidocs/',
|
||||
'https://jakarta.ee/specifications/platform/10/apidocs/',
|
||||
'https://docs.spring.io/spring-framework/docs/current/javadoc-api',
|
||||
'https://docs.spring.io/spring-amqp/docs/current/api/',
|
||||
'https://docs.spring.io/spring-data/data-mongo/docs/current/api/',
|
||||
@@ -369,7 +369,7 @@ configure(javaProjects) { subproject ->
|
||||
|
||||
checkstyle {
|
||||
configDirectory.set(rootProject.file('src/checkstyle'))
|
||||
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.3.3'
|
||||
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.4'
|
||||
}
|
||||
|
||||
jar {
|
||||
@@ -789,7 +789,10 @@ project('spring-integration-mail') {
|
||||
|
||||
providedImplementation "org.eclipse.angus:jakarta.mail:$mailVersion"
|
||||
|
||||
testImplementation "com.icegreen:greenmail:$greenmailVersion"
|
||||
testImplementation ("com.icegreen:greenmail:$greenmailVersion") {
|
||||
exclude group: 'com.sun.mail'
|
||||
exclude group: 'jakarta.activation'
|
||||
}
|
||||
|
||||
testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
|
||||
}
|
||||
@@ -1020,6 +1023,7 @@ project('spring-integration-ws') {
|
||||
api 'org.springframework:spring-webmvc'
|
||||
api("org.springframework.ws:spring-ws-core:$springWsVersion") {
|
||||
exclude group: 'org.springframework'
|
||||
exclude group: 'com.sun.activation'
|
||||
}
|
||||
|
||||
providedImplementation "com.sun.xml.bind:jaxb-impl:$jaxbVersion"
|
||||
|
||||
Reference in New Issue
Block a user