o Also, work with maven 2.2.1

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1406615 13f79535-47bb-0310-9956-ffa450edef68

maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java

@@ -62,10 +62,6 @@ public class DescriptorGeneratorMojo
     @Parameter( defaultValue = "false" )
     private boolean skipDescriptor;
 
-    @Component
-    protected Logger logger;
-
-
     /**
      * {@inheritDoc}
      */
@@ -79,7 +75,7 @@ public class DescriptorGeneratorMojo
      */
     protected Generator createGenerator()
     {
-        return new PluginDescriptorGenerator( logger );
+        return new PluginDescriptorGenerator( getLog() );
     }
 
     /**

maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java

@@ -36,6 +36,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.Requirement;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
@@ -59,9 +60,9 @@ public class PluginDescriptorGenerator
     implements Generator
 {
 
-    private final Logger log;
+    private final Log log;
 
-    public PluginDescriptorGenerator( Logger log )
+    public PluginDescriptorGenerator( Log log )
     {
         this.log = log;
     }

maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java

@@ -21,6 +21,7 @@ package org.apache.maven.tools.plugin.generator;
 
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
 import org.apache.velocity.VelocityContext;
@@ -60,7 +61,7 @@ import java.util.Properties;
  * <p>Notice that the help mojo source needs to be generated before compilation, but when Java 5 annotations are used,
  * plugin descriptor content is available only after compilation (detecting annotations in .class files):
  * help mojo source can be generated with empty package only (and no plugin descriptor available yet), then needs
- * to be updated after compilation - through {@link #rewriteHelpMojo(PluginToolsRequest)} which is called from plugin
+ * to be updated after compilation - through {@link #rewriteHelpMojo(PluginToolsRequest, Log)} which is called from plugin
  * descriptor XML generation.</p>
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -236,7 +237,7 @@ public class PluginHelpGenerator
      *
      * @param request
      * @throws GeneratorException
-     * @see {@link #rewriteHelpMojo(PluginToolsRequest)}
+     * @see {@link #rewriteHelpMojo(PluginToolsRequest, Log)}
      */
     private void writeHelpPropertiesFile( PluginToolsRequest request, File destinationDirectory )
         throws GeneratorException
@@ -285,7 +286,7 @@ public class PluginHelpGenerator
      * @param request
      * @throws GeneratorException
      */
-    static void rewriteHelpMojo( PluginToolsRequest request, Logger log )
+    static void rewriteHelpMojo( PluginToolsRequest request, Log log )
         throws GeneratorException
     {
         File tmpPropertiesFile =
@@ -329,7 +330,7 @@ public class PluginHelpGenerator
         }
     }
 
-    private static String rewriteHelpClassToMojoPackage( PluginToolsRequest request, File destinationDirectory, Logger log )
+    private static String rewriteHelpClassToMojoPackage( PluginToolsRequest request, File destinationDirectory, Log log )
         throws GeneratorException
     {
         String destinationPackage = GeneratorUtils.discoverPackageName( request.getPluginDescriptor() );

maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java

@@ -25,9 +25,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.apache.maven.model.Build;
+import org.apache.maven.monitor.logging.DefaultLog;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.apache.maven.plugin.testing.SilentLog;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
 import org.codehaus.plexus.PlexusTestCase;
@@ -137,11 +141,11 @@ public abstract class AbstractGeneratorTestCase
         {
             Class<?> generatorClass = Thread.currentThread().getContextClassLoader().loadClass( generatorClassName );
 
-            Logger logger = getContainer().getLogger();
+            Log log = new SystemStreamLog();
             try
             {
-                Constructor<?> constructor = generatorClass.getConstructor( Logger.class );
+                Constructor<?> constructor = generatorClass.getConstructor( Log.class );
-                generator = (Generator) constructor.newInstance( logger );
+                generator = (Generator) constructor.newInstance( log );
             }
             catch ( NoSuchMethodException ignore )
             {

maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java

@@ -28,6 +28,7 @@ import org.apache.maven.model.Model;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugin.logging.SystemStreamLog;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
 import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
@@ -121,7 +122,7 @@ public class JavaMojoDescriptorExtractorTest
             request.getPluginDescriptor().addMojo( mojoDescriptor );
         }
 
-        Generator descriptorGenerator = new PluginDescriptorGenerator( new ConsoleLogger( 0, "A" ) );
+        Generator descriptorGenerator = new PluginDescriptorGenerator( new SystemStreamLog() );
 
         descriptorGenerator.execute( new File( root, directory ), request );