stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mvn 2 compatibility 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/branches/MPLUGIN-189@1337351 13f79535-47bb-0310-9956-ffa450edef68
master
Olivier Lamy 2012-05-11 20:02:08 +00:00
parent 34ebb1721b
commit 69afeb1a56
14 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
View File

@ -87,6 +87,15 @@ under the License.
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

2
maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
View File

@ -45,7 +45,7 @@ public class FirstMojo
@Parameter( alias = "alias" )
private String aliasedParam;
@Component( role = "org.apache.maven.project.MavenProjectHelper", roleHint = "default" )
@Component( role = "org.apache.maven.project.MavenProjectHelper" )// , roleHint = "default"
private Object projectHelper;
public void execute()

2
maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy
View File

@ -43,7 +43,7 @@ assert mojo.requirements.requirement[1].'role-hint'.text() == ''
assert mojo.requirements.requirement[1].'field-name'.text() == 'compilerManager'
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProjectHelper'
assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
//assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
assert mojo.requirements.requirement[2].'field-name'.text() == 'projectHelper'
assert mojo.parameters.parameter.size() == 3

2
maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
View File

@ -46,7 +46,7 @@ public class FirstMojo
@Parameter( alias = "alias" )
private String aliasedParam;
@Component( role = "org.apache.maven.project.MavenProjectHelper", roleHint = "default" )
@Component( role = "org.apache.maven.project.MavenProjectHelper")
private Object projectHelper;
public void execute()

12
maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
View File

@ -85,4 +85,16 @@ under the License.
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

2
maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy
View File

@ -37,7 +37,7 @@ assert mojo.configuration.touchFile[0].'@default-value' == '${project.build.dire
assert mojo.requirements.requirement.size() == 3
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProjectHelper'
assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
//assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
assert mojo.requirements.requirement[2].'field-name'.text() == 'projectHelper'
assert mojo.parameters.parameter.size() == 3

9
maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
View File

@ -81,6 +81,15 @@ under the License.
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

2
maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
View File

@ -45,7 +45,7 @@ public class FirstMojo
@Parameter( alias = "alias" )
private String aliasedParam;
@Component( role = "org.apache.maven.project.MavenProjectHelper", roleHint = "default" )
@Component( role = "org.apache.maven.project.MavenProjectHelper" )//, roleHint = "default"
private Object projectHelper;
public void execute()

2
maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
View File

@ -41,7 +41,7 @@ assert mojo.configuration.touchFile[0].'@default-value' == '${project.build.dire
assert mojo.requirements.requirement.size() == 3
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProjectHelper'
assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
//assert mojo.requirements.requirement[2].'role-hint'.text() == 'default'
assert mojo.requirements.requirement[2].'field-name'.text() == 'projectHelper'
assert mojo.parameters.parameter.size() == 3

9
maven-plugin-plugin/src/it/help-basic/pom.xml
View File

@ -50,6 +50,15 @@ under the License.
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

9
maven-plugin-plugin/src/it/help-package/pom.xml
View File

@ -50,6 +50,15 @@ under the License.
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

9
maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
View File

@ -58,6 +58,15 @@ under the License.
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

4
maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
View File

@ -33,19 +33,15 @@
<requirements>
<requirement>
<role>org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.codehaus.plexus.archiver.manager.ArchiverManager</role>
<role-hint>default</role-hint>
</requirement>
</requirements>
</component>

38
maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
View File

@ -42,6 +42,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -103,26 +104,27 @@ public class PluginHelpGenerator
MojoDescriptor helpDescriptor = makeHelpDescriptor( pluginDescriptor );
// Verify that no help goal already exists
for ( @SuppressWarnings( "unchecked" ) Iterator<MojoDescriptor> it = pluginDescriptor.getMojos().iterator();
it.hasNext(); )
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
if ( mojoDescriptors != null )
{
MojoDescriptor descriptor = it.next();
if ( descriptor.getGoal().equals( helpDescriptor.getGoal() ) && !descriptor.getImplementation().equals(
helpDescriptor.getImplementation() ) )
// Verify that no help goal already exists
for ( MojoDescriptor descriptor : mojoDescriptors )
{
if ( getLogger().isWarnEnabled() )
if ( descriptor.getGoal().equals( helpDescriptor.getGoal() ) && !descriptor.getImplementation().equals(
helpDescriptor.getImplementation() ) )
{
getLogger().warn( "\n\nA help goal (" + descriptor.getImplementation()
+ ") already exists in this plugin. SKIPPED THE "
+ helpDescriptor.getImplementation() + " GENERATION.\n" );
}
if ( getLogger().isWarnEnabled() )
{
getLogger().warn( "\n\nA help goal (" + descriptor.getImplementation()
+ ") already exists in this plugin. SKIPPED THE "
+ helpDescriptor.getImplementation() + " GENERATION.\n" );
}
return;
return;
}
}
}
Properties properties = new Properties();
properties.put( "helpPackageName", helpPackageName == null ? "" : helpPackageName );
@ -316,9 +318,13 @@ public class PluginHelpGenerator
protected static String discoverPackageName( PluginDescriptor pluginDescriptor )
{
Map<String, Integer> packageNames = new HashMap<String, Integer>();
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
if ( mojoDescriptors == null )
{
return "";
}
for ( MojoDescriptor descriptor : mojoDescriptors )
{
MojoDescriptor descriptor = (MojoDescriptor) it.next();
String impl = descriptor.getImplementation();
if ( StringUtils.equals( descriptor.getGoal(), "help" ) && StringUtils.equals( "HelpMojo", impl ) )