maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1337599 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/ maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/...
Date Sat, 12 May 2012 17:38:04 GMT
Author: hboutemy
Date: Sat May 12 17:38:03 2012
New Revision: 1337599

URL: http://svn.apache.org/viewvc?rev=1337599&view=rev
Log:
first pass at IT fix since enums introduction

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
    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/datamodel/MojoAnnotationContent.java

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
Sat May 12 17:38:03 2012
@@ -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.ann
  * @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
 {
@@ -51,11 +52,11 @@ public class FirstMojo
     public void execute()
         throws MojoExecutionException
     {
-        if (bar == null)
+        if ( bar == null )
         {
             throw new MojoExecutionException( "bar == null" );
         }
-        if (beer == null)
+        if ( beer == null )
         {
             throw new MojoExecutionException( "beer == null" );
         }

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
Sat May 12 17:38:03 2012
@@ -58,7 +58,7 @@ public abstract class AbstractFirstMojo
     /**
      *
      */
-    @Component(role = "org.apache.maven.artifact.metadata.ArtifactMetadataSource", roleHint
= "maven")
+    @Component( role = "org.apache.maven.artifact.metadata.ArtifactMetadataSource", roleHint
= "maven" )
     protected ArtifactMetadataSource artifactMetadataSource;
 
 

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
Sat May 12 17:38:03 2012
@@ -31,12 +31,12 @@ import java.io.IOException;
  * Touches a test file.
  * 
  */
-@Mojo( name = "it0014")
+@Mojo( name = "it0014" )
 public class CoreIt0014Mojo
     extends AbstractMojo
 {
     
-    @Parameter(expression ="${project.build.directory}", required = true)
+    @Parameter( expression = "${project.build.directory}", required = true )
     private String outputDirectory;
 
     public void execute()

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
Sat May 12 17:38:03 2012
@@ -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.Abstract
  * @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
@@ -46,17 +47,17 @@ public class FirstMojo
     @Parameter( alias = "alias" )
     private String aliasedParam;
 
-    @Component( role = "org.apache.maven.project.MavenProjectHelper")
+    @Component( role = "org.apache.maven.project.MavenProjectHelper" )
     private Object projectHelper;
 
     public void execute()
         throws MojoExecutionException
     {
-        if (basedir == null)
+        if ( basedir == null )
         {
             throw new MojoExecutionException( "basedir == null" );
         }
-        if (touchFile == null)
+        if ( touchFile == null )
         {
             throw new MojoExecutionException( "touchFile == null" );
         }

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
Sat May 12 17:38:03 2012
@@ -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
 {

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
Sat May 12 17:38:03 2012
@@ -31,12 +31,12 @@ import java.io.IOException;
  * Touches a test file.
  * 
  */
-@Mojo( name = "it0014")
+@Mojo( name = "it0014" )
 public class CoreIt0014Mojo
     extends AbstractMojo
 {
     
-    @Parameter(expression ="${project.build.directory}", required = true)
+    @Parameter( expression = "${project.build.directory}", required = true )
     private String outputDirectory;
 
     public void execute()

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
Sat May 12 17:38:03 2012
@@ -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.annotati
  * @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

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
Sat May 12 17:38:03 2012
@@ -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
 {

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
Sat May 12 17:38:03 2012
@@ -12,7 +12,7 @@ assert newHelpClass.exists()
 
 def pluginDescriptor = new XmlParser().parse( descriptorFile );
 
-def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first"}[0]
+def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first" }[0]
 
 assert mojo.goal.text() == 'first'
 assert mojo.implementation.text() == 'org.apache.maven.plugin.coreit.FirstMojo'

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
Sat May 12 17:38:03 2012
@@ -31,12 +31,12 @@ import java.io.IOException;
  * Touches a test file.
  * 
  */
-@Mojo( name = "it0014")
+@Mojo( name = "it0014" )
 public class CoreIt0014Mojo
     extends AbstractMojo
 {
     
-    @Parameter(expression ="${project.build.directory}", required = true)
+    @Parameter( expression = "${project.build.directory}", required = true )
     private String outputDirectory;
 
     public void execute()

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
Sat May 12 17:38:03 2012
@@ -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

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
Sat May 12 17:38:03 2012
@@ -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
 {

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=1337599&r1=1337598&r2=1337599&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
Sat May 12 17:38:03 2012
@@ -6,7 +6,7 @@ assert descriptorFile.isFile()
 
 def pluginDescriptor = new XmlParser().parse( descriptorFile );
 
-def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first"}[0]
+def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first" }[0]
 
 assert mojo.goal.text() == 'first'
 assert mojo.implementation.text() == 'org.apache.maven.plugin.coreit.FirstMojo'
@@ -40,7 +40,7 @@ assert mojo.requirements.requirement[0].
 
 assert mojo.parameters.parameter.size() == 3
 
-def parameter = mojo.parameters.parameter.findAll{ it.name.text() == "aliasedParam"}[0]
+def parameter = mojo.parameters.parameter.findAll{ it.name.text() == "aliasedParam" }[0]
 
 assert parameter.name.text() == 'aliasedParam'
 assert parameter.alias.text() == 'alias'
@@ -50,7 +50,7 @@ assert parameter.required.text() == 'fal
 assert parameter.editable.text() == 'true'
 assert parameter.description.text() == ''
 
-parameter = mojo.parameters.parameter.findAll{ it.name.text() == "touchFile"}[0]
+parameter = mojo.parameters.parameter.findAll{ it.name.text() == "touchFile" }[0]
 
 assert parameter.name.text() == 'touchFile'
 assert parameter.alias.isEmpty()
@@ -60,7 +60,7 @@ assert parameter.required.text() == 'tru
 assert parameter.editable.text() == 'true'
 assert parameter.description.text() == ''
 
-parameter = mojo.parameters.parameter.findAll{ it.name.text() == "basedir"}[0]
+parameter = mojo.parameters.parameter.findAll{ it.name.text() == "basedir" }[0]
 
 assert parameter.name.text() == 'basedir'
 assert parameter.alias.isEmpty()
@@ -70,7 +70,7 @@ assert parameter.required.text() == 'fal
 assert parameter.editable.text() == 'false'
 assert parameter.description.text() == 'Project directory.'
 
-mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "second"}[0]
+mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "second" }[0]
 
 assert mojo.requiresDependencyCollection.text() == 'compile'
 assert mojo.threadSafe.text() == 'true'

Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java?rev=1337599&r1=1337598&r2=1337599&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
(original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
Sat May 12 17:38:03 2012
@@ -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()



Mime
View raw message