From d56e6cba11beb4e2ac511d49310bef19c41b19f6 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Mon, 14 May 2012 20:46:10 +0000 Subject: [PATCH] renamed DependencyScope to ResolutionScope to better match the intent git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1338393 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/plugins/annotations/Mojo.java | 4 ++-- .../{DependencyScope.java => ResolutionScope.java} | 4 ++-- .../org/apache/maven/plugin/coreit/FirstMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/FirstMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/SecondMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/FirstMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/SecondMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/FirstMojo.java | 4 ++-- .../org/apache/maven/plugin/coreit/SecondMojo.java | 4 ++-- .../datamodel/MojoAnnotationContent.java | 14 +++++++------- 10 files changed, 25 insertions(+), 25 deletions(-) rename maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/{DependencyScope.java => ResolutionScope.java} (97%) diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java index 5ccac0b..c41ec9a 100644 --- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java +++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java @@ -40,9 +40,9 @@ public @interface Mojo LifecyclePhase defaultPhase() default LifecyclePhase.NONE; - DependencyScope requiresDependencyResolution() default DependencyScope.RUNTIME; + ResolutionScope requiresDependencyResolution() default ResolutionScope.RUNTIME; - DependencyScope requiresDependencyCollection() default DependencyScope.RUNTIME; + ResolutionScope requiresDependencyCollection() default ResolutionScope.RUNTIME; InstanciationStrategy instantiationStrategy() default InstanciationStrategy.PER_LOOKUP; diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/DependencyScope.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java similarity index 97% rename from maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/DependencyScope.java rename to maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java index eec77c2..572cd44 100644 --- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/DependencyScope.java +++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java @@ -28,7 +28,7 @@ import org.apache.maven.artifact.Artifact; * @author Hervé Boutemy * @since 3.0 */ -public enum DependencyScope +public enum ResolutionScope { /** * compile resolution scope @@ -59,7 +59,7 @@ public enum DependencyScope private final String id; - DependencyScope( String id ) + ResolutionScope( String id ) { this.id = id; } diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java index 4b0156a..491f0c1 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java @@ -21,7 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -34,7 +34,7 @@ import org.apache.maven.tools.plugin.annotations.FooMojo; * @since 1.2 * @deprecated Don't use! */ -@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) +@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) public class FirstMojo extends FooMojo { diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java index 5618dd1..02cf832 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java @@ -21,7 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -34,7 +34,7 @@ import org.apache.maven.plugins.AbstractFirstMojo; * @since 1.2 * @deprecated Don't use! */ -@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) +@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) @Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" ) public class FirstMojo extends AbstractFirstMojo diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java index 47552b2..8dc9dff 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java @@ -20,14 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Mojo; /** * Does nothing special. * */ -@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true ) +@Mojo( name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true ) public class SecondMojo extends AbstractMojo { diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java index 4bd7d66..15dd982 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java @@ -22,7 +22,7 @@ package org.apache.maven.plugin.coreit; import org.apache.maven.artifact.Artifact; 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.ResolutionScope; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -36,7 +36,7 @@ import java.util.Set; * @since 1.2 * @deprecated Don't use! */ -@Mojo( name = "first", requiresDependencyResolution = DependencyScope.COMPILE, +@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.COMPILE, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) @Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" ) public class FirstMojo diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java index 47552b2..8dc9dff 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java @@ -20,14 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Mojo; /** * Does nothing special. * */ -@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true ) +@Mojo( name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true ) public class SecondMojo extends AbstractMojo { diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java index 31c7580..70b2ef2 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java +++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java @@ -22,7 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -36,7 +36,7 @@ import java.io.File; * @since 1.2 * @deprecated Don't use! */ -@Mojo( name = "first", requiresDependencyResolution = DependencyScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) +@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST ) @Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" ) public class FirstMojo extends AbstractMojo diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java index 47552b2..8dc9dff 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java +++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java @@ -20,14 +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.ResolutionScope; import org.apache.maven.plugins.annotations.Mojo; /** * Does nothing special. * */ -@Mojo( name = "second", requiresDependencyCollection = DependencyScope.COMPILE, threadSafe = true ) +@Mojo( name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true ) public class SecondMojo extends AbstractMojo { diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java index db9719f..660fa71 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java @@ -19,7 +19,7 @@ package org.apache.maven.tools.plugin.annotations.datamodel; * under the License. */ -import org.apache.maven.plugins.annotations.DependencyScope; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.plugins.annotations.InstanciationStrategy; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -38,9 +38,9 @@ public class MojoAnnotationContent private LifecyclePhase defaultPhase = LifecyclePhase.NONE; - private DependencyScope requiresDependencyResolution = DependencyScope.RUNTIME; + private ResolutionScope requiresDependencyResolution = ResolutionScope.RUNTIME; - private DependencyScope requiresDependencyCollection = DependencyScope.RUNTIME; + private ResolutionScope requiresDependencyCollection = ResolutionScope.RUNTIME; private InstanciationStrategy instantiationStrategy = InstanciationStrategy.PER_LOOKUP; @@ -77,24 +77,24 @@ public class MojoAnnotationContent this.defaultPhase = LifecyclePhase.valueOf( phase ); } - public DependencyScope requiresDependencyResolution() + public ResolutionScope requiresDependencyResolution() { return requiresDependencyResolution; } public void requiresDependencyResolution( String requiresDependencyResolution ) { - this.requiresDependencyResolution = DependencyScope.valueOf( requiresDependencyResolution ); + this.requiresDependencyResolution = ResolutionScope.valueOf( requiresDependencyResolution ); } - public DependencyScope requiresDependencyCollection() + public ResolutionScope requiresDependencyCollection() { return requiresDependencyCollection; } public void requiresDependencyCollection( String requiresDependencyCollection ) { - this.requiresDependencyCollection = DependencyScope.valueOf( requiresDependencyCollection ); + this.requiresDependencyCollection = ResolutionScope.valueOf( requiresDependencyCollection ); } public InstanciationStrategy instantiationStrategy()