[MPLUGIN-216] fixed default dependency resolution value as none for java 5 annotations

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1353331 13f79535-47bb-0310-9956-ffa450edef68

maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java

@@ -54,13 +54,13 @@ public @interface Mojo
      * the required dependency resolution scope.
      * @return 
      */
-    ResolutionScope requiresDependencyResolution() default ResolutionScope.RUNTIME;
+    ResolutionScope requiresDependencyResolution() default ResolutionScope.NONE;
 
     /**
      * the required dependency collection scope.
      * @return 
      */
-    ResolutionScope requiresDependencyCollection() default ResolutionScope.RUNTIME;
+    ResolutionScope requiresDependencyCollection() default ResolutionScope.NONE;
 
     /**
      * your Mojo instantiation strategy. (Only <code>per-lookup</code> and <code>singleton</code> are supported)

maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java

@@ -30,6 +30,10 @@ import org.apache.maven.artifact.Artifact;
  */
 public enum ResolutionScope
 {
+    /**
+     * empty resolution scope
+     */
+    NONE( null ),
     /**
      * <code>compile</code> resolution scope
      * = <code>compile</code> + <code>system</code> + <code>provided</code> dependencies

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

@@ -18,7 +18,7 @@ assert mojo.language.text() == 'java'
 assert mojo.description.text() == 'Touches a test file.'
 assert mojo.deprecated.text() == "Don't use!"
 assert mojo.requiresDependencyResolution.text() == 'test'
-assert mojo.requiresDependencyCollection.text() == 'runtime'
+assert mojo.requiresDependencyCollection.text() == ''
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'

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

@@ -16,7 +16,7 @@ assert mojo.language.text() == 'java'
 assert mojo.description.text() == 'Touches a test file.'
 assert mojo.deprecated.text() == "Don't use!"
 assert mojo.requiresDependencyResolution.text() == 'test'
-assert mojo.requiresDependencyCollection.text() == 'runtime'
+assert mojo.requiresDependencyCollection.text() == ''
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'

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

@@ -20,7 +20,7 @@ assert mojo.language.text() == 'java'
 assert mojo.description.text() == 'Touches a test file.'
 assert mojo.deprecated.text() == "Don't use!"
 assert mojo.requiresDependencyResolution.text() == 'compile'
-assert mojo.requiresDependencyCollection.text() == 'runtime'
+assert mojo.requiresDependencyCollection.text() == ''
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'

maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy

@@ -14,7 +14,7 @@ assert mojo.language.text() == 'java'
 assert mojo.description.text() == 'Touches a test file.'
 assert mojo.deprecated.text() == "Don't use!"
 assert mojo.requiresDependencyResolution.text() == 'test'
-assert mojo.requiresDependencyCollection.text() == 'runtime'
+assert mojo.requiresDependencyCollection.text() == ''
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'
@@ -140,8 +140,8 @@ assert mojo.implementation.text() == 'org.apache.maven.plugin.coreit.Minimal'
 assert mojo.language.text() == 'java'
 assert mojo.description.text() == ''
 assert mojo.deprecated.text() == ''
-assert mojo.requiresDependencyResolution.text() == 'runtime'
-assert mojo.requiresDependencyCollection.text() == 'runtime'
+assert mojo.requiresDependencyResolution.text() == ''
+assert mojo.requiresDependencyCollection.text() == ''
 assert mojo.requiresProject.text() == 'true'
 assert mojo.requiresOnline.text() == 'false'
 assert mojo.requiresDirectInvocation.text() == 'false'

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java

@@ -38,9 +38,9 @@ public class MojoAnnotationContent
 
     private LifecyclePhase defaultPhase = LifecyclePhase.NONE;
 
-    private ResolutionScope requiresDependencyResolution = ResolutionScope.RUNTIME;
+    private ResolutionScope requiresDependencyResolution = ResolutionScope.NONE;
 
-    private ResolutionScope requiresDependencyCollection = ResolutionScope.RUNTIME;
+    private ResolutionScope requiresDependencyCollection = ResolutionScope.NONE;
 
     private InstanciationStrategy instantiationStrategy = InstanciationStrategy.PER_LOOKUP;