You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/03 17:50:06 UTC
svn commit: r1592229 - in /maven/plugin-tools/trunk:
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/
maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/
maven-plugin-tools-api/src/main/j...
Author: hboutemy
Date: Sat May 3 15:50:05 2014
New Revision: 1592229
URL: http://svn.apache.org/r1592229
Log:
[MPLUGIN-265] removed deprecated API since introduction of PluginToolsRequest
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Sat May 3 15:50:05 2014
@@ -35,7 +35,6 @@ import org.apache.maven.plugin.descripto
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.Requirement;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
@@ -92,12 +91,6 @@ public class JavaAnnotationsMojoDescript
@org.codehaus.plexus.component.annotations.Requirement
private ArchiverManager archiverManager;
- public List<MojoDescriptor> execute( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException
- {
- return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) );
- }
-
public List<MojoDescriptor> execute( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java Sat May 3 15:50:05 2014
@@ -29,9 +29,7 @@ import java.util.TreeMap;
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.DirectoryScanner;
@@ -47,13 +45,6 @@ public abstract class AbstractScriptedMo
implements MojoDescriptorExtractor
{
/** {@inheritDoc} */
- public List<MojoDescriptor> execute( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException
- {
- return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) );
- }
-
- /** {@inheritDoc} */
public List<MojoDescriptor> execute( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java Sat May 3 15:50:05 2014
@@ -21,8 +21,6 @@ package org.apache.maven.tools.plugin.ex
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import java.util.List;
@@ -36,20 +34,6 @@ public interface MojoDescriptorExtractor
/** Plexus role for lookup */
String ROLE = MojoDescriptorExtractor.class.getName();
-
- /**
- * Execute the mojo extraction.
- *
- * @return a list of mojo descriptors.
- * @throws ExtractionException if any
- * @throws InvalidPluginDescriptorException if any
- *
- * @deprecated Use {@link MojoDescriptorExtractor#execute(PluginToolsRequest)} instead.
- * Provided for backward compatibility with maven-plugin-plugin < 2.5.
- */
- List<MojoDescriptor> execute( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException;
-
/**
* Execute the mojo extraction.
*
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java Sat May 3 15:50:05 2014
@@ -75,15 +75,6 @@ public class DefaultMojoScanner
/**
* {@inheritDoc}
*/
- public void populatePluginDescriptor( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException
- {
- populatePluginDescriptor( new DefaultPluginToolsRequest( project, pluginDescriptor ) );
- }
-
- /**
- * {@inheritDoc}
- */
public void populatePluginDescriptor( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java Sat May 3 15:50:05 2014
@@ -20,8 +20,6 @@ package org.apache.maven.tools.plugin.sc
*/
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
@@ -37,18 +35,6 @@ public interface MojoScanner
String ROLE = MojoScanner.class.getName();
/**
- * @param project not null
- * @param pluginDescriptor not null
- * @throws ExtractionException if any
- * @throws InvalidPluginDescriptorException if any
- *
- * @deprecated Use {@link MojoScanner#populatePluginDescriptor(PluginToolsRequest)} instead.
- * Provided for backward compatibility with maven-plugin-plugin < 2.5.
- */
- void populatePluginDescriptor( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException;
-
- /**
* @param request not null
* @throws ExtractionException if any
* @throws InvalidPluginDescriptorException if any
Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=1592229&r1=1592228&r2=1592229&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Sat May 3 15:50:05 2014
@@ -672,13 +672,6 @@ public class JavaMojoDescriptorExtractor
}
/** {@inheritDoc} */
- public List<MojoDescriptor> execute( MavenProject project, PluginDescriptor pluginDescriptor )
- throws ExtractionException, InvalidPluginDescriptorException
- {
- return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) );
- }
-
- /** {@inheritDoc} */
public List<MojoDescriptor> execute( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{