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

first pass at IT fix since enums introduction 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337599 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-05-12 17:38:03 +00:00
parent 360a9d2e8e
commit c95ea5dd89
14 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@ -33,7 +34,7 @@ import org.apache.maven.tools.plugin.annotations.FooMojo;
* @since 1.2
* @deprecated Don't use!
*/
@Mojo( name = "first", requiresDependencyResolution = "test", defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
public class FirstMojo
extends FooMojo
{

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

@ -21,6 +21,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@ -33,7 +34,7 @@ import org.apache.maven.plugins.AbstractFirstMojo;
* @since 1.2
* @deprecated Don't use!
*/
@Mojo( name = "first", requiresDependencyResolution = "test", defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
public class FirstMojo
extends AbstractFirstMojo

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

@ -20,13 +20,14 @@ package org.apache.maven.plugin.coreit;
*/
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Mojo;
/**
* Does nothing special.
*
*/
@Mojo( name = "second",requiresDependencyCollection = "compile", threadSafe = true)
@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true )
public class SecondMojo
extends AbstractMojo
{

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

@ -21,6 +21,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@ -32,7 +33,7 @@ import org.apache.maven.plugins.annotations.Parameter;
* @since 1.2
* @deprecated Don't use!
*/
@Mojo( name = "first", requiresDependencyResolution = "test", defaultPhase = LifecyclePhase.INTEGRATION_TEST)
@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
public class FirstMojo
extends AbstractFirstMojo

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

@ -20,13 +20,14 @@ package org.apache.maven.plugin.coreit;
*/
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Mojo;
/**
* Does nothing special.
*
*/
@Mojo( name = "second",requiresDependencyCollection = "compile", threadSafe = true)
@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true )
public class SecondMojo
extends AbstractMojo
{

3
maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
View File

@ -22,6 +22,7 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@ -35,7 +36,7 @@ import java.io.File;
* @since 1.2
* @deprecated Don't use!
*/
@Mojo( name = "first", requiresDependencyResolution = "test", defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
public class FirstMojo
extends AbstractMojo

3
maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
View File

@ -20,13 +20,14 @@ package org.apache.maven.plugin.coreit;
*/
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.DependencyScope;
import org.apache.maven.plugins.annotations.Mojo;
/**
* Does nothing special.
*
*/
@Mojo( name = "second",requiresDependencyCollection = "compile", threadSafe = true)
@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true )
public class SecondMojo
extends AbstractMojo
{

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

@ -82,9 +82,9 @@ public class MojoAnnotationContent
return requiresDependencyResolution;
}
public void requiresDependencyResolution( DependencyScope requiresDependencyResolution )
public void requiresDependencyResolution( String requiresDependencyResolution )
{
this.requiresDependencyResolution = requiresDependencyResolution;
this.requiresDependencyResolution = DependencyScope.valueOf( requiresDependencyResolution );
}
public DependencyScope requiresDependencyCollection()
@ -92,9 +92,9 @@ public class MojoAnnotationContent
return requiresDependencyCollection;
}
public void requiresDependencyCollection( DependencyScope requiresDependencyCollection )
public void requiresDependencyCollection( String requiresDependencyCollection )
{
this.requiresDependencyCollection = requiresDependencyCollection;
this.requiresDependencyCollection = DependencyScope.valueOf( requiresDependencyCollection );
}
public InstanciationStrategy instantiationStrategy()
@ -102,9 +102,9 @@ public class MojoAnnotationContent
return instantiationStrategy;
}
public void instantiationStrategy( InstanciationStrategy instantiationStrategy )
public void instantiationStrategy( String instantiationStrategy )
{
this.instantiationStrategy = instantiationStrategy;
this.instantiationStrategy = InstanciationStrategy.valueOf( instantiationStrategy );
}
public String executionStrategy()