GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update deployment tests POMs 

Update the `spring-boot-deployment-tests` projects to use CI friendly
Maven files.

See gh-9316
pull/10519/head
Phillip Webb 8 years ago
parent
f261cb8f2f
commit
87b2f68c0f
6 changed files with 29 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      spring-boot-tests/spring-boot-deployment-tests/pom.xml
  2. 9
      spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
  3. 9
      spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
  4. 9
      spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
  5. 9
      spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
  6. 9
      spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml

30
spring-boot-tests/spring-boot-deployment-tests/pom.xml
Unescape View File

@ -1,26 +1,21 @@ @@ -1,26 +1,21 @@
<?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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-parent</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-boot-parent</relativePath>
<artifactId>spring-boot-tests</artifactId>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-tests</artifactId>
<packaging>pom</packaging>
<name>Spring Boot Deployment Tests</name>
<description>Spring Boot Deployment Tests</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/..</main.basedir>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
<cargo.timeout>300000</cargo.timeout>
<cargo.container.download-dir>${java.io.tmpdir}/cargo/installs</cargo.container.download-dir>
<cargo.container.download-dir>${settings.localRepository}/.cache/cargo/installs</cargo.container.download-dir>
</properties>
<modules>
<module>spring-boot-deployment-test-glassfish</module>
@ -43,6 +38,10 @@ @@ -43,6 +38,10 @@
<url>${cargo.container.url}</url>
<downloadDir>${cargo.container.download-dir}</downloadDir>
</zipUrlInstaller>
<systemProperties>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<java.net.preferIPv4Addresses>true</java.net.preferIPv4Addresses>
</systemProperties>
</container>
<deployables>
<deployable>
@ -73,5 +72,14 @@ @@ -73,5 +72,14 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

9
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
Unescape View File

@ -4,19 +4,14 @@ @@ -4,19 +4,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-deployment-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-test-glassfish</artifactId>
<packaging>war</packaging>
<name>Spring Boot Glassfish Deployment Test</name>
<description>Spring Boot Glassfish Deployment Test</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<main.basedir>${basedir}/../../..</main.basedir>
<glassfish.version>4.1.1</glassfish.version>
<cargo.container.id>glassfish4x</cargo.container.id>
<cargo.container.url>http://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>

9
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
Unescape View File

@ -4,19 +4,14 @@ @@ -4,19 +4,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-deployment-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-test-tomcat</artifactId>
<packaging>war</packaging>
<name>Spring Boot Tomcat Deployment Test</name>
<description>Spring Boot Tomcat Deployment Test</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<main.basedir>${basedir}/../../..</main.basedir>
<cargo.container.id>tomcat8x</cargo.container.id>
<cargo.container.url>
http://central.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip

9
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
Unescape View File

@ -4,19 +4,14 @@ @@ -4,19 +4,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-deployment-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-test-tomee</artifactId>
<packaging>war</packaging>
<name>Spring Boot TomEE Deployment Test</name>
<description>Spring Boot TomEE Deployment Test</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<main.basedir>${basedir}/../../..</main.basedir>
<tomee.version>7.0.2</tomee.version>
<cargo.container.id>tomee1x</cargo.container.id>
<cargo.container.url>

9
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
Unescape View File

@ -4,19 +4,14 @@ @@ -4,19 +4,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-deployment-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-test-wildfly</artifactId>
<packaging>war</packaging>
<name>Spring Boot WildFly Deployment Test</name>
<description>Spring Boot WildFly Deployment Test</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<main.basedir>${basedir}/../../..</main.basedir>
<wildfly.version>9.0.2.Final</wildfly.version>
<cargo.container.id>wildfly9x</cargo.container.id>
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip

9
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
Unescape View File

@ -4,19 +4,14 @@ @@ -4,19 +4,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-deployment-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>spring-boot-deployment-test-wlp</artifactId>
<packaging>war</packaging>
<name>Spring Boot WebSphere Liberty Profile Deployment Test</name>
<description>Spring Boot WebSphere Liberty Profile Deployment Test</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<main.basedir>${basedir}/../../..</main.basedir>
<wlp.version>16.0.0.4</wlp.version>
<cargo.container.id>liberty</cargo.container.id>
<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>

Write Preview
Loading…
Cancel
Save