Start building against Spring Framework 7.0.0-M6 snapshots

See gh-1552

Author: snicoll

gradle.properties

@@ -6,4 +6,4 @@ org.gradle.parallel=true
 versionUpgradePolicy=any
 
 compatibilityTestPluginVersion=0.0.3
-springFrameworkVersion=7.0.0-M5
+springFrameworkVersion=7.0.0-SNAPSHOT

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")

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")

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")

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")