From 67c38925f426a920cf32b7284c280a64d64f800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 18 Feb 2025 08:46:03 +0100 Subject: [PATCH] Harmonize dependency management See gh-1455 --- pom.xml | 504 +++++++++++++++++++++++++++++++------ spring-ws-core/pom.xml | 223 +++++----------- spring-ws-security/pom.xml | 169 ++----------- spring-ws-support/pom.xml | 134 +++------- spring-ws-test/pom.xml | 27 +- spring-xml/pom.xml | 14 +- 6 files changed, 572 insertions(+), 499 deletions(-) diff --git a/pom.xml b/pom.xml index 3bfb10d9..fa6f5835 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ 3.25.3 1.78 1.14.13 + 4.4 3.1 2.16.1 2.1.4 @@ -55,6 +56,7 @@ 2.0.1 4.5.14 5.2.3 + 2.1.3 2.1.1 3.1.0 2.1.3 @@ -121,36 +123,10 @@ com.sun.xml.messaging.saaj saaj-impl - ${saaj-impl.version} - - - jakarta.xml.soap - jakarta.xml.soap-api - - - com.sun.activation - jakarta.activation - - - jakarta.activation - jakarta.activation-api - - - org.eclipse.angus - angus-activation - - org.jvnet.staxex stax-ex - ${stax.version} - - - jakarta.activation - jakarta.activation-api - - org.junit.jupiter @@ -165,70 +141,41 @@ net.bytebuddy byte-buddy - ${byte-buddy.version} test net.bytebuddy byte-buddy-agent - ${byte-buddy.version} test org.easymock easymock - ${easymock.version} test org.mockito mockito-core - ${mockito.version} test org.xmlunit xmlunit-assertj - ${xmlunit.version} test - - - org.assertj - assertj-core - - - javax.xml.bind - jaxb-api - - - jakarta.xml.bind - jakarta.xml.bind-api - - - net.bytebuddy - byte-buddy - - org.assertj assertj-core - ${assertj.version} test com.fasterxml.woodstox woodstox-core - ${woodstox.version} test - - - - @@ -282,6 +229,32 @@ + + + org.springframework.ws + spring-ws-core + ${project.version} + + + org.springframework.ws + spring-ws-security + ${project.version} + + + org.springframework.ws + spring-ws-support + ${project.version} + + + org.springframework.ws + spring-ws-test + ${project.version} + + + org.springframework.ws + spring-xml + ${project.version} + org.springframework spring-framework-bom @@ -296,18 +269,6 @@ pom import - - org.junit - junit-bom - ${junit.version} - pom - import - - - jakarta.xml.soap - jakarta.xml.soap-api - ${jakarta-soap.version} - org.eclipse.jetty jetty-bom @@ -315,16 +276,322 @@ pom import - + + org.junit + junit-bom + ${junit.version} + pom + import + + + + com.fasterxml.woodstox + woodstox-core + ${woodstox.version} + + + com.icegreen + greenmail + ${greenmail.version} + + + com.sun.mail + jakarta.mail + + + jakarta.activation + jakarta.activation-api + + + + + com.icegreen + greenmail-junit5 + ${greenmail.version} + + + com.icegreen + greenmail-spring + ${greenmail.version} + + + com.sun.xml.messaging.saaj + saaj-impl + ${saaj-impl.version} + + + jakarta.xml.soap + jakarta.xml.soap-api + + + com.sun.activation + jakarta.activation + + + jakarta.activation + jakarta.activation-api + + + org.eclipse.angus + angus-activation + + + + + commons-io + commons-io + ${commons-io.version} + com.google.guava guava 32.1.3-jre - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} + commons-httpclient + commons-httpclient + ${commons-httpclient.version} + + + commons-logging + commons-logging + + + + + jakarta.activation + jakarta.activation-api + ${jakarta-activation.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} + + + jakarta.jms + jakarta.jms-api + ${jakarta-jms.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta-mail-api.version} + + + jakarta.activation + jakarta.activation-api + + + + + jakarta.servlet + jakarta.servlet-api + ${jakarta-servlet.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta-xml-bind.version} + + + jakarta.xml.soap + jakarta.xml.soap-api + ${jakarta-soap.version} + + + jakarta.activation + jakarta.activation-api + + + + + jaxen + jaxen + ${jaxen.version} + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + + org.apache.activemq + artemis-jakarta-server + ${activemq.version} + + + commons-logging + commons-logging + + + + + org.apache.commons + commons-collections4 + ${commons-collection.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + + + org.apache.santuario + xmlsec + ${xmlsec.version} + + + org.codehaus.woodstox + woodstox-core-asl + + + com.fasterxml.woodstox + woodstox-core + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + org.apache.ws.xmlschema + xmlschema-core + ${xml-schema-core.version} + + + org.apache.wss4j + wss4j-ws-security-dom + ${wss4j.version} + + + org.codehaus.woodstox + wstx-asl + + + org.codehaus.woodstox + woodstox-core-asl + + + org.apache.santuario + xmlsec + + + commons-codec + commons-codec + + + org.cryptacular + cryptacular + + + jakarta.xml.bind + jakarta.xml.bind-api + + + jakarta.xml.soap + jakarta.xml.soap-api + + + org.glassfish.jaxb + jaxb-runtime + + + jakarta.mail + jakarta.mail-api + + + org.apache.geronimo.javamail + geronimo-javamail_1.4_mail + + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + org.assertj + assertj-core + ${assertj.version} + + + org.dom4j + dom4j + ${dom4j.version} + + + org.easymock + easymock + ${easymock.version} + + + org.glassfish.jaxb + jaxb-runtime + ${glassfish-xml-bind.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.eclipse.angus + angus-activation + + + + + org.igniterealtime.smack + smack-extensions + ${smack.version} + + + org.igniterealtime.smack + smack-java7 + ${smack.version} + + + org.igniterealtime.smack + smack-tcp + ${smack.version} + + + org.jdom + jdom2 + ${jdom2.version} org.jvnet.staxex @@ -337,10 +604,103 @@ + + org.mockito + mockito-core + ${mockito.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.springframework + spring-oxm + ${spring.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + org.springframework.hateoas + spring-hateoas + ${spring-hateos.version} + + + org.xmlunit + xmlunit-assertj + ${xmlunit.version} + + + org.assertj + assertj-core + + + javax.xml.bind + jaxb-api + + + jakarta.xml.bind + jakarta.xml.bind-api + + + net.bytebuddy + byte-buddy + + + + + org.xmlunit + xmlunit-core + ${xmlunit.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + org.xmlunit + xmlunit-legacy + ${xmlunit.version} + + + org.xmlunit + xmlunit-placeholders + ${xmlunit.version} + + + wsdl4j + wsdl4j + ${wsdl4j.version} + + + xom + xom + ${xom.version} + + + xml-apis + xml-apis + + + xerces + xercesImpl + + + xalan + xalan + + + - jakarta-ee-9 diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml index 2f89db16..6bbb7e5f 100644 --- a/spring-ws-core/pom.xml +++ b/spring-ws-core/pom.xml @@ -9,14 +9,21 @@ 4.0.12-SNAPSHOT spring-ws-core - jar Spring WS Core org.springframework.ws spring-xml - ${project.parent.version} + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + jakarta.xml.soap + jakarta.xml.soap-api org.springframework @@ -29,12 +36,6 @@ org.springframework spring-oxm - - - jakarta.xml.bind - jakarta.xml.bind-api - - org.springframework @@ -44,121 +45,16 @@ org.springframework spring-webmvc - - jakarta.servlet - jakarta.servlet-api - ${jakarta-servlet.version} - provided - - - jakarta.xml.soap - jakarta.xml.soap-api - ${jakarta-soap.version} - - - jakarta.activation - jakarta.activation-api - - - - - org.springframework - spring-test - test - - - commons-io - commons-io - ${commons-io.version} - test - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta-xml-bind.version} - org.glassfish.jaxb jaxb-runtime - ${glassfish-xml-bind.version} runtime - - - jakarta.xml.bind - jakarta.xml.bind-api - - - org.eclipse.angus - angus-activation - - - - - org.jdom - jdom2 - ${jdom2.version} - true - - - org.dom4j - dom4j - ${dom4j.version} - true - - - xom - xom - ${xom.version} - true - - - xml-apis - xml-apis - - - xerces - xercesImpl - - - xalan - xalan - - - - - org.apache.ws.xmlschema - xmlschema-core - ${xml-schema-core.version} - true - - - wsdl4j - wsdl4j - ${wsdl4j.version} - true - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - true - - - commons-logging - commons-logging - - - commons-httpclient commons-httpclient - ${commons-httpclient.version} true @@ -171,80 +67,97 @@ + + jakarta.servlet + jakarta.servlet-api + true + + + org.apache.httpcomponents + httpclient + true + org.apache.httpcomponents.client5 httpclient5 - ${httpclient5.version} + true + + + org.apache.ws.xmlschema + xmlschema-core + true + + + org.dom4j + dom4j + true + + + org.jdom + jdom2 + true + + + wsdl4j + wsdl4j + true + + + xom + xom true - org.eclipse.jetty - jetty-server - - - org.slf4j - slf4j-api - - + commons-io + commons-io test - - - org.eclipse.jetty - jetty-servlet - - - org.slf4j - slf4j-api - - - test - - org.apache.logging.log4j log4j-core - ${log4j2.version} test - - org.slf4j - slf4j-api - ${slf4j.version} - test - - org.aspectj aspectjrt - ${aspectj.version} test org.aspectj aspectjweaver - ${aspectj.version} test - - org.springframework.hateoas - spring-hateoas - ${spring-hateos.version} + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + org.slf4j + slf4j-api + test + + + org.springframework + spring-test test - - - org.slf4j - slf4j-api - - org.springframework spring-webflux test + + org.springframework.hateoas + spring-hateoas + test + diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml index 9762cacd..c553289a 100644 --- a/spring-ws-security/pom.xml +++ b/spring-ws-security/pom.xml @@ -9,22 +9,34 @@ 4.0.12-SNAPSHOT spring-ws-security - jar Spring WS Security org.springframework.ws - spring-xml - ${project.parent.version} + spring-ws-core org.springframework.ws - spring-ws-core - ${project.parent.version} + spring-xml - + + org.apache.santuario + xmlsec + + + org.apache.wss4j + wss4j-ws-security-dom + + + org.jvnet.staxex + stax-ex + + + org.slf4j + slf4j-api + org.springframework spring-beans @@ -33,153 +45,26 @@ org.springframework spring-tx - - org.springframework - spring-test - test - - - org.springframework.security spring-security-core - - - io.micrometer - micrometer-observation - - + + + + com.sun.xml.messaging.saaj + saaj-impl + true net.sf.ehcache ehcache - ${ehcache.version} - - - org.slf4j - slf4j-api - - true - org.apache.wss4j - wss4j-ws-security-dom - ${wss4j.version} - - - org.codehaus.woodstox - wstx-asl - - - org.codehaus.woodstox - woodstox-core-asl - - - org.apache.santuario - xmlsec - - - org.slf4j - slf4j-api - - - commons-codec - commons-codec - - - org.cryptacular - cryptacular - - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.xml.soap - jakarta.xml.soap-api - - - org.glassfish.jaxb - jaxb-runtime - - - jakarta.mail - jakarta.mail-api - - - org.apache.geronimo.javamail - geronimo-javamail_1.4_mail - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.apache.santuario - xmlsec - ${xmlsec.version} - - - org.slf4j - slf4j-api - - - org.codehaus.woodstox - woodstox-core-asl - - - com.fasterxml.woodstox - woodstox-core - - - jakarta.xml.bind - jakarta.xml.bind-api - - - - - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} - provided - - - jakarta.xml.soap - jakarta.xml.soap-api - - - org.jvnet.staxex - stax-ex - - - com.sun.activation - jakarta.activation - - - jakarta.activation - jakarta.activation-api - - - - - - org.jvnet.staxex - stax-ex - - - jakarta.activation - jakarta.activation-api - - + org.springframework + spring-test + test diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml index 46fad2d3..1ab67851 100644 --- a/spring-ws-support/pom.xml +++ b/spring-ws-support/pom.xml @@ -9,21 +9,22 @@ 4.0.12-SNAPSHOT spring-ws-support - jar Spring WS Support org.springframework.ws - spring-xml - ${project.parent.version} + spring-ws-core org.springframework.ws - spring-ws-core - ${project.parent.version} + spring-xml + + jakarta.mail + jakarta.mail-api + org.springframework spring-beans @@ -32,133 +33,66 @@ org.springframework spring-jms - - org.springframework - spring-test - test - - - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} - test - jakarta.jms jakarta.jms-api - ${jakarta-jms.version} - provided - - - jakarta.mail - jakarta.mail-api - ${jakarta-mail-api.version} - - - jakarta.activation - jakarta.activation-api - - + true org.igniterealtime.smack - smack-tcp - ${smack.version} + smack-extensions true org.igniterealtime.smack smack-java7 - ${smack.version} true - org.igniterealtime.smack - smack-extensions - ${smack.version} + smack-tcp true - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - test - - - commons-logging - commons-logging - - - - - org.apache.activemq - artemis-jakarta-server - ${activemq.version} - test - - - jakarta.jms - jakarta.jms-api - - - org.slf4j - slf4j-api - - - commons-logging - commons-logging - - - - - - - javax.json - javax.json-api - 1.1.4 - test - - - - org.slf4j - slf4j-api - ${slf4j.version} - test - com.icegreen greenmail - ${greenmail.version} test - - - org.slf4j - slf4j-api - - - com.sun.mail - jakarta.mail - - - jakarta.activation - jakarta.activation-api - - com.icegreen greenmail-junit5 - ${greenmail.version} test com.icegreen greenmail-spring - ${greenmail.version} + test + + + commons-httpclient + commons-httpclient + test + + + jakarta.annotation + jakarta.annotation-api + test + + + org.apache.activemq + artemis-jakarta-server + test + + + org.slf4j + slf4j-api + test + + + org.springframework + spring-test test diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml index 393831f0..25fa1ae8 100644 --- a/spring-ws-test/pom.xml +++ b/spring-ws-test/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.ws @@ -9,20 +9,16 @@ 4.0.12-SNAPSHOT spring-ws-test - jar Spring WS Test org.springframework.ws - spring-xml - ${project.parent.version} + spring-ws-core - org.springframework.ws - spring-ws-core - ${project.parent.version} + spring-xml @@ -31,26 +27,15 @@ org.xmlunit - xmlunit-legacy - ${xmlunit.version} + xmlunit-core - org.xmlunit - xmlunit-core - ${xmlunit.version} - - - jakarta.xml.bind - jakarta.xml.bind-api - - + xmlunit-legacy - org.xmlunit xmlunit-placeholders - ${xmlunit.version} diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml index 475ef5ee..606e2537 100644 --- a/spring-xml/pom.xml +++ b/spring-xml/pom.xml @@ -9,10 +9,13 @@ 4.0.12-SNAPSHOT spring-xml - jar Spring XML + + com.sun.xml.messaging.saaj + saaj-impl + org.springframework spring-beans @@ -25,26 +28,19 @@ org.apache.ws.xmlschema xmlschema-core - ${xml-schema-core.version} true jaxen jaxen - ${jaxen.version} true + org.apache.commons commons-collections4 - 4.4 test - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} -