Author: brett
Date: Mon Oct 3 22:25:40 2005
New Revision: 293535
URL: http://svn.apache.org/viewcvs?rev=293535&view=rev
Log:
PR: MNG-818
allow a certain artifact type to designate it includes its dependencies
already, disabling transitivity
Added:
maven/components/trunk/maven-core-it/it0080/
maven/components/trunk/maven-core-it/it0080/expected-results.txt (with
props)
maven/components/trunk/maven-core-it/it0080/goals.txt (with props)
maven/components/trunk/maven-core-it/it0080/pom.xml (with props)
maven/components/trunk/maven-core-it/it0080/test-component-a/ (with props)
maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-a/src/
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-b/ (with props)
maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-b/src/
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-c/ (with props)
maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml
(with props)
maven/components/trunk/maven-core-it/it0080/test-component-c/src/
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
(with props)
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-core-it/it0078/ (props changed)
maven/components/trunk/maven-plugin-parameter-documenter/ (props changed)
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
Mon Oct 3 22:25:40 2005
@@ -31,4 +31,6 @@
String getClassifier();
String getPackaging();
+
+ boolean isIncludesDependencies();
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
Mon Oct 3 22:25:40 2005
@@ -17,7 +17,7 @@
*/
/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id: AbstractArtifactHandler.java 189871 2005-06-10 00:57:19Z
brett $
*/
public class DefaultArtifactHandler
@@ -33,6 +33,8 @@
private String packaging;
+ private boolean includesDependencies;
+
public DefaultArtifactHandler()
{
}
@@ -77,5 +79,10 @@
packaging = type;
}
return packaging;
+ }
+
+ public boolean isIncludesDependencies()
+ {
+ return includesDependencies;
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Mon Oct 3 22:25:40 2005
@@ -94,6 +94,17 @@
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<type>war</type>
+ <includesDependencies>true</includesDependencies>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>ear</role-hint>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>ear</type>
+ <includesDependencies>true</includesDependencies>
</configuration>
</component>
Modified: maven/components/trunk/maven-core-it/README.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Mon Oct 3 22:25:40 2005
@@ -217,6 +217,9 @@
it0079: Test that source attachments have the same build number as the main
artifact when deployed.
+it0080: Test that depending on a WAR doesn't also get its dependencies
+ transitively.
+
-------------------------------------------------------------------------------
- generated sources
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Mon Oct 3
22:25:40 2005
@@ -1,3 +1,4 @@
+it0080
it0079
it0078
it0077
Propchange: maven/components/trunk/maven-core-it/it0078/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 3 22:25:40 2005
@@ -0,0 +1,2 @@
+log.txt
+target
Added: maven/components/trunk/maven-core-it/it0080/expected-results.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/expected-results.txt?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0080/expected-results.txt Mon Oct 3
22:25:40 2005
@@ -0,0 +1,7 @@
+test-component-a/target/test-component-a-0.1.jar
+test-component-b/target/test-component-b-0.1.war
+test-component-b/target/test-component-b-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar
+test-component-c/target/test-component-c-0.1.ear
+test-component-c/target/test-component-c-0.1.ear!/test-component-b-0.1.war
+test-component-c/target/test-component-c-0.1/test-component-b-0.1.war
+!test-component-c/target/test-component-c-0.1/test-component-a-0.1.jar
Propchange: maven/components/trunk/maven-core-it/it0080/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0080/goals.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/goals.txt?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0080/goals.txt Mon Oct 3 22:25:40
2005
@@ -0,0 +1 @@
+package
Propchange: maven/components/trunk/maven-core-it/it0080/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0080/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/pom.xml?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0080/pom.xml Mon Oct 3 22:25:40 2005
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>test-components</artifactId>
+ <version>0.1</version>
+ <name>Test Components</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>test-component-c</module>
+ <module>test-component-b</module>
+ <module>test-component-a</module>
+ </modules>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0080/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-a/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 3 22:25:40 2005
@@ -0,0 +1 @@
+target
Added: maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml Mon
Oct 3 22:25:40 2005
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-a</artifactId>
+ <version>0.1</version>
+ <name>Test Component A</name>
+ <packaging>jar</packaging>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-a/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java?rev=293535&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
(added)
+++
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
Mon Oct 3 22:25:40 2005
@@ -0,0 +1,3 @@
+public class A {
+}
+
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-a/src/main/java/A.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-b/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 3 22:25:40 2005
@@ -0,0 +1 @@
+target
Added: maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml Mon
Oct 3 22:25:40 2005
@@ -0,0 +1,22 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-b</artifactId>
+ <version>0.1</version>
+ <name>Test Component B</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test-component-a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-b/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java?rev=293535&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
(added)
+++
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
Mon Oct 3 22:25:40 2005
@@ -0,0 +1,5 @@
+public class B
+ extends A
+{
+}
+
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/java/B.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml?rev=293535&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
(added)
+++
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
Mon Oct 3 22:25:40 2005
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app >
+</web-app>
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-b/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-c/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 3 22:25:40 2005
@@ -0,0 +1 @@
+target
Added: maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml?rev=293535&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml Mon
Oct 3 22:25:40 2005
@@ -0,0 +1,23 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-c</artifactId>
+ <version>0.1</version>
+ <name>Test Component C</name>
+ <packaging>ear</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test-component-b</artifactId>
+ <version>0.1</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0080/test-component-c/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java?rev=293535&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
(added)
+++
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
Mon Oct 3 22:25:40 2005
@@ -0,0 +1,5 @@
+public class C
+ extends A
+{
+}
+
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it0080/test-component-c/src/main/java/C.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/components/trunk/maven-plugin-parameter-documenter/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 3 22:25:40 2005
@@ -0,0 +1 @@
+target
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=293535&r1=293534&r2=293535&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Mon Oct 3 22:25:40 2005
@@ -185,10 +185,14 @@
}
else
{
- // TODO: we could possibly use p.getDependencyArtifacts
instead of this call, but they haven't been filtered
- // or used the inherited scope (should that be passed to the
buildFromRepository method above?)
- Set artifacts = project.createArtifacts( artifactFactory,
artifact.getScope(),
+ Set artifacts = Collections.EMPTY_SET;
+ if ( !artifact.getArtifactHandler().isIncludesDependencies() )
+ {
+ // TODO: we could possibly use p.getDependencyArtifacts
instead of this call, but they haven't been filtered
+ // or used the inherited scope (should that be passed to
the buildFromRepository method above?)
+ artifacts = project.createArtifacts( artifactFactory,
artifact.getScope(),
artifact.getDependencyFilter() );
+ }
List repositories = aggregateRepositoryLists(
remoteRepositories,
project.getRemoteArtifactRepositories() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
