[maven-release-plugin] copy for tag maven-plugin-tools-3.2
git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.2@1406624 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml
index 4c21242..5878e4f 100644
--- a/maven-plugin-annotations/pom.xml
+++ b/maven-plugin-annotations/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-plugin-tools</artifactId>
<groupId>org.apache.maven.plugin-tools</groupId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-annotations</artifactId>
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index f1ae250..2b97064 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-plugin-tools</artifactId>
<groupId>org.apache.maven.plugin-tools</groupId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 9bd738d..09ac771 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -62,10 +62,6 @@
@Parameter( defaultValue = "false" )
private boolean skipDescriptor;
- @Component
- protected Logger logger;
-
-
/**
* {@inheritDoc}
*/
@@ -79,7 +75,7 @@
*/
protected Generator createGenerator()
{
- return new PluginDescriptorGenerator( logger );
+ return new PluginDescriptorGenerator( getLog() );
}
/**
diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 7ea96a5..cda2118 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-annotations</artifactId>
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index 0469773..a6dfbfa 100644
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-ant</artifactId>
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index a1f9f80..49be752 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-api</artifactId>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index e9c50e8..af34aae 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-beanshell</artifactId>
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 55570c0..a183b47 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-generators</artifactId>
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 0fc7f34..2de691a 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
@@ -36,6 +36,7 @@
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 @@
implements Generator
{
- private final Logger log;
+ private final Log log;
- public PluginDescriptorGenerator( Logger log )
+ public PluginDescriptorGenerator( Log log )
{
this.log = log;
}
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index 1180a46..936eb8b 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -21,6 +21,7 @@
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 @@
* <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 @@
*
* @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 @@
* @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 @@
}
}
- 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() );
diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
index a9dd77b..58d1e2c 100644
--- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
+++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
@@ -25,9 +25,13 @@
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 @@
{
Class<?> generatorClass = Thread.currentThread().getContextClassLoader().loadClass( generatorClassName );
- Logger logger = getContainer().getLogger();
+ Log log = new SystemStreamLog();
try
{
- Constructor<?> constructor = generatorClass.getConstructor( Logger.class );
- generator = (Generator) constructor.newInstance( logger );
+ Constructor<?> constructor = generatorClass.getConstructor( Log.class );
+ generator = (Generator) constructor.newInstance( log );
}
catch ( NoSuchMethodException ignore )
{
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index cbb9276..985ba39 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-java</artifactId>
diff --git a/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java b/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
index 96b2b25..bf02f9e 100644
--- a/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
+++ b/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
@@ -28,6 +28,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.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 @@
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 );
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index aed6d58..5aea09f 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-javadoc</artifactId>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index 5d8b3f6..bac73de 100644
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-plugin-tools-model</artifactId>
diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
index 930eb9c..bb44da7 100644
--- a/maven-script/maven-script-ant/pom.xml
+++ b/maven-script/maven-script-ant/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-script</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-script-ant</artifactId>
diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml
index 2b870e3..ee75c40 100644
--- a/maven-script/maven-script-beanshell/pom.xml
+++ b/maven-script/maven-script-beanshell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-script</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-script-beanshell</artifactId>
diff --git a/maven-script/pom.xml b/maven-script/pom.xml
index c38414d..7e86dbb 100644
--- a/maven-script/pom.xml
+++ b/maven-script/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
</parent>
<artifactId>maven-script</artifactId>
diff --git a/pom.xml b/pom.xml
index 09cdb05..2735c82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>3.2</version>
<packaging>pom</packaging>
<name>Maven Plugin Tools</name>
@@ -142,9 +142,9 @@
</modules>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-3.2</url>
</scm>
<issueManagement>
<system>jira</system>
