From d370dbdda00ec338fa4e99b58f877dedb7865ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 5 Jun 2025 15:48:35 +0200 Subject: [PATCH] Start building against Spring Framework 7.0.0-M6 snapshots See gh-1552 --- gradle.properties | 2 +- spring-ws-core/build.gradle | 12 +++--------- spring-ws-platform/build.gradle | 1 + spring-ws-security/build.gradle | 8 ++------ spring-ws-support/build.gradle | 4 +--- 5 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 196b97dc..60f16172 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ org.gradle.parallel=true versionUpgradePolicy=any compatibilityTestPluginVersion=0.0.3 -springFrameworkVersion=7.0.0-M5 \ No newline at end of file +springFrameworkVersion=7.0.0-SNAPSHOT \ No newline at end of file diff --git a/spring-ws-core/build.gradle b/spring-ws-core/build.gradle index b96a9270..9c437239 100644 --- a/spring-ws-core/build.gradle +++ b/spring-ws-core/build.gradle @@ -19,16 +19,10 @@ dependencies { optional("jakarta.mail:jakarta.mail-api") optional("jakarta.servlet:jakarta.servlet-api") - optional("org.apache.httpcomponents:httpclient") { - exclude(group: "commons-logging", module: "commons-logging") - } + optional("org.apache.httpcomponents:httpclient") optional("org.apache.httpcomponents.client5:httpclient5") - optional("org.apache.ws.commons.axiom:axiom-impl") { - exclude(group: "commons-logging", module: "commons-logging") - } - optional("org.apache.ws.commons.axiom:axiom-legacy-attachments") { - exclude(group: "commons-logging", module: "commons-logging") - } + optional("org.apache.ws.commons.axiom:axiom-impl") + optional("org.apache.ws.commons.axiom:axiom-legacy-attachments") optional("org.apache.ws.xmlschema:xmlschema-core") optional("org.dom4j:dom4j") optional("org.jdom:jdom2") diff --git a/spring-ws-platform/build.gradle b/spring-ws-platform/build.gradle index 5a1bdb36..89fa57fa 100644 --- a/spring-ws-platform/build.gradle +++ b/spring-ws-platform/build.gradle @@ -23,6 +23,7 @@ dependencies { api("com.icegreen:greenmail-spring:2.1.3") api("com.sun.xml.messaging.saaj:saaj-impl:3.0.4") api("commons-io:commons-io:2.19.0") + api("commons-logging:commons-logging:1.3.5") api("jakarta.activation:jakarta.activation-api:2.1.3") api("jakarta.annotation:jakarta.annotation-api:2.1.1") api("jakarta.jms:jakarta.jms-api:3.1.0") diff --git a/spring-ws-security/build.gradle b/spring-ws-security/build.gradle index 85f45b11..c38eca65 100644 --- a/spring-ws-security/build.gradle +++ b/spring-ws-security/build.gradle @@ -23,12 +23,8 @@ dependencies { api("org.springframework.security:spring-security-core") optional("com.sun.xml.messaging.saaj:saaj-impl") - optional("org.apache.ws.commons.axiom:axiom-impl") { - exclude(group: "commons-logging", module: "commons-logging") - } - optional("org.apache.ws.commons.axiom:axiom-legacy-attachments") { - exclude(group: "commons-logging", module: "commons-logging") - } + optional("org.apache.ws.commons.axiom:axiom-impl") + optional("org.apache.ws.commons.axiom:axiom-legacy-attachments") testImplementation("org.apache.logging.log4j:log4j-core") testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl") diff --git a/spring-ws-support/build.gradle b/spring-ws-support/build.gradle index c4d85f96..c73b66d6 100644 --- a/spring-ws-support/build.gradle +++ b/spring-ws-support/build.gradle @@ -27,9 +27,7 @@ dependencies { testImplementation("com.icegreen:greenmail-junit5") testImplementation("com.icegreen:greenmail-spring") testImplementation("jakarta.annotation:jakarta.annotation-api") - testImplementation("org.apache.activemq:activemq-broker") { - exclude(group: "commons-logging", module: "commons-logging") - } + testImplementation("org.apache.activemq:activemq-broker") testImplementation("org.apache.httpcomponents.client5:httpclient5") testImplementation("org.apache.logging.log4j:log4j-core") testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl")