Skip to content

Commit 87b2f68

Browse files
philwebbphilwebb
committed
Update deployment tests POMs
Update the `spring-boot-deployment-tests` projects to use CI friendly Maven files. See gh-9316
1 parent f261cb8 commit 87b2f68

File tree

6 files changed

+29
-46
lines changed
  • spring-boot-tests/spring-boot-deployment-tests
    • pom.xml
    • spring-boot-deployment-test-glassfish
    • spring-boot-deployment-test-tomcat
    • spring-boot-deployment-test-tomee
    • spring-boot-deployment-test-wildfly
    • spring-boot-deployment-test-wlp

6 files changed

+29
-46
lines changed

‎spring-boot-tests/spring-boot-deployment-tests/pom.xml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
6-
<artifactId>spring-boot-parent</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
8-
<relativePath>../spring-boot-parent</relativePath>
7+
<artifactId>spring-boot-tests</artifactId>
8+
<version>${revision}</version>
99
</parent>
1010
<artifactId>spring-boot-deployment-tests</artifactId>
1111
<packaging>pom</packaging>
1212
<name>Spring Boot Deployment Tests</name>
1313
<description>Spring Boot Deployment Tests</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1914
<properties>
20-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2116
<java.version>1.7</java.version>
2217
<cargo.timeout>300000</cargo.timeout>
23-
<cargo.container.download-dir>${java.io.tmpdir}/cargo/installs</cargo.container.download-dir>
18+
<cargo.container.download-dir>${settings.localRepository}/.cache/cargo/installs</cargo.container.download-dir>
2419
</properties>
2520
<modules>
2621
<module>spring-boot-deployment-test-glassfish</module>
@@ -43,6 +38,10 @@
4338
<url>${cargo.container.url}</url>
4439
<downloadDir>${cargo.container.download-dir}</downloadDir>
4540
</zipUrlInstaller>
41+
<systemProperties>
42+
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
43+
<java.net.preferIPv4Addresses>true</java.net.preferIPv4Addresses>
44+
</systemProperties>
4645
</container>
4746
<deployables>
4847
<deployable>
@@ -73,5 +72,14 @@
7372
</plugin>
7473
</plugins>
7574
</pluginManagement>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-install-plugin</artifactId>
79+
<configuration>
80+
<skip>true</skip>
81+
</configuration>
82+
</plugin>
83+
</plugins>
7684
</build>
7785
</project>

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-deployment-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-deployment-test-glassfish</artifactId>
1010
<packaging>war</packaging>
1111
<name>Spring Boot Glassfish Deployment Test</name>
1212
<description>Spring Boot Glassfish Deployment Test</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<glassfish.version>4.1.1</glassfish.version>
2116
<cargo.container.id>glassfish4x</cargo.container.id>
2217
<cargo.container.url>http://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-deployment-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-deployment-test-tomcat</artifactId>
1010
<packaging>war</packaging>
1111
<name>Spring Boot Tomcat Deployment Test</name>
1212
<description>Spring Boot Tomcat Deployment Test</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<cargo.container.id>tomcat8x</cargo.container.id>
2116
<cargo.container.url>
2217
http://central.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-deployment-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-deployment-test-tomee</artifactId>
1010
<packaging>war</packaging>
1111
<name>Spring Boot TomEE Deployment Test</name>
1212
<description>Spring Boot TomEE Deployment Test</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<tomee.version>7.0.2</tomee.version>
2116
<cargo.container.id>tomee1x</cargo.container.id>
2217
<cargo.container.url>

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-deployment-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-deployment-test-wildfly</artifactId>
1010
<packaging>war</packaging>
1111
<name>Spring Boot WildFly Deployment Test</name>
1212
<description>Spring Boot WildFly Deployment Test</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<wildfly.version>9.0.2.Final</wildfly.version>
2116
<cargo.container.id>wildfly9x</cargo.container.id>
2217
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-deployment-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-deployment-test-wlp</artifactId>
1010
<packaging>war</packaging>
1111
<name>Spring Boot WebSphere Liberty Profile Deployment Test</name>
1212
<description>Spring Boot WebSphere Liberty Profile Deployment Test</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<wlp.version>16.0.0.4</wlp.version>
2116
<cargo.container.id>liberty</cargo.container.id>
2217
<cargo.container.url>http://central.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-webProfile7/${wlp.version}/wlp-webProfile7-${wlp.version}.zip</cargo.container.url>

0 commit comments

Comments
 (0)