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

Remove setUseAnnotations from PluginHelpGenerator, PluginToolsRequest has enough info to decide this. 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1406001 13f79535-47bb-0310-9956-ffa450edef68
master
Robert Scholte 2012-11-05 22:34:46 +00:00
parent 570bb47130
commit 197ce98685
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
View File

@ -76,7 +76,7 @@ public class HelpGeneratorMojo
*/ */
protected Generator createGenerator() protected Generator createGenerator()
{ {
return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setUseAnnotations( project.getArtifactMap().containsKey( "org.apache.maven.plugin-tools:maven-plugin-annotations" ) ).setVelocityComponent( this.velocity ); return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
} }
/** /**

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

@ -136,6 +136,8 @@ public class PluginHelpGenerator
} }
writeHelpPropertiesFile( request, destinationDirectory ); writeHelpPropertiesFile( request, destinationDirectory );
useAnnotations = request.getProject().getArtifactMap().containsKey( "org.apache.maven.plugin-tools:maven-plugin-annotations" );
try try
{ {
@ -160,12 +162,6 @@ public class PluginHelpGenerator
return this; return this;
} }
public PluginHelpGenerator setUseAnnotations( boolean useAnnotations )
{
this.useAnnotations = useAnnotations;
return this;
}
public VelocityComponent getVelocityComponent() public VelocityComponent getVelocityComponent()
{ {
return velocityComponent; return velocityComponent;