svn commit: r1343198 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java

[olamy]

Author: olamy
Date: Mon May 28 10:39:49 2012
New Revision: 1343198

URL: http://svn.apache.org/viewvc?rev=1343198&view=rev
Log:
fix it and missing annotations to descriptor values set

Modified:
    
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
    
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy?rev=1343198&r1=1343197&r2=1343198&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
 Mon May 28 10:39:49 2012
@@ -140,8 +140,8 @@ assert mojo.implementation.text() == 'or
 assert mojo.language.text() == 'java'
 assert mojo.description.text() == ''
 assert mojo.deprecated.text() == ''
-assert mojo.requiresDependencyResolution.text() == ''
-assert mojo.requiresDependencyCollection.text() == ''
+assert mojo.requiresDependencyResolution.text() == 'runtime'
+assert mojo.requiresDependencyCollection.text() == 'runtime'
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'
@@ -175,8 +175,8 @@ assert mojo.implementation.text() == 'or
 assert mojo.language.text() == 'java'
 assert mojo.description.text() == 'Checks maximum annotations with non-default 
values.'
 assert mojo.deprecated.text() == 'deprecated-text'
-assert mojo.requiresDependencyResolution.text() == 'compile'
-assert mojo.requiresDependencyCollection.text() == 'test'
+assert mojo.requiresDependencyResolution.text() == 'test'
+assert mojo.requiresDependencyCollection.text() == 'compile'
 assert mojo.requiresProject.text() == 'false'
 assert mojo.requiresOnline.text() == 'true'
 assert mojo.requiresDirectInvocation.text() == 'true'

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=1343198&r1=1343197&r2=1343198&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
 Mon May 28 10:39:49 2012
@@ -498,6 +498,14 @@ public class JavaAnnotationsMojoDescript
 
             mojoDescriptor.setProjectRequired( mojo.requiresProject() );
 
+            mojoDescriptor.setRequiresReports( mojo.requiresReports() );
+
+            mojoDescriptor.setComponentConfigurator( mojo.configurator() );
+
+            mojoDescriptor.setInheritedByDefault( mojo.inheritByDefault() );
+
+            mojoDescriptor.setInstantiationStrategy( 
mojo.instantiationStrategy().id() );
+
             mojoDescriptor.setAggregator( mojo.aggregator() );
             mojoDescriptor.setDependencyResolutionRequired( 
mojo.requiresDependencyResolution().id() );
             mojoDescriptor.setDependencyCollectionRequired( 
mojo.requiresDependencyCollection().id() );