document addition resolution groups, fix javadoc, upgrade parent

its/core-it-suite/src/site/apt/bootstrap.apt.vm

@@ -64,3 +64,27 @@ Maven Core Integration Tests Bootstrap
 * Group 7 Dependencies
 
 %{snippet|file=${project.build.directory}/test-classes/bootstrap/group-7/target/resolve.txt}
+
+* Group 8 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-8/target/resolve.txt}
+
+* Group 9 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-9/target/resolve.txt}
+
+* Group 10 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-10/target/resolve.txt}
+
+* Group 11 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-11/target/resolve.txt}
+
+* Group 12 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-12/target/resolve.txt}
+
+* Group 13 Dependencies
+
+%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-13/target/resolve.txt}

its/core-it-suite/src/test/resources/bootstrap/pom.xml

@@ -104,6 +104,11 @@ under the License.
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.1.0</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-wrapper-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java

@@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -75,7 +74,7 @@ public class CheckThreadSafetyMojo
     /**
      * Runs this mojo.
      *
-     * @throws MojoFailureException If the output file could not be created.
+     * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
         throws MojoExecutionException

its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java

@@ -26,7 +26,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -94,7 +93,7 @@ public class ResolveMojo
     /**
      * Runs this mojo.
      *
-     * @throws MojoFailureException If the artifact could not be resolved
+     * @throws MojoExecutionException If the artifact could not be resolved
      */
     public void execute()
         throws MojoExecutionException

its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java

@@ -36,7 +36,7 @@ import java.util.Properties;
  * value but can also be a collection/array or a bean-like object (from the Maven model). For example, the expression
  * "project/dependencies/0" would extract the first project dependency. In more detail, this example expression could
  * output the following keys to the properties file:
- * <p/>
+ *
  * <pre>
  * project.dependencies.0.groupId = org.apache.maven
  * project.dependencies.0.artifactId = maven-project
@@ -49,7 +49,7 @@ import java.util.Properties;
  * project.dependencies.0.exclusions.1.groupId = plexus
  * project.dependencies.0.exclusions.1.artifactId = plexus-container-default
  * </pre>
- * <p/>
+ *
  * Expressions that reference non-existing objects or use invalid collection/array indices silently resolve to
  * <code>null</code>. For collections and arrays, the special index "*" can be used to iterate all elements.
  *

its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java

@@ -29,7 +29,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * Resolves an artifact and has an (unused) dependency on log4j.
@@ -86,7 +85,7 @@ public class ItMojo
      * Runs this mojo.
      *
      * @throws MojoExecutionException If the output file could not be created.
-     * @throws MojoFailureException If the output file has not been set.
+     * or if the output file has not been set.
      */
     public void execute()
         throws MojoExecutionException

its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java

@@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 
 import java.io.File;
@@ -63,7 +62,7 @@ public class BuildLocalPomMojo
     /**
      * Runs this mojo.
      *
-     * @throws MojoFailureException If the artifact file has not been set.
+     * @throws MojoExecutionException If the artifact file has not been set.
      */
     public void execute()
         throws MojoExecutionException

its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java

@@ -24,7 +24,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 
 import java.io.File;
@@ -84,7 +83,7 @@ public class BuildRemotePomMojo
     /**
      * Runs this mojo.
      *
-     * @throws MojoFailureException If the artifact file has not been set.
+     * @throws MojoExecutionException If the artifact file has not been set.
      */
     public void execute()
         throws MojoExecutionException

its/pom.xml

@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>33</version>
+    <version>34</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -142,6 +142,19 @@ under the License.
             </environmentVariables>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <configuration>
+            <tagletArtifacts>
+              <tagletArtifact>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-tools-javadoc</artifactId>
+                <version>3.5.2</version>
+              </tagletArtifact>
+            </tagletArtifacts>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>