From 2295849418aceccc4f4b6407fd2cb9b1ae3d8aeb Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Wed, 9 Jan 2019 22:13:42 +1300
Subject: [PATCH 1/3] Issue #3241 no Main Class attribute in MANIFEST for
 jetty-runner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-jspc-maven-plugin/pom.xml               |  1 -
 jetty-maven-plugin/pom.xml                    |  1 -
 jetty-runner/pom.xml                          | 65 +++++++++++++++----
 jetty-runner/src/it/settings.xml              | 36 ++++++++++
 .../it/test-jar-manifest/invoker.properties   |  1 +
 jetty-runner/src/it/test-jar-manifest/pom.xml | 63 ++++++++++++++++++
 .../src/it/test-jar-manifest/postbuild.groovy | 10 +++
 jetty-runner/src/main/resources/MANIFEST.MF   |  1 +
 pom.xml                                       |  1 +
 9 files changed, 164 insertions(+), 15 deletions(-)
 create mode 100644 jetty-runner/src/it/settings.xml
 create mode 100644 jetty-runner/src/it/test-jar-manifest/invoker.properties
 create mode 100644 jetty-runner/src/it/test-jar-manifest/pom.xml
 create mode 100644 jetty-runner/src/it/test-jar-manifest/postbuild.groovy
 create mode 100644 jetty-runner/src/main/resources/MANIFEST.MF

diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index e95566fddf46..2f6e94ceec47 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -10,7 +10,6 @@
   <name>Jetty :: Jetty JSPC Maven Plugin</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
-    <it.debug>false</it.debug>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 9635cf2df76b..db80132ebc35 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -11,7 +11,6 @@
   <description>Jetty maven plugins</description>
   <properties>
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
-    <it.debug>false</it.debug>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
     <jetty.jvmArgs></jetty.jvmArgs>
   </properties>
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 56965268c9e7..6e53fb9a4f46 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -12,7 +12,7 @@
     <assembly-directory>target/distribution</assembly-directory>
     <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
   </properties>
-  <url>http://www.eclipse.org/jetty</url>
+
   <build>
     <plugins>
       <plugin>
@@ -35,21 +35,38 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <configuration>
-            <!-- jetty-runner is not an OSGi component -->
-            <skip>true</skip>
-          </configuration>
-        </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>install</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
         <configuration>
-         <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-         </archive>
+          <javaHome>${java.home}</javaHome>
+          <environmentVariables>
+            <JAVA_HOME>${java.home}</JAVA_HOME>
+          </environmentVariables>
+          <debug>${it.debug}</debug>
+          <projectsDirectory>src/it</projectsDirectory>
+          <timeoutInSeconds>600</timeoutInSeconds>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <skipInvocation>${skipTests}</skipInvocation>
+          <scriptVariables>
+            <maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
+          </scriptVariables>
+          <goals>
+            <goal>clean</goal>
+          </goals>
         </configuration>
       </plugin>
     </plugins>
@@ -63,6 +80,28 @@
             <skip>true</skip>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <configuration>
+            <!-- jetty-runner is not an OSGi component -->
+            <skip>true</skip>
+            <!-- there is no way to skip MANIFEST creation by the plugin so just configure dummy location -->
+            <manifestLocation>${project.build.directory}/NON_USED_MANIFEST</manifestLocation>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifestFile>src/main/resources/MANIFEST.MF</manifestFile>
+              <manifest>
+                <mainClass>org.eclipse.jetty.runner.Runner</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/jetty-runner/src/it/settings.xml b/jetty-runner/src/it/settings.xml
new file mode 100644
index 000000000000..d64bdb89034a
--- /dev/null
+++ b/jetty-runner/src/it/settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>
diff --git a/jetty-runner/src/it/test-jar-manifest/invoker.properties b/jetty-runner/src/it/test-jar-manifest/invoker.properties
new file mode 100644
index 000000000000..86f8ef2b7513
--- /dev/null
+++ b/jetty-runner/src/it/test-jar-manifest/invoker.properties
@@ -0,0 +1 @@
+invoker.goals = generate-resources
diff --git a/jetty-runner/src/it/test-jar-manifest/pom.xml b/jetty-runner/src/it/test-jar-manifest/pom.xml
new file mode 100644
index 000000000000..b5fbdd161328
--- /dev/null
+++ b/jetty-runner/src/it/test-jar-manifest/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+
+
+  <groupId>org.eclipse.jetty.its</groupId>
+  <artifactId>jetty-runner-it-test</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-runner</artifactId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>@maven.dependency.plugin.version@</version>
+        <executions>
+          <execution>
+            <id>copy-jetty-runner</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-runner</artifactId>
+                  <version>@project.version@</version>
+                  <type>jar</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/</outputDirectory>
+                  <destFileName>jetty-runner.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+  </build>
+</project>
diff --git a/jetty-runner/src/it/test-jar-manifest/postbuild.groovy b/jetty-runner/src/it/test-jar-manifest/postbuild.groovy
new file mode 100644
index 000000000000..da1a6d99e3cc
--- /dev/null
+++ b/jetty-runner/src/it/test-jar-manifest/postbuild.groovy
@@ -0,0 +1,10 @@
+import java.util.jar.*
+
+File artifact = new File( basedir, "target/jetty-runner.jar" )
+assert artifact.exists()
+
+JarFile jar = new JarFile( artifact );
+
+Attributes manifest = jar.getManifest().getMainAttributes();
+
+assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.runner.Runner" )
diff --git a/jetty-runner/src/main/resources/MANIFEST.MF b/jetty-runner/src/main/resources/MANIFEST.MF
new file mode 100644
index 000000000000..fa816753df97
--- /dev/null
+++ b/jetty-runner/src/main/resources/MANIFEST.MF
@@ -0,0 +1 @@
+Comment: Jetty Runner
diff --git a/pom.xml b/pom.xml
index 29e7d0c597d4..b9146d39ce77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
     <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
     <maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
 
+    <it.debug>false</it.debug>
     <!-- testing -->
     <jetty.test.version>5.2</jetty.test.version>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>

From 23b13d96fcd7fa9c802a49c25a5f64b39f8005d0 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Thu, 17 Jan 2019 11:52:56 +1000
Subject: [PATCH 2/3] restore original copy, cleanup will be done in separate
 pr

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-jspc-maven-plugin/pom.xml | 1 +
 jetty-maven-plugin/pom.xml      | 1 +
 jetty-runner/pom.xml            | 1 +
 pom.xml                         | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 2f6e94ceec47..e95566fddf46 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -10,6 +10,7 @@
   <name>Jetty :: Jetty JSPC Maven Plugin</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
+    <it.debug>false</it.debug>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index db80132ebc35..288ac40c3057 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -13,6 +13,7 @@
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
     <jetty.jvmArgs></jetty.jvmArgs>
+    <it.debug>false</it.debug>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 6e53fb9a4f46..f1e76be68dd7 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -11,6 +11,7 @@
  <properties>
     <assembly-directory>target/distribution</assembly-directory>
     <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
+   <it.debug>false</it.debug>
   </properties>
 
   <build>
diff --git a/pom.xml b/pom.xml
index b9146d39ce77..29e7d0c597d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
     <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
     <maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
 
-    <it.debug>false</it.debug>
     <!-- testing -->
     <jetty.test.version>5.2</jetty.test.version>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>

From 22fdfc6a6ed358ffd2483ea3e738b131d8af9c71 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Thu, 17 Jan 2019 11:53:43 +1000
Subject: [PATCH 3/3] restore original copy, cleanup will be done in separate
 pr

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 288ac40c3057..9635cf2df76b 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -11,9 +11,9 @@
   <description>Jetty maven plugins</description>
   <properties>
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
+    <it.debug>false</it.debug>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
     <jetty.jvmArgs></jetty.jvmArgs>
-    <it.debug>false</it.debug>
   </properties>
   <build>
     <plugins>