From f30eda59c076db12dcdd08c914899c8a39ba5358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 17 Feb 2025 16:30:39 +0100 Subject: [PATCH 1/3] Format structure of pom files See gh-1455 --- pom.xml | 1846 +++++++++++++++++------------------- spring-ws-bom/pom.xml | 508 +++++----- spring-ws-core/pom.xml | 608 ++++++------ spring-ws-security/pom.xml | 423 ++++----- spring-ws-support/pom.xml | 96 +- spring-ws-test/pom.xml | 7 - spring-xml/pom.xml | 10 +- 7 files changed, 1666 insertions(+), 1832 deletions(-) diff --git a/pom.xml b/pom.xml index 64dd4f057..3bfb10d9f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,965 +1,887 @@ - - 4.0.0 - - org.springframework.ws - spring-ws - 4.0.12-SNAPSHOT - pom - - Spring Web Services - https://spring.io/projects/spring-ws - Spring-based Web Services support - - - - apoutsma - Arjen Poutsma - arjen.poutsma(at)broadcom.com - VMware by Broadcom - - Project Creator - - - - tareqa - Tareq Abed Rabbo - tareq.abedrabbo(at)gmail.com - - Developer - - - - gturnquist - Greg Turnquist - - Developer - - - - corneil - Corneil du Plessis - corneil.du-plessis(at)broadcom.com - VMware by Broadcom - - Project Lead - - - - - - VMware by Broadcom - https://spring.io - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2011 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - spring-ws-bom - spring-ws-core - spring-ws-security - spring-ws-support - spring-ws-test - spring-xml - - - - UTF-8 - UTF-8 - 17 - 17 - false - - 2.33.0 - 1.9.22 - 3.25.3 - 3.1 - 2.16.1 - 2.1.4 - 4.3 - 1.1.0 - 2.10.9.2 - 2.0.1 - 4.5.14 - 5.2.3 - 2.1.1 - 3.1.0 - 2.1.3 - 2.1.3 - 6.0.0 - 3.0.2 - 4.0.2 - 4.0.5 - 1.1.6 - 2.0.6.1 - 11.0.12 - 5.9.3 - 2.19.0 - 1.4.7 - 4.11.0 - 3.0.4 - 2.0.6 - 4.3.5 - - - 6.0.23 - 6.1.9 - - - 6.0.23 - 6.1.9 - - - 6.1.16 - 6.2.8 - - - 6.1.16 - 6.2.8 - - 2.1.5 - 2.0.1 - 2.1.0 - 6.5.1 - 1.6.3 - 2.4.3 - 3.0.3 - 3.0.4 - 2.3.1 - 1.6 - 2.10.0 - 1.3.7 - 1.78 - 1.14.13 - 0.0.5 - - - - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - - - org.springframework.security - spring-security-bom - ${spring-security.version} - 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 - ${jetty.version} - pom - import - - - - com.google.guava - guava - 32.1.3-jre - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} - - - org.jvnet.staxex - stax-ex - ${stax.version} - - - jakarta.activation - jakarta.activation-api - - - - - - - - - - org.springframework - spring-core - - - - 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 - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - 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 - - - - - - - maven-compiler-plugin - 3.13.0 - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.3 - - false - - --illegal-access=permit - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - true - true - - - - - - com.gradle - develocity-maven-extension - - - - - - builddef.lst - - - - - - - - - - - - - jakarta-ee-9 - - 2.0.0 - 3.0.0 - 2.0.1 - 2.0.1 - 2.1.0 - 6.0.0 - 2.0.1 - 3.0.1 - 2.0.1 - 2.0.1 - 1.1.0 - - - - spring-buildsnapshot - - ${spring-snapshot.version} - ${spring-security-snapshot.version} - - - - spring-next-gen - - ${spring-next-gen.version} - ${spring-security-next-gen.version} - - - - spring-next-gen-snapshot - - ${spring-next-gen-snapshot.version} - ${spring-security-next-gen-snapshot.version} - - - - wss4j-next - - ${wss4j-next.version} - - - - - convergence - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.3.0 - - - default-cli - - enforce - - validate - - - - - commons-logging:*:* - - true - - - - true - - - - - - - org.basepom.maven - duplicate-finder-maven-plugin - 1.5.0 - - - check-for-duplicates - - check - - validate - - - - - - - - - - flatten - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.2.5 - - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - - - - - distribute - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.0 - - - attach-sources - - jar-no-fork - - - - - - - maven-javadoc-plugin - 2.10.4 - - -Xdoclint:none - -quiet - - - - attach-javadocs - - jar - - - - - - - - - - snapshot - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 3.6.2 - false - - - build-info - - publish - - - - spring-ws - {{BUILD_URL}} - - - https://repo.spring.io - {{ARTIFACTORY_USR}} - {{ARTIFACTORY_PSW}} - libs-snapshot-local - libs-snapshot-local - - - - - - - - - - - milestone - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 3.6.2 - false - - - build-info - - publish - - - - spring-ws - {{BUILD_URL}} - - - https://repo.spring.io - {{ARTIFACTORY_USR}} - {{ARTIFACTORY_PSW}} - libs-milestone-local - libs-milestone-local - - - - - - - - - - - central - - - true - true - true - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - sonatype - https://s01.oss.sonatype.org/ - false - true - true - - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - - - - - - - sonatype - https://s01.oss.sonatype.org//service/local/staging/deploy/maven2/ - - - - - - - docs - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.0 - - - copy-asciidoc-resources - generate-resources - false - - copy-resources - - - ${project.build.directory}/refdocs/ - - - src/main/asciidoctor - false - - - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 2.2.6 - - - org.asciidoctor - asciidoctorj-pdf - 2.3.15 - - - io.spring.asciidoctor.backends - spring-asciidoctor-backends - ${spring-asciidoctor-backends.version} - - - - - html - generate-resources - false - - process-asciidoc - - - spring-html - ${project.build.directory}/site/reference/html - - highlight.js - // these attributes are required to use the doc resources - shared - css/ - site.css - true - font - js/highlight - github - true - - - - - - pdf - generate-resources - false - - process-asciidoc - - - ${project.build.directory}/site/reference/pdf - pdf - - coderay - - - - - - - - ${project.build.directory}/refdocs/ - index.adoc - book - - ${project.version} - ${project.name} - ${project.version} - true - 4 - true - ${project.basedir} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - -Xdoclint:none - - - - - aggregate - - aggregate - - prepare-package - false - - ${project.root}/target/site/apidocs - - - - attach-javadocs - - jar - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.5.0 - - - docs - - single - - package - - - docs.xml - - spring-ws-${project.version} - true - - - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 3.6.2 - - - deploy-docs - - publish - - deploy - - - false - - - spring-ws-docs - spring-ws-docs - false - docs - - - - Spring Docs spring-ws ${project.version} - 1 - - - {{artifactory.server}} - {{artifactory.username}} - {{artifactory.password}} - {{artifactory.distribution-repository}} - {{artifactory.distribution-repository}} - *-docs.zip - - - - - - - - - - - - - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - - - - - - spring-snapshot - https://repo.spring.io/snapshot - - true - - - false - - - - spring-milestone - https://repo.spring.io/milestone - - - spring-release - https://repo.spring.io/release - - - - - https://github.com/spring-projects/spring-ws - scm:git:git://github.com/spring-projects/spring-ws.git - scm:git:ssh://git@github.com:spring-projects/spring-ws.git - + + 4.0.0 + org.springframework.ws + spring-ws + 4.0.12-SNAPSHOT + pom + Spring Web Services + Spring-based Web Services support + https://spring.io/projects/spring-ws + + Broadcom Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + https://github.com/spring-projects/spring-ws + scm:git:git://github.com/spring-projects/spring-ws.git + scm:git:ssh://git@github.com:spring-projects/spring-ws.git + + + + Spring + ask@spring.io + Broadcom Inc. + https://www.spring.io + + + + + 17 + false + UTF-8 + UTF-8 + 0.0.5 + + 2.33.0 + 1.9.22 + 3.25.3 + 1.78 + 1.14.13 + 3.1 + 2.16.1 + 2.1.4 + 4.3 + 1.1.0 + 2.10.9.2 + 2.0.1 + 4.5.14 + 5.2.3 + 2.1.1 + 3.1.0 + 2.1.3 + 2.1.3 + 6.0.0 + 3.0.2 + 4.0.2 + 4.0.5 + 1.1.6 + 2.0.6.1 + 11.0.12 + 5.9.3 + 2.19.0 + 1.4.7 + 4.11.0 + 3.0.4 + 2.0.6 + 4.3.5 + + + 6.0.23 + 6.1.9 + + + 6.0.23 + 6.1.9 + + + 6.1.16 + 6.2.8 + + + 6.1.16 + 6.2.8 + + 2.1.5 + 2.0.1 + 2.1.0 + 6.5.1 + 1.6.3 + 2.4.3 + 3.0.3 + 3.0.4 + 2.3.1 + 1.6 + 2.10.0 + 1.3.7 + + + + spring-ws-bom + spring-ws-core + spring-ws-security + spring-ws-support + spring-ws-test + spring-xml + + + + + org.springframework + spring-core + + + 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 + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + 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 + + + + + + + + + + + + com.gradle + develocity-maven-extension + + + + + + builddef.lst + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${java.version} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.3 + + false + --illegal-access=permit + + + + + + + + + + org.springframework + spring-framework-bom + ${spring.version} + pom + import + + + org.springframework.security + spring-security-bom + ${spring-security.version} + 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 + ${jetty.version} + pom + import + + + + com.google.guava + guava + 32.1.3-jre + + + com.sun.xml.messaging.saaj + saaj-impl + ${saaj-impl.version} + + + org.jvnet.staxex + stax-ex + ${stax.version} + + + jakarta.activation + jakarta.activation-api + + + + + + + + + + jakarta-ee-9 + + 2.0.0 + 3.0.0 + 2.0.1 + 2.0.1 + 2.1.0 + 6.0.0 + 2.0.1 + 3.0.1 + 2.0.1 + 2.0.1 + 1.1.0 + + + + spring-buildsnapshot + + ${spring-snapshot.version} + ${spring-security-snapshot.version} + + + + spring-next-gen + + ${spring-next-gen.version} + ${spring-security-next-gen.version} + + + + spring-next-gen-snapshot + + ${spring-next-gen-snapshot.version} + ${spring-security-next-gen-snapshot.version} + + + + wss4j-next + + ${wss4j-next.version} + + + + + convergence + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.3.0 + + + default-cli + + enforce + + validate + + + + + commons-logging:*:* + + true + + + + true + + + + + + org.basepom.maven + duplicate-finder-maven-plugin + 1.5.0 + + + check-for-duplicates + + check + + validate + + + + + + + + + + flatten + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.5 + + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + distribute + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.0 + + + attach-sources + + jar-no-fork + + + + + + + maven-javadoc-plugin + 2.10.4 + + -Xdoclint:none + -quiet + + + + attach-javadocs + + jar + + + + + + + + + + snapshot + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.2 + false + + + build-info + + publish + + + + spring-ws + {{BUILD_URL}} + + + https://repo.spring.io + {{ARTIFACTORY_USR}} + {{ARTIFACTORY_PSW}} + libs-snapshot-local + libs-snapshot-local + + + + + + + + + + + milestone + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.2 + false + + + build-info + + publish + + + + spring-ws + {{BUILD_URL}} + + + https://repo.spring.io + {{ARTIFACTORY_USR}} + {{ARTIFACTORY_PSW}} + libs-milestone-local + libs-milestone-local + + + + + + + + + + + central + + true + true + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + sonatype + https://s01.oss.sonatype.org/ + false + true + true + + + + com.thoughtworks.xstream + xstream + 1.4.20 + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + + sonatype + https://s01.oss.sonatype.org//service/local/staging/deploy/maven2/ + + + + + + + docs + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.0 + + + copy-asciidoc-resources + generate-resources + false + + copy-resources + + + ${project.build.directory}/refdocs/ + + + src/main/asciidoctor + false + + + + + + + + org.asciidoctor + asciidoctor-maven-plugin + 2.2.6 + + + org.asciidoctor + asciidoctorj-pdf + 2.3.15 + + + io.spring.asciidoctor.backends + spring-asciidoctor-backends + ${spring-asciidoctor-backends.version} + + + + + html + generate-resources + false + + process-asciidoc + + + spring-html + ${project.build.directory}/site/reference/html + + highlight.js + // these attributes are required to use the doc resources + shared + css/ + site.css + true + font + js/highlight + github + true + + + + + pdf + generate-resources + false + + process-asciidoc + + + ${project.build.directory}/site/reference/pdf + pdf + + coderay + + + + + + ${project.build.directory}/refdocs/ + index.adoc + book + + ${project.version} + ${project.name} + ${project.version} + true + 4 + true + ${project.basedir} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + -Xdoclint:none + + + + + aggregate + + aggregate + + prepare-package + false + + ${project.root}/target/site/apidocs + + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.5.0 + + + docs + + single + + package + + + docs.xml + + spring-ws-${project.version} + true + + + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.2 + + + deploy-docs + + publish + + deploy + + + false + + + spring-ws-docs + spring-ws-docs + false + docs + + + + Spring Docs spring-ws ${project.version} + 1 + + + {{artifactory.server}} + {{artifactory.username}} + {{artifactory.password}} + {{artifactory.distribution-repository}} + {{artifactory.distribution-repository}} + *-docs.zip + + + + + + + + + + + + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + + false + + + + + + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + + false + + + diff --git a/spring-ws-bom/pom.xml b/spring-ws-bom/pom.xml index 4750f6c14..d8cef7121 100644 --- a/spring-ws-bom/pom.xml +++ b/spring-ws-bom/pom.xml @@ -1,282 +1,234 @@ - 4.0.0 - - org.springframework.ws - spring-ws-bom - 4.0.12-SNAPSHOT - pom - - Spring Web Services - BOM - https://spring.io/projects/spring-ws - Spring WS - Bill of Materials (BOM) - - - VMware, Inc. - https://www.spring.io - - - - https://github.com/spring-projects/spring-ws - scm:git:git://github.com/spring-projects/spring-ws.git - scm:git:ssh://git@github.com:spring-projects/spring-ws.git - - - - GitHub - https://github.com/spring-projects/spring-ws/issues - - - - - gturnquist - Greg Turnquist - gturnquist(at)vmware.com - VMware, Inc. - https://spring.io - - Project Lead - - -6 - - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2005-2022 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - - - org.springframework.ws - spring-ws-core - 4.0.12-SNAPSHOT - - - org.springframework.ws - spring-ws-security - 4.0.12-SNAPSHOT - - - org.springframework.ws - spring-ws-support - 4.0.12-SNAPSHOT - - - org.springframework.ws - spring-ws-test - 4.0.12-SNAPSHOT - - - org.springframework.ws - spring-xml - 4.0.12-SNAPSHOT - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.2.5 - - bom - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - - - - - snapshot - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 3.6.2 - false - - - build-info - - publish - - - - spring-ws - {{BUILD_URL}} - - - https://repo.spring.io - {{ARTIFACTORY_USR}} - {{ARTIFACTORY_PSW}} - libs-snapshot-local - libs-snapshot-local - - - - - - - - - - - milestone - - - - - org.jfrog.buildinfo - artifactory-maven-plugin - 3.6.2 - false - - - build-info - - publish - - - - spring-ws - {{BUILD_URL}} - - - https://repo.spring.io - {{ARTIFACTORY_USR}} - {{ARTIFACTORY_PSW}} - libs-milestone-local - libs-milestone-local - - - - - - - - - - - central - - - true - true - true - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - sonatype - https://s01.oss.sonatype.org/ - false - true - true - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - - - - - - - sonatype - https://s01.oss.sonatype.org//service/local/staging/deploy/maven2/ - - - - - + 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 + spring-ws-bom + 4.0.12-SNAPSHOT + pom + Spring Web Services - BOM + Spring WS - Bill of Materials (BOM) + https://spring.io/projects/spring-ws + + Broadcom Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + https://github.com/spring-projects/spring-ws + scm:git:git://github.com/spring-projects/spring-ws.git + scm:git:ssh://git@github.com:spring-projects/spring-ws.git + + + + Spring + ask@spring.io + Broadcom Inc. + https://www.spring.io + + + + + + + org.springframework.ws + spring-ws-core + 4.0.12-SNAPSHOT + + + org.springframework.ws + spring-ws-security + 4.0.12-SNAPSHOT + + + org.springframework.ws + spring-ws-support + 4.0.12-SNAPSHOT + + + org.springframework.ws + spring-ws-test + 4.0.12-SNAPSHOT + + + org.springframework.ws + spring-xml + 4.0.12-SNAPSHOT + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.5 + + bom + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + snapshot + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.2 + false + + + build-info + + publish + + + + spring-ws + {{BUILD_URL}} + + + https://repo.spring.io + {{ARTIFACTORY_USR}} + {{ARTIFACTORY_PSW}} + libs-snapshot-local + libs-snapshot-local + + + + + + + + + + + milestone + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.2 + false + + + build-info + + publish + + + + spring-ws + {{BUILD_URL}} + + + https://repo.spring.io + {{ARTIFACTORY_USR}} + {{ARTIFACTORY_PSW}} + libs-milestone-local + libs-milestone-local + + + + + + + + + + + central + + true + true + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + sonatype + https://s01.oss.sonatype.org/ + false + true + true + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + sonatype + https://s01.oss.sonatype.org//service/local/staging/deploy/maven2/ + + + + diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml index f57cd05b1..2f89db16c 100644 --- a/spring-ws-core/pom.xml +++ b/spring-ws-core/pom.xml @@ -1,324 +1,312 @@ - 4.0.0 + 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 + spring-ws + 4.0.12-SNAPSHOT + + spring-ws-core + jar + Spring WS Core - - org.springframework.ws - spring-ws - 4.0.12-SNAPSHOT - + + + org.springframework.ws + spring-xml + ${project.parent.version} + + + org.springframework + spring-aop + + + org.springframework + spring-beans + + + org.springframework + spring-oxm + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + org.springframework + spring-web + + + 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 + - spring-ws-core - jar + + + 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 + - Spring WS Core + + + wsdl4j + wsdl4j + ${wsdl4j.version} + true + - + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + true + + + commons-logging + commons-logging + + + + + commons-httpclient + commons-httpclient + ${commons-httpclient.version} + true + + + commons-codec + commons-codec + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + true + - - org.springframework.ws - spring-xml - ${project.parent.version} - + + org.eclipse.jetty + jetty-server + + + org.slf4j + slf4j-api + + + test + - - org.springframework - spring-aop - - - org.springframework - spring-beans - - - org.springframework - spring-oxm - - - jakarta.xml.bind - jakarta.xml.bind-api - - - - - org.springframework - spring-web - - - 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 - + + org.eclipse.jetty + jetty-servlet + + + org.slf4j + slf4j-api + + + 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 - + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + test + + + org.slf4j + slf4j-api + ${slf4j.version} + test + - - - wsdl4j - wsdl4j - ${wsdl4j.version} - true - + + org.aspectj + aspectjrt + ${aspectj.version} + test + + + org.aspectj + aspectjweaver + ${aspectj.version} + test + - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - true - - - commons-logging - commons-logging - - - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} - true - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - - - org.apache.httpcomponents.client5 - httpclient5 - ${httpclient5.version} - true - + + org.springframework.hateoas + spring-hateoas + ${spring-hateos.version} + test + + + org.slf4j + slf4j-api + + + + + org.springframework + spring-webflux + test + + - - org.eclipse.jetty - jetty-server - - - org.slf4j - slf4j-api - - - 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} - test - - - org.slf4j - slf4j-api - - - - - org.springframework - spring-webflux - test - - - - - - - docs - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - docs - - single - - package - - true - - - - - - - - - - - jakarta-ee-9 - - - - com.sun.mail - jakarta.mail - ${sun-mail.version} - test - - - - - - jakarta-ee-10 - - true - - - - jakarta.mail - jakarta.mail-api - ${jakarta-mail-api.version} - - - org.eclipse.angus - angus-mail - ${eclipse-angus-mail.version} - test - - - jakarta.mail - jakarta.mail-api - - - - - - - + + + docs + + + + org.apache.maven.plugins + maven-assembly-plugin + + + docs + + single + + package + + true + + + + + + + + + jakarta-ee-9 + + + com.sun.mail + jakarta.mail + ${sun-mail.version} + test + + + + + jakarta-ee-10 + + true + + + + jakarta.mail + jakarta.mail-api + ${jakarta-mail-api.version} + + + org.eclipse.angus + angus-mail + ${eclipse-angus-mail.version} + test + + + jakarta.mail + jakarta.mail-api + + + + + + diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml index af327c743..9762cacd3 100644 --- a/spring-ws-security/pom.xml +++ b/spring-ws-security/pom.xml @@ -1,219 +1,212 @@ - 4.0.0 - - - org.springframework.ws - spring-ws - 4.0.12-SNAPSHOT - - - spring-ws-security - jar - - Spring WS Security - - - - - org.springframework.ws - spring-xml - ${project.parent.version} - - - org.springframework.ws - spring-ws-core - ${project.parent.version} - - - - - org.springframework - spring-beans - - - org.springframework - spring-tx - - - org.springframework - spring-test - test - - - - - org.springframework.security - spring-security-core - - - io.micrometer - micrometer-observation - - - - - 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 - - - - - - - - - docs - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - docs - - single - - package - - true - - - - - - - - - + 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 + spring-ws + 4.0.12-SNAPSHOT + + spring-ws-security + jar + Spring WS Security + + + + org.springframework.ws + spring-xml + ${project.parent.version} + + + org.springframework.ws + spring-ws-core + ${project.parent.version} + + + + + org.springframework + spring-beans + + + org.springframework + spring-tx + + + org.springframework + spring-test + test + + + + + org.springframework.security + spring-security-core + + + io.micrometer + micrometer-observation + + + + + 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 + + + + + + + + docs + + + + org.apache.maven.plugins + maven-assembly-plugin + + + docs + + single + + package + + true + + + + + + + + diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml index 737af9ab0..46fad2d39 100644 --- a/spring-ws-support/pom.xml +++ b/spring-ws-support/pom.xml @@ -3,20 +3,16 @@ 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 spring-ws 4.0.12-SNAPSHOT - spring-ws-support jar - Spring WS Support - org.springframework.ws spring-xml @@ -126,32 +122,32 @@ test - - org.slf4j - slf4j-api - ${slf4j.version} - 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 - - + + + org.slf4j + slf4j-api + + + com.sun.mail + jakarta.mail + + + jakarta.activation + jakarta.activation-api + + com.icegreen @@ -170,7 +166,6 @@ docs - @@ -191,31 +186,29 @@ - - - jakarta-ee-9 - - - - com.sun.mail - jakarta.mail - ${sun-mail.version} - - - + + jakarta-ee-9 + + + com.sun.mail + jakarta.mail + ${sun-mail.version} + + + - - jakarta-ee-10 - - true - - - - org.eclipse.angus - angus-mail - ${eclipse-angus-mail.version} + + jakarta-ee-10 + + true + + + + org.eclipse.angus + angus-mail + ${eclipse-angus-mail.version} jakarta.activation @@ -226,10 +219,9 @@ jakarta.mail-api - - - - - + + + + diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml index fcd59c699..393831f07 100644 --- a/spring-ws-test/pom.xml +++ b/spring-ws-test/pom.xml @@ -3,20 +3,16 @@ 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 spring-ws 4.0.12-SNAPSHOT - spring-ws-test jar - Spring WS Test - org.springframework.ws spring-xml @@ -62,13 +58,11 @@ spring-test test - docs - @@ -89,7 +83,6 @@ - diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml index 700293035..475ef5ee1 100644 --- a/spring-xml/pom.xml +++ b/spring-xml/pom.xml @@ -1,22 +1,18 @@ + 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 spring-ws 4.0.12-SNAPSHOT - spring-xml jar - Spring XML - org.springframework spring-beans @@ -54,7 +50,6 @@ docs - @@ -75,7 +70,6 @@ - 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 2/3] Harmonize dependency management See gh-1455 --- pom.xml | 496 ++++++++++++++++++++++++++++++++----- spring-ws-core/pom.xml | 201 +++++---------- spring-ws-security/pom.xml | 165 ++---------- spring-ws-support/pom.xml | 124 +++------- spring-ws-test/pom.xml | 27 +- spring-xml/pom.xml | 14 +- 6 files changed, 550 insertions(+), 477 deletions(-) diff --git a/pom.xml b/pom.xml index 3bfb10d9f..fa6f58352 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,6 +269,13 @@ pom import + + org.eclipse.jetty + jetty-bom + ${jetty.version} + pom + import + org.junit junit-bom @@ -303,28 +283,315 @@ pom import + - jakarta.xml.soap - jakarta.xml.soap-api - ${jakarta-soap.version} + com.fasterxml.woodstox + woodstox-core + ${woodstox.version} - org.eclipse.jetty - jetty-bom - ${jetty.version} - pom - import + com.icegreen + greenmail + ${greenmail.version} + + + com.sun.mail + jakarta.mail + + + jakarta.activation + jakarta.activation-api + + - - com.google.guava - guava - 32.1.3-jre + 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 + + + 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 2f89db16c..6bbb7e5f8 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,207 +45,119 @@ 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 + + + + commons-httpclient + commons-httpclient + true - jakarta.xml.bind - jakarta.xml.bind-api + commons-codec + commons-codec - org.eclipse.angus - angus-activation + commons-logging + commons-logging - org.jdom - jdom2 - ${jdom2.version} + jakarta.servlet + jakarta.servlet-api true - org.dom4j - dom4j - ${dom4j.version} + org.apache.httpcomponents + httpclient true - xom - xom - ${xom.version} + org.apache.httpcomponents.client5 + httpclient5 true - - - xml-apis - xml-apis - - - xerces - xercesImpl - - - xalan - xalan - - org.apache.ws.xmlschema xmlschema-core - ${xml-schema-core.version} true - - - wsdl4j - wsdl4j - ${wsdl4j.version} + org.dom4j + dom4j true - - - org.apache.httpcomponents - httpclient - ${httpclient.version} + org.jdom + jdom2 true - - - commons-logging - commons-logging - - - commons-httpclient - commons-httpclient - ${commons-httpclient.version} + wsdl4j + wsdl4j true - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - org.apache.httpcomponents.client5 - httpclient5 - ${httpclient5.version} + xom + xom true - org.eclipse.jetty - jetty-server - - - org.slf4j - slf4j-api - - - test - - - - org.eclipse.jetty - jetty-servlet - - - org.slf4j - slf4j-api - - + commons-io + commons-io 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 9762cacd3..c553289a2 100644 --- a/spring-ws-security/pom.xml +++ b/spring-ws-security/pom.xml @@ -9,177 +9,62 @@ 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.springframework - spring-beans + org.apache.santuario + xmlsec - org.springframework - spring-tx + org.apache.wss4j + wss4j-ws-security-dom - org.springframework - spring-test - test + org.jvnet.staxex + stax-ex - - - org.springframework.security - spring-security-core - - - io.micrometer - micrometer-observation - - + org.slf4j + slf4j-api - 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.springframework + spring-beans - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework + spring-tx - - 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 - - + org.springframework.security + spring-security-core - 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 - - + true + + + net.sf.ehcache + ehcache + true - 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 46fad2d39..1ab67851f 100644 --- a/spring-ws-support/pom.xml +++ b/spring-ws-support/pom.xml @@ -9,156 +9,90 @@ 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 - org.springframework - spring-beans + jakarta.mail + jakarta.mail-api org.springframework - spring-jms + spring-beans org.springframework - spring-test - test - - - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} - test + spring-jms 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} + com.icegreen + greenmail test - - - commons-logging - commons-logging - - - org.apache.activemq - artemis-jakarta-server - ${activemq.version} + com.icegreen + greenmail-junit5 test - - - jakarta.jms - jakarta.jms-api - - - org.slf4j - slf4j-api - - - commons-logging - commons-logging - - - - - javax.json - javax.json-api - 1.1.4 + com.icegreen + greenmail-spring test - - org.slf4j - slf4j-api - ${slf4j.version} + commons-httpclient + commons-httpclient test - - com.icegreen - greenmail - ${greenmail.version} + jakarta.annotation + jakarta.annotation-api test - - - org.slf4j - slf4j-api - - - com.sun.mail - jakarta.mail - - - jakarta.activation - jakarta.activation-api - - - com.icegreen - greenmail-junit5 - ${greenmail.version} + org.apache.activemq + artemis-jakarta-server test - com.icegreen - greenmail-spring - ${greenmail.version} + 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 393831f07..25fa1ae8f 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 475ef5ee1..606e25370 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} - From 90f8b8f163aa015562e7cf032122aa0d5ad9cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 18 Feb 2025 17:17:00 +0100 Subject: [PATCH 3/3] Stop sharing dependencies at the top-level This commit removes dependencies configured in the root POM and moves the necessary dependencies to their respective modules. See gh-1455 --- pom.xml | 60 -------------------------------------- spring-ws-core/pom.xml | 30 +++++++++++++++++++ spring-ws-security/pom.xml | 15 ++++++++++ spring-ws-support/pom.xml | 15 ++++++++++ spring-ws-test/pom.xml | 20 +++++++++++++ spring-xml/pom.xml | 35 +++++++++++++++++++++- 6 files changed, 114 insertions(+), 61 deletions(-) diff --git a/pom.xml b/pom.xml index fa6f58352..e19f317cd 100644 --- a/pom.xml +++ b/pom.xml @@ -115,66 +115,6 @@ spring-xml - - - org.springframework - spring-core - - - com.sun.xml.messaging.saaj - saaj-impl - - - org.jvnet.staxex - stax-ex - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - net.bytebuddy - byte-buddy - test - - - net.bytebuddy - byte-buddy-agent - test - - - org.easymock - easymock - test - - - org.mockito - mockito-core - test - - - org.xmlunit - xmlunit-assertj - test - - - org.assertj - assertj-core - test - - - com.fasterxml.woodstox - woodstox-core - test - - - diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml index 6bbb7e5f8..65d43f47e 100644 --- a/spring-ws-core/pom.xml +++ b/spring-ws-core/pom.xml @@ -108,6 +108,11 @@ true + + com.fasterxml.woodstox + woodstox-core + test + commons-io commons-io @@ -118,6 +123,11 @@ log4j-core test + + org.assertj + assertj-core + test + org.aspectj aspectjrt @@ -128,6 +138,11 @@ aspectjweaver test + + org.easymock + easymock + test + org.eclipse.jetty jetty-server @@ -138,6 +153,16 @@ jetty-servlet test + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-core + test + org.slf4j slf4j-api @@ -158,6 +183,11 @@ spring-hateoas test + + org.xmlunit + xmlunit-assertj + test + diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml index c553289a2..169bb007c 100644 --- a/spring-ws-security/pom.xml +++ b/spring-ws-security/pom.xml @@ -61,6 +61,21 @@ true + + org.assertj + assertj-core + test + + + org.easymock + easymock + test + + + org.junit.jupiter + junit-jupiter + test + org.springframework spring-test diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml index 1ab67851f..c26475a36 100644 --- a/spring-ws-support/pom.xml +++ b/spring-ws-support/pom.xml @@ -85,6 +85,16 @@ artemis-jakarta-server test + + org.assertj + assertj-core + test + + + org.junit.jupiter + junit-jupiter + test + org.slf4j slf4j-api @@ -95,6 +105,11 @@ spring-test test + + org.xmlunit + xmlunit-assertj + test + diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml index 25fa1ae8f..718397ee9 100644 --- a/spring-ws-test/pom.xml +++ b/spring-ws-test/pom.xml @@ -38,11 +38,31 @@ xmlunit-placeholders + + org.assertj + assertj-core + test + + + org.easymock + easymock + test + + + org.junit.jupiter + junit-jupiter + test + org.springframework spring-test test + + org.xmlunit + xmlunit-assertj + test + diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml index 606e25370..667287a59 100644 --- a/spring-xml/pom.xml +++ b/spring-xml/pom.xml @@ -16,6 +16,14 @@ com.sun.xml.messaging.saaj saaj-impl + + jakarta.activation + jakarta.activation-api + + + jakarta.xml.soap + jakarta.xml.soap-api + org.springframework spring-beans @@ -35,12 +43,37 @@ jaxen true - + org.apache.commons commons-collections4 test + + org.assertj + assertj-core + test + + + org.easymock + easymock + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-core + test + + + org.xmlunit + xmlunit-assertj + test +