diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index b1623f2f19b..c3fe2a86ae1 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,68 +46,6 @@
           </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>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <copy todir="${assembly-directory}">
-                  <fileset dir="${home-directory}/jetty-home-${project.version}/" />
-                </copy>
-              </tasks>
-            </configuration>
-          </execution>
-          <execution>
-            <id>set jetty.sh</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
-              </tasks>
-            </configuration>
-          </execution>
-          <execution>
-            <id>removeKeystore</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <delete file="${assembly-directory}/etc/keystore" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <resourceBundles>
-                <resourceBundle>org.eclipse.jetty.toolchain:jetty-distribution-remote-resources:1.2</resourceBundle>
-              </resourceBundles>
-              <outputDirectory>${assembly-directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -117,7 +55,7 @@
           -->
           <execution>
             <id>unpack-jetty-home</id>
-            <phase>generate-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -135,10 +73,76 @@
               <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>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy todir="${assembly-directory}">
+                  <fileset dir="${home-directory}/jetty-home-${project.version}/" />
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
+          <execution>
+            <id>set jetty.sh</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
+              </tasks>
+            </configuration>
+          </execution>
+          <execution>
+            <id>removeKeystore</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <delete file="${assembly-directory}/etc/keystore" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.eclipse.jetty.toolchain:jetty-distribution-remote-resources:1.2</resourceBundle>
+              </resourceBundles>
+              <outputDirectory>${assembly-directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
           <execution>
             <id>copy</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -210,7 +214,7 @@
 
           <execution>
             <id>unpack-test-webapp-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -232,7 +236,7 @@
 
           <execution>
             <id>unpack-test-jaas-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -254,7 +258,7 @@
 
           <execution>
             <id>unpack-test-jndi-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -276,7 +280,7 @@
 
           <execution>
             <id>unpack-test-spec-config</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -297,7 +301,7 @@
           </execution>
           <execution>
             <id>unpack-documentation</id>
-            <phase>process-resources</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
@@ -326,7 +330,7 @@
           -->
           <execution>
             <id>setup home</id>
-            <phase>process-classes</phase>
+            <phase>package</phase>
             <configuration>
               <mainClass>org.eclipse.jetty.start.Main</mainClass>
               <arguments>
@@ -344,7 +348,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 611b9b79506..f6644b43268 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>
@@ -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>
@@ -1265,7 +1266,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>