Author: brianf
Date: Tue Jan 2 18:26:41 2007
New Revision: 492016
URL: http://svn.apache.org/viewvc?view=rev&rev=492016
Log:
updated site and fixed linux test failure
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.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=492016&r1=492015&r2=492016
==============================================================================
---
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
Tue Jan 2 18:26:41 2007
@@ -83,7 +83,7 @@
protected String includeScope;
/**
- * Scope to exclude. An Empty string indicates no scopes (default).
+ * Scope to exclude. An Empty string indicates no scopes (default).
Ignored if includeScope is used.
*
* @since 2.0
* @parameter expression="${excludeScope}" default-value=""
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=492016&r1=492015&r2=492016
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Tue Jan
2 18:26:41 2007
@@ -21,7 +21,7 @@
Allan Ramirez
Brian Fox
------
- Nov 2006
+ Jan 2007
------
Usage
@@ -50,15 +50,7 @@
The artifact version is optional. If not set, the plugin will attempt to
resolve it from the
project dependencies and then 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 = false)
-
- * Snapshots use the <<<overWriteSnapshots>>> value (default = false)
-
- * If none of the above is set, then it defaults to the
<<<overWriteIfNewer>>> value (default = true)
+ See the {{#Overwrite Rules}} section for rules about how overwriting is
handled.
[]
@@ -130,13 +122,7 @@
Also included is the ability to include or exclude by type (war, jar
etc), scope (runtime, test, etc), classifier (jdk14, sources, etc) or a
combination of all three.
- 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)
+ See the {{#Overwrite Rules}} section for rules about how overwriting is
handled.
The goal can also be launched from the command line like:
@@ -178,13 +164,7 @@
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:
-
- * 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)
+ See the {{#Overwrite Rules}} section for rules about how overwriting is
handled.
The artifact version is optional. If not set, the plugin will attempt to
resolve it from the
project dependencies and then the dependencyManagement section.
@@ -250,13 +230,7 @@
Also included is the ability to include or exclude by type (war, jar etc),
scope (runtime, test, etc), classifier (jdk14, sources, etc) or a combination
of all three.
- 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)
+ See the {{#Overwrite Rules}} section for rules about how overwriting is
handled.
The goal can also be launched from the command line like:
<<<mvn dependency:unpack-dependencies [optional params]>>>
@@ -287,6 +261,26 @@
[...]
</project>
+---+
+
+* {Overwrite Rules}
+
+ Artifacts are copied or unpacked using the following rules:
+
+ * If the artifact doesn't exist in the destination, then copy/unpack it.
+
+ Otherwise:
+
+ * For copy/unpack mojo only: if <<<artifactItem / overWrite>>> or
<<<overWrite>>> is true, then it will force an overwrite.
+
+ * Releases check the <<<overWriteReleases>>> value (default = false). If
true, then it will force an overwrite.
+
+ * Snapshots check the <<<overWriteSnapshots>>> value (default = false).
If true, then it will force an overwrite.
+
+ * If none of the above is set to true, then it defaults to the
<<<overWriteIfNewer>>> value (default = true). This value, if true, causes
+ the plugin to only copy if the source is newer than the destination (or
it doesn't exist in the destination). (for unpack, this checks the existence of
the marker file, created in the <<<markersDirectory>>> path.
+ To avoid unexpected behavior after <<<mvn clean>>>, this path should
normally be contained within the <<</target>>> hierarchy.)
+
+
* The <<<dependency:resolve>>> mojo
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?view=diff&rev=492016&r1=492015&r2=492016
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Tue Jan 2 18:26:41 2007
@@ -500,6 +500,9 @@
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
+
+ //go back 10 more seconds for linux
+ time-=10000;
// set to known value
unpackedFile.setLastModified( time );
