You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/11/10 04:03:49 UTC
svn commit: r473173 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
main/java/org/apache/maven/plugin/dependency/resolvers/ site/ site/...
Author: brianf
Date: Thu Nov 9 19:03:48 2006
New Revision: 473173
URL: http://svn.apache.org/viewvc?view=rev&rev=473173
Log:
site work
Added:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt
- copied, changed from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copy-direct-dependencies.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt
- copied, changed from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt
- copied, changed from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking-direct-dependencies.apt
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copy-direct-dependencies.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking-direct-dependencies.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking.apt
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Thu Nov 9 19:03:48 2006
@@ -41,7 +41,8 @@
{
/**
* If we should exclude transitive dependencies
- *
+ * @since 2.0
+ * @optional
* @parameter expression="${excludeTransitive}" default-value="false"
*/
protected boolean excludeTransitive;
@@ -49,7 +50,7 @@
/**
* Comma Separated list of Types to include. Empty String indicates include
* everything (default).
- *
+ * @since 2.0
* @parameter expression="${includeTypes}" default-value=""
* @optional
*/
@@ -58,7 +59,7 @@
/**
* Comma Separated list of Types to exclude. Empty String indicates don't
* exclude anything (default). Ignored if includeTypes is used.
- *
+ * @since 2.0
* @parameter expression="${excludeTypes}" default-value=""
* @optional
*/
@@ -66,23 +67,24 @@
/**
* Scope to include. An Empty string indicates all scopes (default).
- *
+ * @since 2.0
* @parameter expression="${includeScope}" default-value=""
- * @required
+ * @optional
*/
protected String includeScope;
/**
* Scope to exclude. An Empty string indicates no scopes (default).
- *
+ * @since 2.0
* @parameter expression="${excludeScope}" default-value=""
- * @required
+ * @optional
*/
protected String excludeScope;
/**
* Specify classifier to look for. Example: sources
- *
+ * @optional
+ * @since 2.0
* @parameter expression="${classifier}" default-value=""
*/
protected String classifier;
@@ -90,7 +92,8 @@
/**
* Specify type to look for when constructing artifact based on classifier.
* Example: java-source,jar,war
- *
+ * @optional
+ * @since 2.0
* @parameter expression="${type}" default-value="java-source"
*/
protected String type;
@@ -100,37 +103,34 @@
*
* @parameter expression="${markersDirectory}"
* default-value="${project.build.directory}/dependency-maven-plugin-markers"
- * @required
+ * @optional
+ * @since 1.0
*/
protected File markersDirectory;
/**
* Overwrite release artifacts
- *
+ * @optional
+ * @since 1.0
* @parameter expression="${overWriteReleases}" default-value="false"
*/
protected boolean overWriteReleases;
/**
* Overwrite snapshot artifacts
- *
+ * @optional
+ * @since 1.0
* @parameter expression="${overWriteSnapshots}" default-value="false"
*/
protected boolean overWriteSnapshots;
/**
- * Overwrite snapshot artifacts
- *
+ * Overwrite artifacts that don't exist or are older than the source.
+ * @optional
+ * @since 2.0
* @parameter expression="${overWriteIfNewer}" default-value="true"
*/
protected boolean overWriteIfNewer;
-
- /**
- * Output absolute filename for resolved artifacts
- *
- * @parameter expression="${outputAbsoluteArtifactFilename}" default-value="false"
- */
- protected boolean outputAbsoluteArtifactFilename;
abstract protected ArtifactsFilter getMarkedArtifactFilter();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Thu Nov 9 19:03:48 2006
@@ -103,10 +103,19 @@
/**
* If the plugin should be silent.
- *
+ * @optional
+ * @since 2.0
* @parameter expression="${silent}" default-value="false"
*/
protected boolean silent;
+
+ /**
+ * Output absolute filename for resolved artifacts
+ * @optional
+ * @since 2.0
+ * @parameter expression="${outputAbsoluteArtifactFilename}" default-value="false"
+ */
+ protected boolean outputAbsoluteArtifactFilename;
private Log log;
@@ -159,7 +168,7 @@
{
try
{
- theLog.info( "Copying " + artifact.getAbsolutePath() + " to " + destFile );
+ theLog.info( "Copying " + (this.outputAbsoluteArtifactFilename ? artifact.getAbsolutePath() : artifact.getName()) + " to " + destFile );
FileUtils.copyFile( artifact, destFile );
result = true;
}
@@ -253,7 +262,7 @@
catch ( IOException e )
{
e.printStackTrace();
- throw new MojoExecutionException( "Error unpacking file: " + file + " to: " + location + "\r\n"
+ throw new MojoExecutionException( "Error unpacking file: " + (this.outputAbsoluteArtifactFilename ? file.getAbsolutePath() : file.getName()) + " to: " + location + "\r\n"
+ e.toString(), e );
}
catch ( ArchiverException e )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java Thu Nov 9 19:03:48 2006
@@ -33,14 +33,15 @@
*
* @parameter expression="${outputDirectory}"
* default-value="${project.build.directory}/dependency"
- * @required
+ * @optional
+ * @since 1.0
*/
protected File outputDirectory;
/**
* Place each type of file in a separate subdirectory. (example
* /outputDirectory/jars /outputDirectory/wars etc)
- *
+ * @since 2.0
* @parameter expression="${useSubDirectoryPerType}" default-value="false"
* @optional
*/
@@ -49,7 +50,7 @@
/**
* Place each file in a separate subdirectory. (example
* /outputDirectory/junit-junit-3.8.1)
- *
+ * @since 2.0
* @parameter expression="${useSubDirectoryPerArtifact}"
* default-value="false"
* @optional
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java Thu Nov 9 19:03:48 2006
@@ -36,6 +36,7 @@
* @requiresDependencyResolution compile
* @phase process-sources
* @author brianf
+ * @since 1.0
*/
public class CopyDependenciesMojo
extends AbstractFromDependenciesMojo
@@ -43,7 +44,7 @@
/**
* Strip artifact version during copy
- *
+ * @optional
* @parameter expression="${stripVersion}" default-value="false"
* @parameter
*/
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Thu Nov 9 19:03:48 2006
@@ -34,7 +34,7 @@
* re-resolve them.
*
* @author jdcasey
- *
+ * @since 2.0
* @goal purge-local-repository
* @aggregator
*
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java Thu Nov 9 19:03:48 2006
@@ -38,6 +38,7 @@
* @requiresDependencyResolution compile
* @phase process-sources
* @author brianf
+ * @since 1.0
*/
public class UnpackDependenciesMojo
extends AbstractFromDependenciesMojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Thu Nov 9 19:03:48 2006
@@ -44,20 +44,23 @@
*
* @parameter expression="${outputDirectory}"
* default-value="${project.build.directory}/dependency"
- * @required
+ * @optional
+ * @since 1.0
*/
protected File outputDirectory;
/**
* Overwrite release artifacts
- *
+ * @optional
+ * @since 1.0
* @parameter expression="${overWriteReleases}" default-value="false"
*/
protected boolean overWriteReleases;
/**
* Overwrite snapshot artifacts
- *
+ * @optional
+ * @since 1.0
* @parameter expression="${overWriteSnapshots}" default-value="true"
*/
protected boolean overWriteSnapshots;
@@ -65,10 +68,11 @@
/**
* Collection of ArtifactItems to work on. (ArtifactItem contains groupId,
* artifactId, version, type, location, destFile, markerFile and overwrite.)
- * See "How To Use" and "Javadoc" for details.
+ * See "Usage" and "Javadoc" for details.
*
* @parameter
* @required
+ * @since 1.0
*/
private ArrayList artifactItems;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java Thu Nov 9 19:03:48 2006
@@ -22,7 +22,7 @@
/**
* ArtifactItem represents information specified in the plugin configuration
* section for each artifact.
- *
+ * @since 1.0
* @author brianf
*/
public class ArtifactItem
@@ -88,6 +88,11 @@
* Force Overwrite
*/
private boolean doOverWrite;
+
+ /**
+ * Check Timestamp
+ */
+ private boolean doOverWriteIfNewer;
/**
* Artifact Item
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java Thu Nov 9 19:03:48 2006
@@ -30,7 +30,7 @@
* locations.
*
* @goal copy
- *
+ * @since 1.0
* @phase process-sources
* @author brianf
*/
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java Thu Nov 9 19:03:48 2006
@@ -29,7 +29,7 @@
/**
* Goal that retrieves a list of artifacts from the repository and unpacks them
* in a defined location.
- *
+ * @since 1.0
* @goal unpack
* @phase process-sources
* @author brianf
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java Thu Nov 9 19:03:48 2006
@@ -33,6 +33,7 @@
* @execute goal=resolve-plugins
* @requiresDependencyResolution test
* @author brianf
+ * @since 2.0
*/
public class GoOfflineMojo
extends AbstractResolveMojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java Thu Nov 9 19:03:48 2006
@@ -30,6 +30,7 @@
* @requiresDependencyResolution test
* @phase generate-sources
* @author brianf
+ * @since 2.0
*/
public class ResolveDependenciesMojo
extends AbstractResolveMojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java Thu Nov 9 19:03:48 2006
@@ -32,6 +32,7 @@
* @phase generate-sources
* @requiresDependencyResolution test
* @author brianf
+ * @since 2.0
*/
public class ResolveDependencySourcesMojo
extends AbstractResolveMojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Thu Nov 9 19:03:48 2006
@@ -37,6 +37,7 @@
* @goal resolve-plugins
* @phase generate-sources
* @author brianf
+ * @since 2.0
*/
public class ResolvePluginsMojo
extends AbstractResolveMojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt Thu Nov 9 19:03:48 2006
@@ -4,14 +4,14 @@
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
Copying Specific Artifacts
In copying specific artifacts, you need to bind the <<<dependency:copy>>>
mojo to a lifecycle, configure the plugin and specify the artifacts you
- want to copy. Just like the following:
+ want to copy. See the following example:
+---+
<project>
Copied: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt (from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copy-direct-dependencies.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt?view=diff&rev=473173&p1=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copy-direct-dependencies.apt&r1=472638&p2=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copy-direct-dependencies.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt Thu Nov 9 19:03:48 2006
@@ -1,16 +1,15 @@
------
- Copying Direct Dependencies
+ Copying Project Dependencies
------
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
-Copying Direct Dependencies
+Copying Project Dependencies
- Direct dependencies are the dependencies declared in your pom. To be able
- to copy them with their transitive dependencies, use the
+ Project dependencies are the dependencies declared in your pom. To copy them with their transitive dependencies, use the
<<<dependency:copy-dependencies>>> mojo and configure the plugin like
the sample below:
@@ -45,7 +44,7 @@
* Excluding Transitive Dependencies
- As mentioned, {{{http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html}transitive dependencies}} are copied by default. However, it
+ As mentioned, {{{http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html}transitive dependencies}} are copied by default. However, they
can also be excluded by setting the <<<excludeTransitive>>> property to
<<true>>.
Copied: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt (from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt?view=diff&rev=473173&p1=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking.apt&r1=472638&p2=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt Thu Nov 9 19:03:48 2006
@@ -1,16 +1,16 @@
------
- Unpacking the Copied Specific Artifacts
+ Unpacking Specific Artifacts
------
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
-Unpacking the Copied Specific Artifacts
+Unpacking Specific Artifacts
- This is pretty much alike with {{{copying-artifacts.html}Copying Specific Artifacts}}
- example. The difference is that the copied artifacts has been unpacked.
+ This is pretty similar to the {{{copying-artifacts.html}Copying Specific Artifacts}}
+ example. The difference is that instead of copying the artifacts, they are unpacked.
To unpack the copied artifacts, use the <<<dependency:unpack>>> mojo and
configure the plugin into something like the sample below:
@@ -54,7 +54,8 @@
</project>
+---+
- And after invoking <<<mvn package>>>, the copied artifacts are unpacked.
+ And after invoking <<<mvn package>>>, the artifacts are unpacked. Because checking the existence of an unpacked archive
+ is difficult to do reliably, marker files are used instead. The location of the marker files is controlled by the {{{unpack-dependencies-mojo.html#markersDirectory}markersDirectory}} parameter.
Copied: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt (from r472638, maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking-direct-dependencies.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt?view=diff&rev=473173&p1=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking-direct-dependencies.apt&r1=472638&p2=maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-unpacking-direct-dependencies.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt Thu Nov 9 19:03:48 2006
@@ -1,17 +1,17 @@
------
- Unpacking the Copied Direct Dependencies
+ Unpacking Project Dependencies
------
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
-Unpacking the Copied Direct Dependencies
+Unpacking Project Dependencies
- This is pretty much alike with {{{copy-direct-dependencies.html}Copying Direct Dependencies}}
- example. The difference is that the copied direct dependencies has been unpacked,
- including the transitive dependencies. To unpack the copied artifacts, use the
+ This is pretty similar to the {{{copying-project-dependencies.html}Copying Direct Dependencies}}
+ example. The difference is that the direct dependencies are unpacked,
+ including the transitive dependencies. To unpack the artifacts, use the
<<<dependency:unpack-dependencies>>> mojo and configure the dependency plugin
to something like the sample below:
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt Thu Nov 9 19:03:48 2006
@@ -4,7 +4,7 @@
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
Maven Dependency Plugin
@@ -23,7 +23,7 @@
the artifacts from remote repositories if they don't exist in local.
*{{{copy-dependencies-mojo.html}dependency:copy-dependencies}} takes the
- list of direct dependencies and optionally transitive dependencies and
+ list of project direct dependencies and optionally transitive dependencies and
copies them to a specified location, stripping the version if desired.
This goal can also be run from the command line.
@@ -32,11 +32,9 @@
*{{{unpack-dependencies-mojo.html}dependency:unpack-dependencies}} like
copy-dependencies but unpacks.
- *{{{resolve-mojo.html}dependency:resolve}} tells Maven to resolve test
- scope dependencies and displays the version.
+ *{{{resolve-mojo.html}dependency:resolve}} tells Maven to resolve all dependencies and displays the version.
- *{{{sources-mojo.html}dependency:sources}} tells Maven to resolve test
- scope dependencies and their source attachments, and displays the version.
+ *{{{sources-mojo.html}dependency:sources}} tells Maven to resolve all dependencies and their source attachments, and displays the version.
*{{{resolve-plugins-mojo.html}dependency:resolve-plugins}} Tells Maven to
resolve plugins and their dependencies.
@@ -45,7 +43,7 @@
everything this project is dependent on (dependencies, plugins, reports)
in preparation for going offline.
- *{{{purge-local-repository.html}dependency:purge-local-repository}} tells
+ *{{{purge-local-repository-mojo.html}dependency:purge-local-repository}} tells
Maven to clear all dependency-artifact files out of the local repository,
and optionally re-resolve them.
@@ -61,11 +59,11 @@
* {{{examples/copying-artifacts.html}Copying Specific Artifacts}}
- * {{{examples/copy-direct-dependencies.html}Copying Direct Dependencies}}
+ * {{{examples/copying-project-dependencies.html}Copying Project Dependencies}}
- * {{{examples/copying-unpacking.html}Unpacking the Copied Specific Artifacts}}
+ * {{{examples/unpacking-artifacts.html}Unpacking Specific Artifacts}}
- * {{{examples/copying-unpacking-direct-dependencies.html}Unpacking the Copied Direct Dependencies}}
+ * {{{examples/copying-project-dependencies.html}Unpacking the Project Dependencies}}
[]
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Thu Nov 9 19:03:48 2006
@@ -4,7 +4,7 @@
Allan Ramirez
Brian Fox
------
- July 2006
+ Nov 2006
------
Usage
@@ -16,17 +16,20 @@
in the specified location. Multiple artifacts can be defined in a single
execution. A default output directory is specified but can be overriden for
each ArtifactItem by setting the optional outputDirectory field. An
- optional new name can be set to rename while copying. The artifact version
- is optional. If not set, the plugin will attempt to resolve it from the
+ optional new name can be set to rename or the version stripped while copying.
+
+ The artifact version is optional. If not set, the plugin will attempt to resolve it from the
dependencyManagement section.
Artifacts are copied using the following rules:
* If the <<<artifactItem / overWrite>>> is set, use that value.
- * Releases use the <<<overWriteReleases>>> value (default = true)
+ * Releases use the <<<overWriteReleases>>> value (default = false)
* Snapshots use the <<<overWriteSnapshots>>> value (default = false)
+
+ * If none of the above is set, then it defaults to the <<<overWriteIfNewer>>> value (default = true)
[]
@@ -74,8 +77,7 @@
This goal can be bound to a lifecycle phase and configured in your <<<pom.xml>>>.
It will resolve the dependencies (including transitive dependencies) from
- the repository and place a copy in the specified location. All scopes are
- included by default, but it can be limited to a single scope.
+ the repository and place a copy in the specified location.
The artifacts can be placed in subfolders based on type. For example:
@@ -97,8 +99,16 @@
<<<mvn dependency:copy-dependencies -Dclassifer=sources>>> will try to find
the sources for all dependencies and copy them.
- By default, SNAPSHOTs are always overwritten, Releases are not. This can be
- changed via the optional parameters.
+ Also included is the ability to include or exclude by type (war, jar etc) and / or scope (runtime, test etc).
+
+ Artifacts are copied using the following rules:
+
+ * Releases use the <<<overWriteReleases>>> value (default = false)
+
+ * Snapshots use the <<<overWriteSnapshots>>> value (default = false)
+
+ * If none of the above is set, then it defaults to the <<<overWriteIfNewer>>> value (default = true)
+
The goal can also be launched from the command line like:
<<<mvn dependency:copy-dependencies [optional params]>>>
@@ -137,14 +147,15 @@
It will resolve the artifact from the repository and place a copy in the
specified location. Multiple artifacts can be defined in a single execution.
A default outputDirectory is specified but can be overriden for each
- ArtifactItem by setting the optional outputDirectory field. Artifacts are
- unpacked using the following rules:
+ ArtifactItem by setting the optional outputDirectory field.
- *If the <<<artifactItem.overWrite>>> is set, use that value.
+ Artifacts are unpacked using the following rules:
- *Releases use the <<<overWriteReleases>>> value (default = true)
+ * Releases use the <<<overWriteReleases>>> value (default = false)
- *Snapshots use the <<<overWriteSnapshots>>> value (default = false)
+ * Snapshots use the <<<overWriteSnapshots>>> value (default = false)
+
+ * If none of the above is set, then it defaults to the <<<overWriteIfNewer>>> value (default = true)
The artifact version is optional. If not set, the plugin will attempt to
resolve from the dependencyManagement section.
@@ -180,8 +191,7 @@
This goal can be bound to a lifecycle and configured in your pom.xml.
It will resolve the dependencies (including transitive dependencies) from
- the repository and unpack them to the specified location. All scopes are
- included by default, but it can be limited to a single scope.
+ the repository and unpack them to the specified location.
Unpack-dependencies includes transitive dependencies by default. To include
only direct dependencies, set the excludeTransitive parameter to true.
@@ -208,10 +218,17 @@
resolve artifacts with the classifer and type. For example:
<<<mvn dependency:unpack-dependencies -Dclassifer=sources>>> will try to find
the sources for all dependencies and unpack them.
+
+ Also included is the ability to include or exclude by type (war, jar etc) and / or scope (runtime, test etc).
+
+ Artifacts are copied using the following rules:
- By default, SNAPSHOTs are always overwritten, Releases are not. This can be
- changed via the optional parameters.
- s
+ * Releases use the <<<overWriteReleases>>> value (default = false)
+
+ * Snapshots use the <<<overWriteSnapshots>>> value (default = false)
+
+ * If none of the above is set, then it defaults to the <<<overWriteIfNewer>>> value (default = true)
+
The goal can also be launched from the command line like:
<<<mvn dependency:unpack-dependencies [optional params]>>>
@@ -271,7 +288,12 @@
attachments if they exist. This is useful when you want the source
attachments downloaded to your local repository and
you don't want to use the eclipse plugin to do this since the eclipse plugin
- creates/overwrites the eclipse files.
+ creates/overwrites the eclipse files.
+
+ You can also define the <<<markersDirectory>>> either in the pom or settings
+ to be a common location for all projects. This allows the system to resolve sources faster for dependencies that don't
+ have the sources published. The plugin will store a marker file to describe if the sources where resolved or not. By placing
+ them in a common location, multiple attempts to resolve non-existent sources will be avoided.
* The <<<dependency:resolve-plugins>>> mojo
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml Thu Nov 9 19:03:48 2006
@@ -28,9 +28,9 @@
</menu>
<menu name="Examples">
<item name="Copying Specific Artifacts" href="examples/copying-artifacts.html" />
- <item name="Copying Direct Dependencies" href="examples/copy-direct-dependencies.html" />
- <item name="Unpacking the Copied Specific Artifacts" href="examples/copying-unpacking.html" />
- <item name="Unpacking the Copied Direct Dependencies" href="examples/copying-unpacking-direct-dependencies.html" />
+ <item name="Copying Project Dependencies" href="examples/copying-project-dependencies.html" />
+ <item name="Unpacking Specific Artifacts" href="examples/unpacking-artifacts.html" />
+ <item name="Unpacking the Project Dependencies" href="examples/unpacking-project-dependencies.html" />
</menu>
<menu name="Resources">
<item name="Dependency Mechanism" href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html" />
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java?view=diff&rev=473173&r1=473172&r2=473173
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java Thu Nov 9 19:03:48 2006
@@ -6,7 +6,6 @@
import org.apache.maven.plugin.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.CollectionUtils;
public class TestDependencyStatusSets
extends AbstractDependencyMojoTestCase