From 027a91d2249a7e1d3b141d7b34c156ad90fef4bc Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Tue, 15 Jan 2019 21:20:46 +1000
Subject: [PATCH 1/4] maven assembly plugin 3.1.1

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

diff --git a/pom.xml b/pom.xml
index b076bf9c3e1..856e84c644c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,7 +429,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.1</version>
           <dependencies>
             <dependency>
               <groupId>org.eclipse.jetty.toolchain</groupId>

From 2fc6185c29fa9922b1a9b7037acae2e8944166ae Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 4 Jan 2019 09:36:53 +1100
Subject: [PATCH 2/4] Issue #3236 - fixed CustomRequestLogTest failure when
 JAVA_HOME not set

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../eclipse/jetty/server/handler/CustomRequestLogTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CustomRequestLogTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CustomRequestLogTest.java
index c53f332cfb6..c07664b2678 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CustomRequestLogTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CustomRequestLogTest.java
@@ -30,7 +30,6 @@ import java.util.Enumeration;
 import java.util.Locale;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
@@ -254,7 +253,9 @@ public class CustomRequestLogTest
 
         _connector.getResponse("GET / HTTP/1.0\n\n");
         String log = _entries.poll(5,TimeUnit.SECONDS);
-        assertThat(log, is("EnvironmentVar: " + System.getenv("JAVA_HOME") + ""));
+
+        String envVar = System.getenv("JAVA_HOME");
+        assertThat(log, is("EnvironmentVar: " + ((envVar==null) ? "-" : envVar)));
     }
 
     @Test

From cdd553332c1e9f4d63ec2d0242761f61a4ea8007 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 16 Jan 2019 17:03:51 +0100
Subject: [PATCH 3/4] Updated ALPN version for JDK 8u201 and 8u202.

---
 .../modules/protonego-impl/alpn-1.8.0_201.mod |  8 +++++++
 .../modules/protonego-impl/alpn-1.8.0_202.mod |  8 +++++++
 .../modules/protonego-impl/alpn-1.8.0_201.mod |  8 +++++++
 .../modules/protonego-impl/alpn-1.8.0_202.mod |  8 +++++++
 pom.xml                                       | 24 +++++++++++++++++++
 5 files changed, 56 insertions(+)
 create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_201.mod
 create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_202.mod
 create mode 100644 jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_201.mod
 create mode 100644 jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_202.mod

diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_201.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_201.mod
new file mode 100644
index 00000000000..d49c0780441
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_201.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_202.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_202.mod
new file mode 100644
index 00000000000..d49c0780441
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_202.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_201.mod b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_201.mod
new file mode 100644
index 00000000000..d49c0780441
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_201.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_202.mod b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_202.mod
new file mode 100644
index 00000000000..d49c0780441
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_202.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/pom.xml b/pom.xml
index 89c6c980d6e..c63e82abd8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1540,6 +1540,30 @@
         <alpn.version>8.1.13.v20181017</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u201</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_201</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.13.v20181017</alpn.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>8u202</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_202</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.13.v20181017</alpn.version>
+      </properties>
+    </profile>
   </profiles>
 
   <pluginRepositories>

From 766e088109a81cd6c8f5475deb9e1488c8ee008b Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 17 Jan 2019 15:24:07 +1000
Subject: [PATCH 4/4] Issue #3241 Jetty runner add missing Main-Class in
 MANIFEST (#3260)

* Issue #3241 no Main Class attribute in MANIFEST for jetty-runner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-runner/pom.xml                          | 66 +++++++++++++++----
 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 +
 6 files changed, 164 insertions(+), 13 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-runner/pom.xml b/jetty-runner/pom.xml
index 56965268c9e..f1e76be68dd 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -11,8 +11,9 @@
  <properties>
     <assembly-directory>target/distribution</assembly-directory>
     <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
+   <it.debug>false</it.debug>
   </properties>
-  <url>http://www.eclipse.org/jetty</url>
+
   <build>
     <plugins>
       <plugin>
@@ -35,21 +36,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 +81,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 00000000000..d64bdb89034
--- /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 00000000000..86f8ef2b751
--- /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 00000000000..b5fbdd16132
--- /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 00000000000..da1a6d99e3c
--- /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 00000000000..fa816753df9
--- /dev/null
+++ b/jetty-runner/src/main/resources/MANIFEST.MF
@@ -0,0 +1 @@
+Comment: Jetty Runner