From 90e9187b806d6a9edf201ba1d34c17921513a50f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Dec 2014 12:22:57 -0800 Subject: [PATCH] Polish deployment tests --- .../spring-boot-deployment-test-tomcat/pom.xml | 1 - .../test/java/sample/SampleTomcatDeployApplicationIT.java} | 5 ++++- .../spring-boot-deployment-test-tomee/pom.xml | 1 - .../test/java/sample/SampleTomEEDeployApplicationIT.java} | 5 ++++- .../spring-boot-deployment-test-wildfly/pom.xml | 1 - ...tionTestIT.java => SampleWildFlyDeployApplicationIT.java} | 5 ++++- spring-boot-parent/pom.xml | 5 +++++ 7 files changed, 17 insertions(+), 6 deletions(-) rename spring-boot-deployment-tests/{spring-boot-deployment-test-tomee/src/test/java/sample/SampleWildFlyApplicationTestIT.java => spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java} (91%) rename spring-boot-deployment-tests/{spring-boot-deployment-test-tomcat/src/test/java/sample/SampleWildFlyApplicationTestIT.java => spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java} (91%) rename spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/{SampleWildFlyApplicationTestIT.java => SampleWildFlyDeployApplicationIT.java} (91%) diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml index 4a521d1d65..1a557b9c38 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml @@ -60,7 +60,6 @@ org.codehaus.cargo cargo-maven2-plugin - 1.4.11 tomcat8x diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleWildFlyApplicationTestIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java similarity index 91% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleWildFlyApplicationTestIT.java rename to spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java index bf17b5f1a1..d03befe9b2 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleWildFlyApplicationTestIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java @@ -23,7 +23,10 @@ import org.springframework.http.ResponseEntity; import static org.junit.Assert.assertEquals; -public class SampleWildFlyApplicationTestIT { +/** + * Integration Tests for {@link SampleTomcatDeployApplication}. + */ +public class SampleTomcatDeployApplicationIT { private int port = Integer.valueOf(System.getProperty("port")); diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml index c204f514c3..860193adb8 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml @@ -65,7 +65,6 @@ org.codehaus.cargo cargo-maven2-plugin - 1.4.11 tomee1x diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleWildFlyApplicationTestIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java similarity index 91% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleWildFlyApplicationTestIT.java rename to spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java index bf17b5f1a1..50ecb7b6e6 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleWildFlyApplicationTestIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java @@ -23,7 +23,10 @@ import org.springframework.http.ResponseEntity; import static org.junit.Assert.assertEquals; -public class SampleWildFlyApplicationTestIT { +/** + * Integration Tests for {@link SampleTomEEDeployApplication}. + */ +public class SampleTomEEDeployApplicationIT { private int port = Integer.valueOf(System.getProperty("port")); diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml index 4fac6f93d8..142588af10 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml @@ -61,7 +61,6 @@ org.codehaus.cargo cargo-maven2-plugin - 1.4.11 wildfly8x diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java similarity index 91% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java rename to spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java index bf17b5f1a1..23b2800607 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyApplicationTestIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java @@ -23,7 +23,10 @@ import org.springframework.http.ResponseEntity; import static org.junit.Assert.assertEquals; -public class SampleWildFlyApplicationTestIT { +/** + * Integration Tests for {@link SampleWildFlyDeployApplication}. + */ +public class SampleWildFlyDeployApplicationIT { private int port = Integer.valueOf(System.getProperty("port")); diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index 48ccb01a76..823db86f8e 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -268,6 +268,11 @@ maven-site-plugin 3.4 + + org.codehaus.cargo + cargo-maven2-plugin + 1.4.11 + org.codehaus.gmavenplus gmavenplus-plugin