From 4d7b7bbd40fb82ef78f0a27135a8dc9075d132ea Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 27 Apr 2020 12:52:15 +0200
Subject: [PATCH 1/3] Disable help MOJO generation

---
 .../plugin/plugin/HelpGeneratorMojo.java      | 20 +------------------
 .../generator/PluginDescriptorGenerator.java  | 11 ----------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
index 767567b..1004867 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
@@ -28,8 +28,6 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.tools.plugin.generator.Generator;
-import org.apache.maven.tools.plugin.generator.PluginHelpGenerator;
-import org.codehaus.plexus.velocity.VelocityComponent;
 
 /**
  * Generates a <code>HelpMojo</code> class.
@@ -58,12 +56,6 @@ public class HelpGeneratorMojo
     @Parameter
     private String helpPackageName;
 
-    /**
-     * Velocity component.
-     */
-    @Component
-    private VelocityComponent velocity;
-
     /**
      * {@inheritDoc}
      */
@@ -77,7 +69,7 @@ public class HelpGeneratorMojo
      */
     protected Generator createGenerator()
     {
-        return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
+        return null;
     }
 
     /**
@@ -86,16 +78,6 @@ public class HelpGeneratorMojo
     public void execute()
         throws MojoExecutionException
     {
-        // force value for this plugin
-        skipErrorNoDescriptorsFound = true;
-
-        super.execute();
-
-        if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) && !skip )
-        {
-            project.addCompileSourceRoot( outputDirectory.getAbsolutePath() );
-        }
-
     }
 
 }
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
index 1375cae..9e3d556 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
@@ -66,22 +66,11 @@ public class PluginDescriptorGenerator
     public void execute( File destinationDirectory, PluginToolsRequest request )
         throws GeneratorException
     {
-        // eventually rewrite help mojo class to match actual package name
-        PluginHelpGenerator.rewriteHelpMojo( request, log );
-
         try
         {
             // write complete plugin.xml descriptor
             File f = new File( destinationDirectory, "plugin.xml" );
             writeDescriptor( f, request, false );
-
-            // write plugin-help.xml help-descriptor
-            MavenProject mavenProject = request.getProject();
-
-            f = new File( mavenProject.getBuild().getOutputDirectory(),
-                          PluginHelpGenerator.getPluginHelpPath( mavenProject ) );
-
-            writeDescriptor( f, request, true );
         }
         catch ( IOException e )
         {
-- 
2.25.2