[MPLUGINTESTING-84] Support Junit 5 + Maven 3

maven-plugin-testing-harness/pom.xml

@@ -48,7 +48,7 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -71,9 +71,14 @@ under the License.
 
     <!-- plexus -->
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>${mavenVersion}</version>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java

@@ -77,7 +77,12 @@
 import org.slf4j.LoggerFactory;
 
 /**
+ * JUnit extension to help testing Mojos. The extension should be automatically registered
+ * by adding the {@link MojoTest} annotation on the test class.
  *
+ * @see MojoTest
+ * @see InjectMojo
+ * @see MojoParameter
  */
 public class MojoExtension extends PlexusExtension implements ParameterResolver {
 
@@ -134,15 +139,6 @@ public void beforeEach(ExtensionContext context) throws Exception {
 
             PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build(interpolationReader);
 
-            //            Artifact artifact =
-            //                    lookup( RepositorySystem.class ).createArtifact( pluginDescriptor.getGroupId(),
-            //                            pluginDescriptor.getArtifactId(),
-            //                            pluginDescriptor.getVersion(), ".jar" );
-            //
-            //            artifact.setFile( getPluginArtifactFile() );
-            //            pluginDescriptor.setPluginArtifact( artifact );
-            //            pluginDescriptor.setArtifacts( Collections.singletonList( artifact ) );
-
             context.getStore(ExtensionContext.Namespace.GLOBAL).put(PluginDescriptor.class, pluginDescriptor);
 
             for (ComponentDescriptor<?> desc : pluginDescriptor.getComponents()) {
@@ -203,7 +199,7 @@ protected String[] mojoCoordinates(String goal) throws Exception {
     }
 
     /**
-     * lookup the mojo while we have all of the relavent information
+     * lookup the mojo while we have all the relevent information
      */
     protected Mojo lookupMojo(String[] coord, XmlNode pluginConfiguration, PluginDescriptor descriptor)
             throws Exception {
@@ -319,13 +315,8 @@ private static String resolveFromRootThenParent(Xpp3Dom pluginPomDom, String ele
 
     /**
      * Convenience method to obtain the value of a variable on a mojo that might not have a getter.
-     *
-     * NOTE: the caller is responsible for casting to to what the desired type is.
-     *
-     * @param object
-     * @param variable
-     * @return object value of variable
-     * @throws IllegalArgumentException
+     * <br>
+     * NOTE: the caller is responsible for casting to what the desired type is.
      */
     public static Object getVariableValueFromObject(Object object, String variable) throws IllegalAccessException {
         Field field = ReflectionUtils.getFieldByNameIncludingSuperclasses(variable, object.getClass());
@@ -335,23 +326,18 @@ public static Object getVariableValueFromObject(Object object, String variable)
 
     /**
      * Convenience method to obtain all variables and values from the mojo (including its superclasses)
-     *
+     * <br>
      * Note: the values in the map are of type Object so the caller is responsible for casting to desired types.
-     *
-     * @param object
-     * @return map of variable names and values
      */
     public static Map<String, Object> getVariablesAndValuesFromObject(Object object) throws IllegalAccessException {
         return getVariablesAndValuesFromObject(object.getClass(), object);
     }
 
     /**
      * Convenience method to obtain all variables and values from the mojo (including its superclasses)
-     *
+     * <br>
      * Note: the values in the map are of type Object so the caller is responsible for casting to desired types.
      *
-     * @param clazz
-     * @param object
      * @return map of variable names and values
      */
     public static Map<String, Object> getVariablesAndValuesFromObject(Class<?> clazz, Object object)
@@ -371,11 +357,6 @@ public static Map<String, Object> getVariablesAndValuesFromObject(Class<?> clazz
 
     /**
      * Convenience method to set values to variables in objects that don't have setters
-     *
-     * @param object
-     * @param variable
-     * @param value
-     * @throws IllegalAccessException
      */
     public static void setVariableValueToObject(Object object, String variable, Object value)
             throws IllegalAccessException {

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java

@@ -36,7 +36,6 @@
 import java.util.Properties;
 
 import com.google.inject.Module;
-import org.apache.commons.io.input.XmlStreamReader;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
@@ -75,6 +74,7 @@
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.ReflectionUtils;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/junit5/InjectMojo.java

@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.plugin.testing.junit5;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface InjectMojo {
+
+    String goal();
+
+    String pom();
+
+    boolean empty() default false;
+}