restore testing of jetty-runner-eeX

Signed-off-by: Olivier Lamy <[email protected]>
jetty · Apr 12, 2024 · 5293296 · 5293296
1 parent 0bfcee2
commit 5293296
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 67 deletions.
diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml
@@ -136,8 +136,7 @@
           </execution>
         </executions>
       </plugin>
-      <!-- TODO -->
-      <!-- plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
         <executions>
@@ -163,7 +162,7 @@
             <goal>clean</goal>
           </goals>
         </configuration>
-      </plugin -->
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner-ee10-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 

diff --git a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner-ee10-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 

diff --git a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test</artifactId>
+  <artifactId>jetty-runner-ee10-it-test</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 

diff --git a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy
@@ -8,4 +8,4 @@ JarFile jar = new JarFile( artifact );
 
 Attributes manifest = jar.getManifest().getMainAttributes();
 
-assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.runner.Runner" )
+assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee10.runner.Runner" )
diff --git a/jetty-ee8/jetty-ee8-runner/pom.xml b/jetty-ee8/jetty-ee8-runner/pom.xml
@@ -7,7 +7,7 @@
     <version>12.0.9-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-ee8-runner</artifactId>
-  <name>ee8 :: Runner</name>
+  <name>EE8 :: Runner</name>
 
   <properties>
     <assembly-directory>target/distribution</assembly-directory>
@@ -128,45 +128,45 @@
           </execution>
         </executions>
       </plugin>
+      <!-- TODO -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <configuration>
+          <debug>${it.debug}</debug>
+          <addTestClassPath>true</addTestClassPath>
+          <scriptVariables>
+            <maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
+            <maven.surefire.plugin.version>${maven.surefire.plugin.version}</maven.surefire.plugin.version>
+            <hamcrest.version>${hamcrest.version}</hamcrest.version>
+          </scriptVariables>
+          <goals>
+            <goal>clean</goal>
+          </goals>
+        </configuration>
         <executions>
           <execution>
+            <id>integration-test</id>
             <goals>
-              <goal>test-jar</goal>
+              <goal>install</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
             </goals>
+            <phase>integration-test</phase>
           </execution>
         </executions>
       </plugin>
-      <!-- TODO -->
-      <!--plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <id>integration-test</id>
-            <phase>integration-test</phase>
             <goals>
-              <goal>install</goal>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
+              <goal>test-jar</goal>
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <debug>${it.debug}</debug>
-          <addTestClassPath>true</addTestClassPath>
-          <scriptVariables>
-            <maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
-            <maven.surefire.plugin.version>${maven.surefire.plugin.version}</maven.surefire.plugin.version>
-            <hamcrest.version>${hamcrest.version}</hamcrest.version>
-          </scriptVariables>
-          <goals>
-            <goal>clean</goal>
-          </goals>
-        </configuration>
-      </plugin-->
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner-ee8-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
@@ -15,21 +15,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-runner</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-runner</artifactId>
       <version>@project.version@</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-runner</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-runner</artifactId>
       <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9.demos</groupId>
-      <artifactId>jetty-ee9-demo-simple-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee8.demos</groupId>
+      <artifactId>jetty-ee8-demo-simple-webapp</artifactId>
       <version>@project.version@</version>
       <type>war</type>
     </dependency>
@@ -64,17 +64,17 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.ee9</groupId>
-                  <artifactId>jetty-ee9-runner</artifactId>
+                  <groupId>org.eclipse.jetty.ee8</groupId>
+                  <artifactId>jetty-ee8-runner</artifactId>
                   <version>@project.version@</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/</outputDirectory>
                   <destFileName>jetty-runner.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.ee9.demos</groupId>
-                  <artifactId>jetty-ee9-demo-simple-webapp</artifactId>
+                  <groupId>org.eclipse.jetty.ee8.demos</groupId>
+                  <artifactId>jetty-ee8-demo-simple-webapp</artifactId>
                   <version>@project.version@</version>
                   <type>war</type>
                   <overWrite>false</overWrite>
@@ -130,7 +130,7 @@
           <systemPropertyVariables>
           </systemPropertyVariables>
           <dependenciesToScan>
-            <dependency>org.eclipse.jetty.ee9:jetty-ee9-runner</dependency>
+            <dependency>org.eclipse.jetty.ee8:jetty-ee8-runner</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner-ee8-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
@@ -15,21 +15,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-runner</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-runner</artifactId>
       <version>@project.version@</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-runner</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-runner</artifactId>
       <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9.demos</groupId>
-      <artifactId>jetty-ee9-demo-simple-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee8.demos</groupId>
+      <artifactId>jetty-ee8-demo-simple-webapp</artifactId>
       <version>@project.version@</version>
       <type>war</type>
     </dependency>
@@ -64,17 +64,17 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.ee9</groupId>
-                  <artifactId>jetty-ee9-runner</artifactId>
+                  <groupId>org.eclipse.jetty.ee8</groupId>
+                  <artifactId>jetty-ee8-runner</artifactId>
                   <version>@project.version@</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/</outputDirectory>
                   <destFileName>jetty-runner.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.ee9.demos</groupId>
-                  <artifactId>jetty-ee9-demo-simple-webapp</artifactId>
+                  <groupId>org.eclipse.jetty.ee8.demos</groupId>
+                  <artifactId>jetty-ee8-demo-simple-webapp</artifactId>
                   <version>@project.version@</version>
                   <type>war</type>
                   <overWrite>false</overWrite>
@@ -130,7 +130,7 @@
           <systemPropertyVariables>
           </systemPropertyVariables>
           <dependenciesToScan>
-            <dependency>org.eclipse.jetty.ee9:jetty-ee9-runner</dependency>
+            <dependency>org.eclipse.jetty.ee8:jetty-ee8-runner</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test</artifactId>
+  <artifactId>jetty-runner-ee8-it-test</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
@@ -15,8 +15,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-runner</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-runner</artifactId>
       <version>@project.version@</version>
     </dependency>
   </dependencies>
@@ -38,8 +38,8 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.ee9</groupId>
-                  <artifactId>jetty-ee9-runner</artifactId>
+                  <groupId>org.eclipse.jetty.ee8</groupId>
+                  <artifactId>jetty-ee8-runner</artifactId>
                   <version>@project.version@</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>

diff --git a/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy
@@ -8,4 +8,4 @@ JarFile jar = new JarFile( artifact );
 
 Attributes manifest = jar.getManifest().getMainAttributes();
 
-assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee9.runner.Runner" )
+assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee8.runner.Runner" )
diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml
@@ -138,8 +138,7 @@
           </execution>
         </executions>
       </plugin>
-      <!-- TODO -->
-      <!--plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
         <executions>
@@ -165,7 +164,7 @@
             <goal>clean</goal>
           </goals>
         </configuration>
-      </plugin-->
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner-ee9-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 

diff --git a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
+  <artifactId>jetty-runner=ee9-it-test-demo-simple-webapp</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 

diff --git a/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.its</groupId>
-  <artifactId>jetty-runner-it-test</artifactId>
+  <artifactId>jetty-runner-ee9-it-test</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ JarFile jar = new JarFile( artifact );

		Attributes manifest = jar.getManifest().getMainAttributes();

		assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.runner.Runner" )
		assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee10.runner.Runner" )