Spring/spring-ws-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade samples to better support current Spring Boot + Spring WS.

Browse Source 
* Ensure each module is pointed back at the parent.
* Parent now carries the version of Spring Boot.
* Migrate one Axis JAR file.
* Override Spring Boot's version of Spring WS, ensuring we are buliding against latest snapshot.
* Point Jenkinsfile at Spring WS's main job.
This commit is contained in:
Greg L. Turnquist
2022-03-02 13:16:01 -06:00
parent ff70806b51
commit 8462c9b638
7 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
airline/client/axis1/pom.xml
View File

@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>axis</groupId>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${axis.version}</version>
</dependency>
@@ -48,6 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<dependencies>
<dependency>
<groupId>axis</groupId>

5
airline/client/jax-ws/pom.xml
View File

@@ -20,7 +20,7 @@
<java.version>1.8</java.version>
<jax-ws.version>2.1.7</jax-ws.version>
<log4j2.version>2.15.0</log4j2.version>
<spring-ws.version>2.1.4.RELEASE</spring-ws.version>
<!-- <spring-ws.version>2.1.4.RELEASE</spring-ws.version>-->
<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
<version>${spring-ws.version}</version>
<!-- <version>${spring-ws.version}</version>-->
</dependency>
</dependencies>
@@ -42,6 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<dependencies>
<dependency>
<groupId>com.sun.xml.ws</groupId>

8
airline/server/pom.xml
View File

@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-samples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../../</relativePath> <!-- lookup parent from repository -->
</parent>
<groupId>org.springframework.ws</groupId>

8
echo/server/pom.xml
View File

@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-samples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../../</relativePath> <!-- lookup parent from repository -->
</parent>
<groupId>org.springframework.ws</groupId>

8
mtom/server/pom.xml
View File

@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-samples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../../</relativePath> <!-- lookup parent from repository -->
</parent>
<groupId>org.springframework.ws</groupId>

64
pom.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<version>2.6.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -57,24 +57,64 @@
<module>tutorial</module>
</modules>
<properties>
<spring-ws.version>3.1.3-SNAPSHOT</spring-ws.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
</project>

8
tutorial/pom.xml
View File

@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-samples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../</relativePath> <!-- lookup parent from repository -->
</parent>
<groupId>org.springframework.ws</groupId>