Merge branch 'jetty-9.4.x' into jetty-10.0.x

jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml

@@ -57,6 +57,7 @@
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml

@@ -43,6 +43,7 @@
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
             <contentCheck>Bean Validation Webapp example</contentCheck>
           </systemPropertyVariables>
           <dependenciesToScan>

jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml

@@ -70,6 +70,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml

@@ -70,6 +70,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml

@@ -73,6 +73,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml

@@ -71,6 +71,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml

@@ -71,6 +71,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml

@@ -69,6 +69,7 @@
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <pingServlet>true</pingServlet>
             <helloServlet>true</helloServlet>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml

@@ -74,6 +74,7 @@
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
             <contentCheck>Please enter your name</contentCheck>
+            <maven.it.name>${project.groupId}:${project.artifactId}</maven.it.name>
           </systemPropertyVariables>
           <dependenciesToScan>
             <dependency>org.eclipse.jetty:jetty-maven-plugin</dependency>

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" );
             }
         }