You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/03/23 01:11:36 UTC
svn commit: r521543 [1/2] - in /maven/components/trunk:
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
maven-embedder/ maven-project/src/test/java/org/apache/maven/pro...
Author: jvanzyl
Date: Thu Mar 22 17:11:31 2007
New Revision: 521543
URL: http://svn.apache.org/viewvc?view=rev&rev=521543
Log:
o bits for mng-1577
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java (with props)
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (with props)
maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/p0/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml (with props)
Modified:
maven/components/trunk/maven-embedder/pom.xml
Added: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java (added)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,39 @@
+package org.apache.maven.artifact.resolver;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * Do not use!
+ *
+ * Should only be implmemented by DebugResolutionListener. Remove this
+ * when the ResolutionListener interface deprecation of the manageArtifact
+ * method (and the [yet to be done] addition of these methods to that
+ * interface) has had a chance to propagate to all interested plugins.
+ *
+ * @deprecated
+ */
+public interface ResolutionListenerForDepMgmt
+{
+ void manageArtifactVersion( Artifact artifact, Artifact replacement );
+
+ void manageArtifactScope( Artifact artifact, Artifact replacement );
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (added)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,52 @@
+package org.apache.maven.artifact.versioning;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Iterator;
+
+public class ManagedVersionMap extends HashMap
+{
+ public ManagedVersionMap(Map map)
+ {
+ super();
+ if (map != null)
+ {
+ putAll(map);
+ }
+ }
+
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("ManagedVersionMap\n");
+ Iterator iter = this.keySet().iterator();
+ while (iter.hasNext())
+ {
+ String key = (String)iter.next();
+ buffer.append(key).append("=").append(get(key));
+ if (iter.hasNext())
+ {
+ buffer.append("\n");
+ }
+ }
+ return buffer.toString();
+ }
+}
Propchange: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=521543&r1=521542&r2=521543
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Thu Mar 22 17:11:31 2007
@@ -71,6 +71,7 @@
</execution>
</executions>
</plugin>
+ <!--
<plugin>
<artifactId>minijar-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
@@ -88,16 +89,15 @@
<exclude>jmock:jmock</exclude>
<exclude>xml-apis:xml-apis</exclude>
</excludes>
- <!--
<dependenciesToHide>
<dependencyHide>org.codehaus.plexus:plexus-utils</dependencyHide>
<dependencyHide>jdom:jdom</dependencyHide>
</dependenciesToHide>
- -->
</configuration>
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
<dependencies>
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,83 @@
+package org.apache.maven.project.inheritance.t04;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Set;
+import java.util.Iterator;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * Verifies the version of a dependency listed in a parent's
+ * dependencyManagement section is chosen over another version of the same
+ * dependency, listed transitively.
+ *
+ * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // p1 has a depMgmt section that specifies versions 1.0 of jars "a" & "b"
+ // jar "a" has a transitive dependency on 2.0 of jar "b", but maven should
+ // prefer to use version 1.0.
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagementOverridesTransitiveDependencyVersion()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom0Basedir = pom0.getParentFile();
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load the child project, which inherits from p0...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ Set set = project1.getArtifacts();
+ assertNotNull("No artifacts", set);
+ assertTrue("No Artifacts", set.size() > 0);
+ assertTrue("Set size should be 3, is " + set.size(), set.size() == 3);
+
+ Iterator iter = set.iterator();
+ while (iter.hasNext()) {
+ Artifact artifact = (Artifact)iter.next();
+ System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
+ " Optional=" + (artifact.isOptional() ? "true" : "false"));
+ assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ }
+
+ }
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,79 @@
+package org.apache.maven.project.inheritance.t05;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Set;
+import java.util.Iterator;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * A test which demonstrates maven's dependency management
+ *
+ * @author <a href="rgoers@apache.org">Ralph Goers</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagement()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+
+ File pom0Basedir = pom0.getParentFile();
+
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load everything...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ Set set = project1.getArtifacts();
+ assertNotNull("No artifacts", set);
+ assertTrue("No Artifacts", set.size() > 0);
+ Iterator iter = set.iterator();
+
+ while (iter.hasNext())
+ {
+ Artifact artifact = (Artifact)iter.next();
+ System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " +
+ artifact.getVersion() + " Scope: " + artifact.getScope());
+ assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ }
+
+ }
+}
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,80 @@
+package org.apache.maven.project.inheritance.t06;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Set;
+import java.util.Iterator;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * A test which demonstrates maven's dependency management
+ *
+ * @author <a href="rgoers@apache.org">Ralph Goers</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagement()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+
+ File pom0Basedir = pom0.getParentFile();
+
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load everything...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ Set set = project1.getArtifacts();
+ assertNotNull("No artifacts", set);
+ assertTrue("No Artifacts", set.size() > 0);
+ Iterator iter = set.iterator();
+ assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
+
+ while (iter.hasNext())
+ {
+ Artifact artifact = (Artifact)iter.next();
+ System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
+ " Optional=" + (artifact.isOptional() ? "true" : "false"));
+ assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ }
+
+ }
+}
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,91 @@
+package org.apache.maven.project.inheritance.t07;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.List;
+import java.util.Set;
+import java.util.Iterator;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.MailingList;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.logging.LoggerManager;
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * A test which demonstrates maven's dependency management
+ *
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagement()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+
+ File pom0Basedir = pom0.getParentFile();
+
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load everything...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ System.out.println("Project " + project1.getId() + " " + project1);
+ Set set = project1.getArtifacts();
+ assertNotNull("No artifacts", set);
+ assertTrue("No Artifacts", set.size() > 0);
+ Iterator iter = set.iterator();
+ assertTrue("Set size should be 3, is " + set.size(), set.size() == 3);
+
+ while (iter.hasNext())
+ {
+ Artifact artifact = (Artifact)iter.next();
+ assertFalse("", artifact.getArtifactId().equals("maven-test-d"));
+ System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
+ " Optional=" + (artifact.isOptional() ? "true" : "false"));
+ assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ }
+
+ }
+}
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,81 @@
+package org.apache.maven.project.inheritance.t08;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Set;
+import java.util.Iterator;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * A test which demonstrates maven's dependency management
+ *
+ * @author <a href="rgoers@apache.org">Ralph Goers</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagement()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+
+ File pom0Basedir = pom0.getParentFile();
+
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load everything...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ System.out.println("Project " + project1.getId() + " " + project1);
+ Set set = project1.getArtifacts();
+ assertNotNull("No artifacts", set);
+ assertTrue("No Artifacts", set.size() > 0);
+ Iterator iter = set.iterator();
+ assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
+
+ while (iter.hasNext())
+ {
+ Artifact artifact = (Artifact)iter.next();
+ System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
+ " Optional=" + (artifact.isOptional() ? "true" : "false"));
+ assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ }
+
+ }
+}
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,131 @@
+package org.apache.maven.project.inheritance.t09;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Iterator;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.MailingList;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.logging.LoggerManager;
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * Verifies exclusions listed in dependencyManagement are valid for
+ * transitive dependencies.
+ *
+ * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ /**
+ * How the test project is set up:
+ *
+ * 1. dependencyManagement lists dependencies on a & b,
+ * with an exclusion on c in b.
+ * 2. the child project lists a dependency on project a only
+ * 3. a depends on b (which is transitive to the child project),
+ * and b depends on c.
+ *
+ * We should see that the resulting size of collected artifacts is two:
+ * a & b only.
+ */
+ public void testDependencyManagementExclusionsExcludeTransitively()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom0Basedir = pom0.getParentFile();
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load the child project, which inherits from p0...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ Map map = project1.getArtifactMap();
+
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 2, is " + map.size(), map.size() == 2);
+
+ assertTrue("maven-test:t09-a is not in the project", map.containsKey( "maven-test:t09-a" ));
+ assertTrue("maven-test:t09-b is not in the project", map.containsKey( "maven-test:t09-b" ));
+
+ }
+
+ /**
+ * Setup exactly the same as the above test, except that the child project
+ * now depends upon d, which has a transitive dependency on c. Even though
+ * we did list an exclusion on c, it was only from within the context of
+ * project b. We will pick up project c in this case because no
+ * restrictions were placed on d. This demonstrates that a, b, c, & d will
+ * all be collected.
+ *
+ * @throws Exception
+ */
+ public void testDependencyManagementExclusionDoesNotOverrideGloballyForTransitives()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom0Basedir = pom0.getParentFile();
+ File pom2 = new File( pom0Basedir, "p2/pom.xml" );
+
+ // load the child project, which inherits from p0...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project2 = getProjectWithDependencies( pom2 );
+
+ assertEquals( pom0Basedir, project2.getParent().getBasedir() );
+ Map map = project2.getArtifactMap();
+ assertNotNull( "No artifacts", map );
+ assertTrue( "No Artifacts", map.size() > 0 );
+ assertTrue( "Set size should be 4, is " + map.size(), map.size() == 4 );
+
+ assertTrue( "maven-test:t09-a is not in the project", map.containsKey( "maven-test:t09-a" ) );
+ assertTrue( "maven-test:t09-b is not in the project", map.containsKey( "maven-test:t09-b" ) );
+ assertTrue( "maven-test:t09-c is not in the project", map.containsKey( "maven-test:t09-c" ) );
+ assertTrue( "maven-test:t09-d is not in the project", map.containsKey( "maven-test:t09-d" ) );
+ }
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (added)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Thu Mar 22 17:11:31 2007
@@ -0,0 +1,105 @@
+package org.apache.maven.project.inheritance.t10;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Iterator;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.MailingList;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.logging.LoggerManager;
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * Verifies scope inheritence of direct and transitive dependencies.
+ *
+ * Should show three behaviors:
+ *
+ * 1. dependencyManagement should override the scope of transitive dependencies.
+ * 2. Direct dependencies should override the scope of dependencyManagement.
+ * 3. Direct dependencies should inherit scope from dependencyManagement when
+ * they do not explicitly state a scope.
+ *
+ * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testDependencyManagementOverridesTransitiveDependencyVersion()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom0Basedir = pom0.getParentFile();
+ File pom1 = new File( pom0Basedir, "p1/pom.xml" );
+
+ // load the child project, which inherits from p0...
+ MavenProject project0 = getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
+ System.out.println("Project " + project1.getId() + " " + project1);
+ Map map = project1.getArtifactMap();
+ assertNotNull("No artifacts", map);
+ assertTrue("No Artifacts", map.size() > 0);
+ assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
+
+ Artifact a = (Artifact) map.get("maven-test:t10-a");
+ Artifact b = (Artifact) map.get("maven-test:t10-b");
+ Artifact c = (Artifact) map.get("maven-test:t10-c");
+
+ assertNotNull( a );
+ assertNotNull( b );
+ assertNotNull( c );
+
+ // inherited from depMgmt
+ assertTrue("Incorrect scope for " + a.getDependencyConflictId(), a.getScope().equals("test"));
+
+ // transitive dep, overridden b depMgmt
+ assertTrue("Incorrect scope for " + b.getDependencyConflictId(), b.getScope().equals("runtime"));
+
+ // direct dep, overrides depMgmt
+ assertTrue("Incorrect scope for " + c.getDependencyConflictId(), c.getScope().equals("runtime"));
+
+ }
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml Thu Mar 22 17:11:31 2007
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <name>Maven</name>
+ <version>2.0-SNAPSHOT</version>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>maven-test-b</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plexus-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <plexusConfiguration>src/conf/plexus.conf</plexusConfiguration>
+ <plexusConfigurationPropertiesFile>src/conf/plexus.properties</plexusConfigurationPropertiesFile>
+ <plexusApplicationName>Continuum</plexusApplicationName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>plexus:runtime</goal>
+ </goals>
+ <configuration>
+ <plexusApplicationName>ContinuumPro</plexusApplicationName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-a</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Fake Maven Central Repository</name>
+ <url>file://dummy</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-b</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-b</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-b</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-c</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-b</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml Thu Mar 22 17:11:31 2007
@@ -0,0 +1,41 @@
+<project>
+ <parent>
+ <artifactId>p0</artifactId>
+ <groupId>maven-t04</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-t04</groupId>
+ <artifactId>p1</artifactId>
+ <packaging>pom</packaging>
+ <name>p1</name>
+ <version>1.0</version>
+ <scm>
+ <url>scm-url</url>
+ </scm>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-a</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-c</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks><echo>${project.parent.basedir}</echo></tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml Thu Mar 22 17:11:31 2007
@@ -0,0 +1,37 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-t04</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <name>p0</name>
+ <version>1.0</version>
+ <organization>
+ <name>Codehaus</name>
+ </organization>
+
+ <dependencyManagement>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-a</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-b</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-c</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar Thu Mar 22 17:11:31 2007
@@ -0,0 +1 @@
+foo
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,23 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-a</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Fake Maven Central Repository</name>
+ <url>file://dummy</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,23 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-a</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0</version>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Fake Maven Central Repository</name>
+ <url>file://dummy</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,24 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-c</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,24 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-c</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,24 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-c</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-c</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom Thu Mar 22 17:11:31 2007
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2</version>
+</project>
\ No newline at end of file
Added: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml?view=auto&rev=521543
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml Thu Mar 22 17:11:31 2007
@@ -0,0 +1,54 @@
+<project>
+ <parent>
+ <artifactId>p0</artifactId>
+ <groupId>maven-t05</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-t05</groupId>
+ <artifactId>p1</artifactId>
+ <packaging>pom</packaging>
+ <name>p1</name>
+ <version>1.0</version>
+ <scm>
+ <url>scm-url</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-b</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-d</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-a</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t05-c</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks><echo>${project.parent.basedir}</echo></tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"