Author: hboutemy
Date: Sun May 12 14:17:42 2013
New Revision: 1481566
URL: http://svn.apache.org/r1481566
Log:
[MDEP-266] copy-dependencies also copies optional dependencies
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/verify.bsh
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/pom.xml?rev=1481566&r1=1481565&r2=1481566&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/pom.xml
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/pom.xml
Sun May 12 14:17:42 2013
@@ -57,7 +57,7 @@
<version>2.0.6</version>
<classifier>javadoc</classifier>
</dependency>
- <dependency>
+ <dependency><!-- exclusions -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>2.0.6</version>
@@ -72,6 +72,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency><!-- optional -->
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.6</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<properties>
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/verify.bsh?rev=1481566&r1=1481565&r2=1481566&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/verify.bsh
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/verify.bsh
Sun May 12 14:17:42 2013
@@ -39,6 +39,8 @@ String[] expectedFiles = {
"plexus-utils-1.4.1.pom",
"maven-model-2.0.6-sources.jar",
"maven-model-2.0.6-javadoc.jar",
+ "maven-artifact-2.0.6.jar",
+ "maven-artifact-2.0.6.pom",
"maven-settings-2.0.6.jar",
"maven-settings-2.0.6.pom"
};