From 44c95865f2003fca2628a750d31f8069fdecfee3 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Fri, 31 Aug 2018 15:57:38 -0500
Subject: [PATCH 1/3] Issue #2878 fix post release javadoc generation

---
 jetty-distribution/pom.xml    | 60 ++++++++++++++++++++++++++---------
 pom.xml                       |  4 +--
 tests/test-quickstart/pom.xml |  2 +-
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index b1623f2f19b..b09b873cb73 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -29,7 +29,7 @@
         <executions>
           <execution>
             <id>copy-base-assembly-tree</id>
-            <phase>process-resources</phase>
+            <phase>package</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
@@ -46,13 +46,42 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <!--
+          The jetty-home artifact is the starting point for the jetty-distribution
+          and must happen early in the build process
+          -->
+          <execution>
+            <id>unpack-jetty-home</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-home</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${home-directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+              <excludes>META-INF/**</excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
             <id>populate distribution from home</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>run</goal>
             </goals>
@@ -66,7 +95,7 @@
           </execution>
           <execution>
             <id>set jetty.sh</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>run</goal>
             </goals>
@@ -78,7 +107,7 @@
           </execution>
           <execution>
             <id>removeKeystore</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>run</goal>
             </goals>
@@ -95,7 +124,7 @@
         <artifactId>maven-remote-resources-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>process</goal>
             </goals>
@@ -115,9 +144,10 @@
           The jetty-home artifact is the starting point for the jetty-distribution
           and must happen early in the build process
           -->
+          <!--
           <execution>
             <id>unpack-jetty-home</id>
-            <phase>generate-resources</phase>
+            <phase>package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -135,10 +165,10 @@
               <excludes>META-INF/**</excludes>
             </configuration>
           </execution>
-
+-->
           <execution>
             <id>copy</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -210,7 +240,7 @@
 
           <execution>
             <id>unpack-test-webapp-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -232,7 +262,7 @@
 
           <execution>
             <id>unpack-test-jaas-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -254,7 +284,7 @@
 
           <execution>
             <id>unpack-test-jndi-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -276,7 +306,7 @@
 
           <execution>
             <id>unpack-test-spec-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -297,7 +327,7 @@
           </execution>
           <execution>
             <id>unpack-documentation</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -326,7 +356,7 @@
           -->
           <execution>
             <id>setup home</id>
-            <phase>process-classes</phase>
+            <phase>package</phase>
             <configuration>
               <mainClass>org.eclipse.jetty.start.Main</mainClass>
               <arguments>
@@ -344,7 +374,7 @@
           -->
           <execution>
             <id>setup demo-base-startd</id>
-            <phase>process-classes</phase>
+            <phase>package</phase>
             <configuration>
               <mainClass>org.eclipse.jetty.start.Main</mainClass>
               <arguments>
diff --git a/pom.xml b/pom.xml
index db5088ebb11..bde08533672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@
             <configuration>
               <!-- list of classes that you want to see in the report.
                    Specify a narrow list of multi-module project
-                   classes you want to see here. 
+                   classes you want to see here.
                    This is useful to remove 3rd party library classes
                    from the report. -->
               <includes>
@@ -1265,7 +1265,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <excludePackageNames>com.acme</excludePackageNames>
+              <excludePackageNames>com.acme,*.jmh</excludePackageNames>
               <links>
                 <link>http://docs.oracle.com/javase/8/docs/api/</link>
                 <link>http://docs.oracle.com/javaee/7/api</link>
diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml
index 3eef2fed485..013d9ca080a 100644
--- a/tests/test-quickstart/pom.xml
+++ b/tests/test-quickstart/pom.xml
@@ -139,7 +139,7 @@
         <executions>
           <execution>
             <id>copy</id>
-            <phase>generate-resources</phase>
+            <phase>package</phase>
             <goals>
               <goal>copy</goal>
             </goals>

From e893dd2546aa04619eeddfdbe74ab978622ea549 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Fri, 31 Aug 2018 16:05:00 -0500
Subject: [PATCH 2/3] update instructions

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bde08533672..be9546c35a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1255,7 +1255,8 @@
     <!--
       Usage:
       Javadoc aggregation for Jetty website
-      > mvn -Paggregate-site clean install javadoc:aggregate -Dtest=foo
+      > mvn clean install -Dtest=foo
+      > mvn -Paggregate-site javadoc:aggregate -Dtest=foo
      -->
     <profile>
       <id>aggregate-site</id>

From 3bea46c03cff030c72d93ceeb1e85fa2f81f7a93 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Fri, 31 Aug 2018 16:22:25 -0500
Subject: [PATCH 3/3] clean out comment

---
 jetty-distribution/pom.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index b09b873cb73..c3fe2a86ae1 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -140,32 +140,6 @@
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <!--
-          The jetty-home artifact is the starting point for the jetty-distribution
-          and must happen early in the build process
-          -->
-          <!--
-          <execution>
-            <id>unpack-jetty-home</id>
-            <phase>package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>jetty-home</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${home-directory}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-              <excludes>META-INF/**</excludes>
-            </configuration>
-          </execution>
--->
           <execution>
             <id>copy</id>
             <phase>prepare-package</phase>