diff --git a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml index 9208f7ecd10..0933746e86a 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml @@ -57,6 +57,7 @@ ${jetty.port.file} true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml index 528b0890f38..2ca1b218e2d 100644 --- a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml @@ -43,6 +43,7 @@ ${jetty.port.file} + ${project.groupId}:${project.artifactId} Bean Validation Webapp example diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml index 168dd7e7b2e..a1d4c8c1ea1 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml @@ -70,6 +70,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml index c8af2120bd4..9ba881556cf 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -70,6 +70,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml index d8514ea74e5..099146ad7e0 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml @@ -73,6 +73,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml index 0d75cad9095..ccb42203249 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml @@ -71,6 +71,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml index 6ab552d13e2..8b6c7257ac4 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml @@ -71,6 +71,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml index feea2dbd628..d807ad4c34f 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml @@ -69,6 +69,7 @@ ${jetty.port.file} true true + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml index eb5310f1eaa..9e6afd3bd7a 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml @@ -74,6 +74,7 @@ ${jetty.port.file} Please enter your name + ${project.groupId}:${project.artifactId} org.eclipse.jetty:jetty-maven-plugin diff --git a/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java index 5c74d08c79f..51495bf8d05 100644 --- a/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java +++ b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java @@ -51,23 +51,24 @@ public class TestGetContent if (Boolean.getBoolean( "helloServlet" )) { String response = httpClient.GET( "http://localhost:" + port + "/hello?name=beer" ).getContentAsString(); - assertEquals( "Hello beer", response.trim() ); + assertEquals( "Hello beer", response.trim(), "it test " + System.getProperty( "maven.it.name" ) ); response = httpClient.GET( "http://localhost:" + port + "/hello?name=foo" ).getContentAsString(); - assertEquals( "Hello foo", response.trim() ); + assertEquals( "Hello foo", response.trim(), "it test " + System.getProperty( "maven.it.name" ) ); System.out.println( "helloServlet" ); } if (Boolean.getBoolean( "pingServlet" )) { - System.out.println( "pingServlet ok" ); - String response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString(); - assertEquals( "pong beer", response.trim() ); System.out.println( "pingServlet" ); + String response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString(); + assertEquals( "pong beer", response.trim(), "it test " + System.getProperty( "maven.it.name" ) ); + System.out.println( "pingServlet ok" ); } String contentCheck = System.getProperty( "contentCheck" ); if(StringUtils.isNotBlank( contentCheck ) ) { String response = httpClient.GET( "http://localhost:" + port ).getContentAsString(); - assertTrue(response.contains(contentCheck), "response not contentCheck: " + contentCheck + ", response:" + response); + assertTrue(response.contains(contentCheck), "it test " + System.getProperty( "maven.it.name" ) + + ", response not contentCheck: " + contentCheck + ", response:" + response); System.out.println( "contentCheck" ); } }