From 9a6748159cfd83de9987d73f98cae6d99e1ef6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 14 Mar 2025 11:39:09 +0100 Subject: [PATCH] Polish build This mostly polish the structure of the POM files and harmonize the dependency management. --- airline/client/axis1/pom.xml | 53 +------------ airline/client/jax-ws/pom.xml | 21 ++--- airline/client/jms/pom.xml | 25 +++--- airline/client/saaj/pom.xml | 52 ++----------- airline/client/spring-ws/pom.xml | 20 ++--- airline/server/pom.xml | 80 ++++++------------- echo/client/saaj/pom.xml | 19 ++--- echo/client/spring-ws/pom.xml | 20 ++--- echo/server/pom.xml | 26 +------ mtom/client/spring-ws/pom.xml | 67 ++-------------- mtom/server/pom.xml | 32 +------- pom.xml | 127 ++++++++++++++++++++----------- tutorial/pom.xml | 47 ++---------- 13 files changed, 159 insertions(+), 430 deletions(-) diff --git a/airline/client/axis1/pom.xml b/airline/client/axis1/pom.xml index 793db85..882b69a 100644 --- a/airline/client/axis1/pom.xml +++ b/airline/client/axis1/pom.xml @@ -3,51 +3,37 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - - org.springframework.ws airline-client-axis1 - 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Client - Axis1 - Demo project for Spring Web Services - 1.4 - ${project.basedir}/target/generated-sources/axis ${project.basedir}/target/classes ${project.basedir}/../airline.wsdl - axis axis - ${axis.version} - org.apache.axis axis-jaxrpc - ${axis.version} - - org.apache.maven.plugins maven-antrun-plugin - 1.8 axis @@ -64,7 +50,7 @@ generate-sources - + @@ -103,7 +89,7 @@ - + run @@ -114,7 +100,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -131,38 +116,6 @@ - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - diff --git a/airline/client/jax-ws/pom.xml b/airline/client/jax-ws/pom.xml index fc526bb..3c672b6 100644 --- a/airline/client/jax-ws/pom.xml +++ b/airline/client/jax-ws/pom.xml @@ -3,54 +3,47 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - airline-client-jax-ws - 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Client - JAX-WS - Demo project for Spring Web Services - 2.1.7 ${project.basedir}/target/generated-sources/jaxws ${project.basedir}/target/classes ${project.basedir}/../airline.wsdl - org.springframework.ws spring-ws-core - com.sun.xml.ws jaxws-tools - ${jaxws-tools.version} - jakarta.jws jakarta.jws-api - ${jws-api.version} + + org.springframework.boot + spring-boot-starter-test + test + - com.sun.xml.ws jaxws-maven-plugin - 3.0.0 @@ -70,7 +63,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -87,7 +79,6 @@ - diff --git a/airline/client/jms/pom.xml b/airline/client/jms/pom.xml index 65b9c10..05af173 100644 --- a/airline/client/jms/pom.xml +++ b/airline/client/jms/pom.xml @@ -3,18 +3,14 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - airline-client-jms - 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Client - JMS - Demo project for Spring Web Services ${project.basedir}/target/generated-sources/jaxws @@ -23,22 +19,19 @@ - - - org.springframework.ws - spring-ws-core - - - - org.springframework.ws - spring-ws-support - - org.springframework.boot spring-boot-starter-artemis + + org.springframework.ws + spring-ws-core + + + org.springframework.ws + spring-ws-support + diff --git a/airline/client/saaj/pom.xml b/airline/client/saaj/pom.xml index fa2d929..cf7b438 100644 --- a/airline/client/saaj/pom.xml +++ b/airline/client/saaj/pom.xml @@ -3,67 +3,25 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - airline-client-saaj 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Client - SAAJ - Demo project for Spring Web Services - - - 2.0.1 - - + + org.springframework.boot + spring-boot-starter + com.sun.xml.messaging.saaj saaj-impl - ${saaj-impl.version} - - - org.slf4j - slf4j-api - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml index 508c7be..f97a610 100644 --- a/airline/client/spring-ws/pom.xml +++ b/airline/client/spring-ws/pom.xml @@ -3,18 +3,14 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - airline-client-spring-ws - 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Client - Spring WS - Demo project for Spring Web Services ${project.basedir}/target/generated-sources/xjc @@ -24,33 +20,32 @@ - org.springframework.ws spring-ws-core - org.springframework.ws spring-ws-security + + org.springframework.boot + spring-boot-starter-test + test + org.springframework.ws spring-ws-test test - - - com.evolvedbinary.maven.jvnet jaxb30-maven-plugin - 0.15.0 @@ -69,11 +64,9 @@ true - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -90,7 +83,6 @@ - diff --git a/airline/server/pom.xml b/airline/server/pom.xml index f6171ba..f38b613 100644 --- a/airline/server/pom.xml +++ b/airline/server/pom.xml @@ -3,119 +3,90 @@ 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-samples 2.0.0-SNAPSHOT - ../../ + ../../pom.xml - - org.springframework.ws airline-server - 0.0.1-SNAPSHOT Spring Web Services Samples - Airline - Server - Demo project for Spring Web Services ${project.basedir}/target/generated-sources/axis ${project.basedir}/target/classes ${project.basedir}/../airline.wsdl - 2.0.2 - org.springframework.boot - spring-boot-starter-web + spring-boot-starter-artemis - org.springframework.boot - spring-boot-starter-web-services + spring-boot-starter-data-jpa - - - org.springframework.ws - spring-ws-security - - org.springframework.boot spring-boot-starter-security - + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-web-services + + + org.springframework.ws + spring-ws-security + org.springframework.ws spring-ws-support - + + org.apache.activemq + artemis-jakarta-server + wsdl4j wsdl4j - - org.springframework.boot - spring-boot-starter-data-jpa - - com.h2database h2 runtime - org.apache.ws.xmlschema xmlschema-core - ${xmlschema.version} runtime - - org.springframework.boot - spring-boot-starter-artemis - - - - org.apache.activemq - artemis-jakarta-server - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework - spring-test - test - - org.springframework.boot spring-boot-starter-test test - - - org.springframework.boot spring-boot-maven-plugin - org.codehaus.mojo jaxb2-maven-plugin - 3.1.0 xjc @@ -130,11 +101,9 @@ 3.0 - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -150,10 +119,7 @@ - - - diff --git a/echo/client/saaj/pom.xml b/echo/client/saaj/pom.xml index 934ae3f..9a961e0 100644 --- a/echo/client/saaj/pom.xml +++ b/echo/client/saaj/pom.xml @@ -3,21 +3,20 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - echo-client-saaj - 0.0.1-SNAPSHOT Spring Web Services Samples - Echo - Client - SAAJ - Demo project for Spring Web Services - + + org.springframework.boot + spring-boot-starter + org.springframework.boot spring-boot-starter-web-services @@ -28,22 +27,14 @@ - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot spring-boot-maven-plugin - diff --git a/echo/client/spring-ws/pom.xml b/echo/client/spring-ws/pom.xml index 45286fd..eef23a6 100644 --- a/echo/client/spring-ws/pom.xml +++ b/echo/client/spring-ws/pom.xml @@ -3,22 +3,20 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - - org.springframework.ws echo-client-spring-ws - 0.0.1-SNAPSHOT Spring Web Services Samples - Echo - Client - Spring WS - Demo project for Spring Web Services - + + org.springframework.boot + spring-boot-starter + org.springframework.boot spring-boot-starter-web-services @@ -29,22 +27,14 @@ - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot spring-boot-maven-plugin - diff --git a/echo/server/pom.xml b/echo/server/pom.xml index bb066b3..49fa9d2 100644 --- a/echo/server/pom.xml +++ b/echo/server/pom.xml @@ -3,33 +3,26 @@ 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-samples 2.0.0-SNAPSHOT - ../../ + ../../pom.xml - echo-server - 0.0.1-SNAPSHOT Spring Web Services Samples - Echo - Server - Demo project for Spring Web Services ${project.basedir}/target/generated-sources/axis ${project.basedir}/target/classes ${project.basedir}/../airline.wsdl - 2.0.2 - org.springframework.boot spring-boot-starter-web-services - wsdl4j wsdl4j @@ -38,37 +31,25 @@ org.apache.ws.xmlschema xmlschema-core - ${xmlschema.version} runtime - - org.springframework - spring-test - test - - org.springframework.boot spring-boot-starter-test test - - - org.springframework.boot spring-boot-maven-plugin - org.codehaus.mojo jaxb2-maven-plugin - 3.1.0 xjc @@ -83,11 +64,9 @@ 3.0 - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -103,10 +82,7 @@ - - - diff --git a/mtom/client/spring-ws/pom.xml b/mtom/client/spring-ws/pom.xml index 3fb5282..5c84f7d 100644 --- a/mtom/client/spring-ws/pom.xml +++ b/mtom/client/spring-ws/pom.xml @@ -3,26 +3,24 @@ 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-samples 2.0.0-SNAPSHOT - ../../../ + ../../../pom.xml - - org.springframework.ws mtom-client-spring-ws - 0.0.1-SNAPSHOT Spring Web Services Samples - MTOM - Client - Spring WS - Demo project for Spring Web Services ${project.basedir}/../../server/src/main/resources/contentStore.wsdl - + + org.springframework.boot + spring-boot-starter + org.springframework.boot spring-boot-starter-web-services @@ -33,26 +31,17 @@ - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot spring-boot-maven-plugin - com.evolvedbinary.maven.jvnet jaxb30-maven-plugin - 0.15.0 @@ -71,54 +60,9 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -134,7 +78,6 @@ - diff --git a/mtom/server/pom.xml b/mtom/server/pom.xml index f1e6173..21da980 100644 --- a/mtom/server/pom.xml +++ b/mtom/server/pom.xml @@ -3,47 +3,31 @@ 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-samples 2.0.0-SNAPSHOT - ../../ + ../../pom.xml - mtom-server - 0.0.1-SNAPSHOT Spring Web Services Samples - MTOM - Server - Demo project for Spring Web Services - 2.0.2 ${project.basedir}/src/main/resources/contentStore.wsdl - org.springframework.boot spring-boot-starter-web-services - - - wsdl4j - wsdl4j - - org.apache.ws.xmlschema xmlschema-core - ${xmlschema.version} - runtime - - org.springframework - spring-test - test + wsdl4j + wsdl4j @@ -51,22 +35,17 @@ spring-boot-starter-test test - - - org.springframework.boot spring-boot-maven-plugin - com.evolvedbinary.maven.jvnet jaxb30-maven-plugin - 0.15.0 @@ -85,11 +64,9 @@ true - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -105,10 +82,7 @@ - - - diff --git a/pom.xml b/pom.xml index 78b3d03..ed8d816 100644 --- a/pom.xml +++ b/pom.xml @@ -3,53 +3,45 @@ 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.boot spring-boot-starter-parent 3.4.3 - + - org.springframework.ws spring-ws-samples 2.0.0-SNAPSHOT pom - Spring Web Services Samples - - 2019 - + + Broadcom Inc. + https://www.spring.io + Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2020 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 - - http://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. - + https://www.apache.org/licenses/LICENSE-2.0 17 - 3.0.1 - 3.0.0 + ${project.basedir}/target/generated-sources/jaxws ${project.basedir}/target/classes ${project.basedir}/airline/client/airline.wsdl + + 1.4 + 3.1.0 + 0.15.0 + 1.1.6 + 3.0.0 + 3.0.1 + 2.0.6.1 + 3.0.0 + 1.6.3 + 2.2.2 @@ -67,17 +59,71 @@ tutorial - - - - org.springframework.boot - spring-boot-starter-test - test - - - + + + + axis + axis + ${axis.version} + + + com.sun.xml.ws + jaxws-tools + ${jaxws-tools.version} + + + jakarta.jws + jakarta.jws-api + ${jws-api.version} + + + jaxen + jaxen + ${jaxen.version} + + + org.apache.axis + axis-jaxrpc + ${axis.version} + + + org.apache.ws.xmlschema + xmlschema-core + ${xmlschema.version} + + + org.jdom + jdom2 + ${jdom.version} + + + wsdl4j + wsdl4j + ${wsdl4j.version} + + + + + + + com.evolvedbinary.maven.jvnet + jaxb30-maven-plugin + ${jaxb30-maven-plugin.version} + + + com.sun.xml.ws + jaxws-maven-plugin + ${jaxws-maven-plugin.version} + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + org.springframework.boot @@ -86,17 +132,6 @@ - - - snapshots - - 2022.0.1-SNAPSHOT - 6.0.3-SNAPSHOT - 4.0.1-SNAPSHOT - - - - spring-milestones diff --git a/tutorial/pom.xml b/tutorial/pom.xml index c17d50c..7389717 100644 --- a/tutorial/pom.xml +++ b/tutorial/pom.xml @@ -3,95 +3,67 @@ 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-samples 2.0.0-SNAPSHOT - ../ + ../pom.xml - - org.springframework.ws tutorial 0.0.1-SNAPSHOT Spring Web Services Samples - Tutorial - Demo project for Spring Web Services - 1.1.6 - 2.0.6.1 ${project.basedir}/target/generated-sources/axis ${project.basedir}/target/classes ${project.basedir}/../airline.wsdl - 1.6.3 - 2.2.2 - org.springframework.boot spring-boot-starter-web-services - - org.jdom - jdom2 - ${jdom.version} + org.springframework.ws + spring-ws-support - jaxen jaxen - ${jaxen.version} + + + org.jdom + jdom2 org.apache.ws.xmlschema xmlschema-core - ${xmlschema.version} runtime - wsdl4j wsdl4j - ${wsdl4j.version} runtime - - org.springframework.ws - spring-ws-support - - - - org.springframework - spring-test - test - - org.springframework.boot spring-boot-starter-test test - - - org.springframework.boot spring-boot-maven-plugin - org.codehaus.mojo jaxb2-maven-plugin - 3.1.0 xjc @@ -106,11 +78,9 @@ 3.0 - org.codehaus.mojo build-helper-maven-plugin - 1.1 add-source @@ -126,10 +96,7 @@ - - -