[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
master
Herve Boutemy 2012-06-24 20:59:37 +00:00
parent c1e288aedd
commit c46422fe0d
7 changed files with 14 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -38,9 +38,9 @@ public class MojoAnnotationContent
private LifecyclePhase defaultPhase = LifecyclePhase.NONE; 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; private InstanciationStrategy instantiationStrategy = InstanciationStrategy.PER_LOOKUP;