fixed javadoc for outputDirectory: overridden value in ArtifactItems is only available in "from configuration" goals
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1481501 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
index 6eaeafe..26052ab 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -56,7 +55,7 @@
extends AbstractDependencyMojo
{
/**
- * Default location used for mojo unless overridden in ArtifactItem
+ * Default output location used for mojo, unless overridden in ArtifactItem.
*
* @since 1.0
*/
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
index 622a3cf..73efb8d 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
@@ -349,7 +349,7 @@
/**
* @return Returns a comma separated list of excluded items
*/
- public String getExcludes ()
+ public String getExcludes()
{
return DependencyUtil.cleanToBeTokenizedString( this.excludes );
}
@@ -373,7 +373,7 @@
/**
* @param includes A comma separated list of items to include i.e. <code>**\/*.xml, **\/*.properties</code>
*/
- public void setIncludes ( String includes )
+ public void setIncludes( String includes )
{
this.includes = includes;
}
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index 55bcf12..a28a0b4 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -63,6 +63,30 @@
extends AbstractDependencyMojo
{
/**
+ * Overwrite release artifacts
+ *
+ * @since 1.0
+ */
+ @Parameter( property = "overWriteReleases", defaultValue = "false" )
+ protected boolean overWriteReleases;
+
+ /**
+ * Overwrite snapshot artifacts
+ *
+ * @since 1.0
+ */
+ @Parameter( property = "overWriteSnapshots", defaultValue = "false" )
+ protected boolean overWriteSnapshots;
+
+ /**
+ * Overwrite artifacts that don't exist or are older than the source.
+ *
+ * @since 2.0
+ */
+ @Parameter( property = "overWriteIfNewer", defaultValue = "true" )
+ protected boolean overWriteIfNewer;
+
+ /**
* If we should exclude transitive dependencies
*
* @since 2.0
@@ -181,30 +205,6 @@
protected File markersDirectory;
/**
- * Overwrite release artifacts
- *
- * @since 1.0
- */
- @Parameter( property = "overWriteReleases", defaultValue = "false" )
- protected boolean overWriteReleases;
-
- /**
- * Overwrite snapshot artifacts
- *
- * @since 1.0
- */
- @Parameter( property = "overWriteSnapshots", defaultValue = "false" )
- protected boolean overWriteSnapshots;
-
- /**
- * Overwrite artifacts that don't exist or are older than the source.
- *
- * @since 2.0
- */
- @Parameter( property = "overWriteIfNewer", defaultValue = "true" )
- protected boolean overWriteIfNewer;
-
- /**
* Prepend the groupId during copy.
*
* @since 2.2
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractFromDependenciesMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractFromDependenciesMojo.java
index 97ae32f..f402e15 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractFromDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractFromDependenciesMojo.java
@@ -33,6 +33,13 @@
public abstract class AbstractFromDependenciesMojo
extends AbstractDependencyFilterMojo
{
+ /**
+ * Output location.
+ *
+ * @since 1.0
+ */
+ @Parameter( property = "outputDirectory", defaultValue = "${project.build.directory}/dependency" )
+ protected File outputDirectory;
/**
* Strip artifact version during copy
@@ -47,14 +54,6 @@
protected boolean stripClassifier = false;
/**
- * Default location used for mojo unless overridden in ArtifactItem
- *
- * @since 1.0
- */
- @Parameter( property = "outputDirectory", defaultValue = "${project.build.directory}/dependency" )
- protected File outputDirectory;
-
- /**
* Place each artifact in the same directory layout as a default repository.
* <br/>example: /outputDirectory/junit/junit/3.8.1/junit-3.8.1.jar
*
