mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.2.x'
Conflicts: spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
This commit is contained in:
Stephane Nicoll
commit
817111c6d3
@ -19,10 +19,60 @@
|
||||
<properties>
|
||||
<main.basedir>${basedir}/..</main.basedir>
|
||||
<java.version>1.7</java.version>
|
||||
|
||||
<cargo.timeout>300000</cargo.timeout>
|
||||
<cargo.container.download-dir>${user.home}/.cargo/installs</cargo.container.download-dir>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>spring-boot-deployment-test-tomee</module>
|
||||
<module>spring-boot-deployment-test-tomcat</module>
|
||||
<module>spring-boot-deployment-test-wildfly</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.cargo</groupId>
|
||||
<artifactId>cargo-maven2-plugin</artifactId>
|
||||
<configuration>
|
||||
<container>
|
||||
<containerId>${cargo.container.id}</containerId>
|
||||
<timeout>${cargo.timeout}</timeout>
|
||||
<zipUrlInstaller>
|
||||
<url>${cargo.container.url}</url>
|
||||
<downloadDir>${cargo.container.download-dir}</downloadDir>
|
||||
</zipUrlInstaller>
|
||||
</container>
|
||||
<deployables>
|
||||
<deployable>
|
||||
<properties>
|
||||
<context>/bootapp</context>
|
||||
</properties>
|
||||
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
|
||||
<pingTimeout>30000</pingTimeout>
|
||||
</deployable>
|
||||
</deployables>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-cargo</id>
|
||||
<phase>pre-integration-test</phase>
|
||||
<goals>
|
||||
<goal>start</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>stop-cargo</id>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>stop</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@ -17,6 +17,10 @@
|
||||
</organization>
|
||||
<properties>
|
||||
<main.basedir>${basedir}/../..</main.basedir>
|
||||
<cargo.container.id>tomcat8x</cargo.container.id>
|
||||
<cargo.container.url>
|
||||
http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
|
||||
</cargo.container.url>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@ -60,45 +64,13 @@
|
||||
<groupId>org.codehaus.cargo</groupId>
|
||||
<artifactId>cargo-maven2-plugin</artifactId>
|
||||
<configuration>
|
||||
<container>
|
||||
<containerId>tomcat8x</containerId>
|
||||
<timeout>300000</timeout>
|
||||
<zipUrlInstaller>
|
||||
<url>http://www.us.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
|
||||
</zipUrlInstaller>
|
||||
</container>
|
||||
<configuration>
|
||||
<properties>
|
||||
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
|
||||
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
|
||||
</properties>
|
||||
</configuration>
|
||||
<deployables>
|
||||
<deployable>
|
||||
<properties>
|
||||
<context>/bootapp</context>
|
||||
</properties>
|
||||
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
|
||||
<pingTimeout>30000</pingTimeout>
|
||||
</deployable>
|
||||
</deployables>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-cargo</id>
|
||||
<phase>pre-integration-test</phase>
|
||||
<goals>
|
||||
<goal>start</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>stop-cargo</id>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>stop</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
||||
@ -18,6 +18,10 @@
|
||||
<properties>
|
||||
<main.basedir>${basedir}/../..</main.basedir>
|
||||
<tomee.version>1.7.1</tomee.version>
|
||||
<cargo.container.id>tomee1x</cargo.container.id>
|
||||
<cargo.container.url>
|
||||
http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip
|
||||
</cargo.container.url>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@ -65,45 +69,13 @@
|
||||
<groupId>org.codehaus.cargo</groupId>
|
||||
<artifactId>cargo-maven2-plugin</artifactId>
|
||||
<configuration>
|
||||
<container>
|
||||
<containerId>tomee1x</containerId>
|
||||
<timeout>300000</timeout>
|
||||
<zipUrlInstaller>
|
||||
<url>http://www.us.apache.org/dist/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip</url>
|
||||
</zipUrlInstaller>
|
||||
</container>
|
||||
<configuration>
|
||||
<properties>
|
||||
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
|
||||
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
|
||||
</properties>
|
||||
</configuration>
|
||||
<deployables>
|
||||
<deployable>
|
||||
<properties>
|
||||
<context>/bootapp</context>
|
||||
</properties>
|
||||
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
|
||||
<pingTimeout>30000</pingTimeout>
|
||||
</deployable>
|
||||
</deployables>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-cargo</id>
|
||||
<phase>pre-integration-test</phase>
|
||||
<goals>
|
||||
<goal>start</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>stop-cargo</id>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>stop</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
||||
@ -18,6 +18,9 @@
|
||||
<properties>
|
||||
<main.basedir>${basedir}/../..</main.basedir>
|
||||
<wildfly.version>8.2.0.Final</wildfly.version>
|
||||
<cargo.container.id>wildfly8x</cargo.container.id>
|
||||
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
|
||||
</cargo.container.url>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@ -62,13 +65,6 @@
|
||||
<groupId>org.codehaus.cargo</groupId>
|
||||
<artifactId>cargo-maven2-plugin</artifactId>
|
||||
<configuration>
|
||||
<container>
|
||||
<containerId>wildfly8x</containerId>
|
||||
<timeout>300000</timeout>
|
||||
<zipUrlInstaller>
|
||||
<url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</url>
|
||||
</zipUrlInstaller>
|
||||
</container>
|
||||
<configuration>
|
||||
<properties>
|
||||
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
|
||||
@ -79,32 +75,7 @@
|
||||
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
|
||||
</properties>
|
||||
</configuration>
|
||||
<deployables>
|
||||
<deployable>
|
||||
<properties>
|
||||
<context>/bootapp</context>
|
||||
</properties>
|
||||
<pingURL>http://localhost:${appserver.port}/bootapp</pingURL>
|
||||
<pingTimeout>30000</pingTimeout>
|
||||
</deployable>
|
||||
</deployables>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>start-cargo</id>
|
||||
<phase>pre-integration-test</phase>
|
||||
<goals>
|
||||
<goal>start</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>stop-cargo</id>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>stop</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user