You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/04/01 21:31:51 UTC
svn commit: r643528 - in
/maven/components/branches/maven-2.0.x/maven-project/src:
main/java/org/apache/maven/project/inheritance/
test/java/org/apache/maven/project/inheritance/t13/
test/resources/inheritance-repo/t13/ test/resources/inheritance-repo/...
Author: jdcasey
Date: Tue Apr 1 12:31:46 2008
New Revision: 643528
URL: http://svn.apache.org/viewvc?rev=643528&view=rev
Log:
[MNG-3494] Inverting ordering of dependencies to make child dependencies listed ahead of parent dependencies, so n-level transitive deps from child dependencies win in conflict resolution when everything but ordering is equal.
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java (with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml (with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml (with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.jar
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom (with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.jar
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom (with props)
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=643528&r1=643527&r2=643528&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Tue Apr 1 12:31:46 2008
@@ -248,7 +248,7 @@
{
Map depsMap = new LinkedHashMap();
- List deps = parent.getDependencies();
+ List deps = child.getDependencies();
if ( deps != null )
{
@@ -259,7 +259,7 @@
}
}
- deps = child.getDependencies();
+ deps = parent.getDependencies();
if ( deps != null )
{
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java Tue Apr 1 12:31:46 2008
@@ -0,0 +1,97 @@
+package org.apache.maven.project.inheritance.t13;
+
+/*
+ * 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;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Verifies that plugin execution sections in the parent POM that have
+ * inherit == false are not inherited to the child POM.
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ protected ArtifactRepository getLocalRepository()
+ throws Exception
+ {
+ ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
+ "default" );
+
+ ArtifactRepository r = new DefaultArtifactRepository( "local",
+ "file://" + getLocalRepositoryPath().getAbsolutePath() + "/repo",
+ repoLayout );
+
+ return r;
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // p1 inherits from p0
+ // p0 inherits from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testChildDependenciesAddedAheadOfParentDependencies()
+ 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" );
+
+ getProjectWithDependencies( pom0 );
+ MavenProject project1 = getProjectWithDependencies( pom1 );
+
+ List dependencies = project1.getDependencies();
+
+ assertNotNull( "Must contain dependencies.", dependencies );
+ assertEquals( "Must contain 2 dependencies.", 2, dependencies.size() );
+
+ Dependency dep1 = (Dependency) dependencies.get( 0 );
+ assertEquals( "Child dependency should be listed first.", "test-from-child", dep1.getArtifactId() );
+
+ Dependency dep2 = (Dependency) dependencies.get( 1 );
+ assertEquals( "Parent dependency should be listed last.", "test-from-parent", dep2.getArtifactId() );
+
+ List compileArtifacts = project1.getCompileArtifacts();
+ assertNotNull( "Must contain compile-scoped artifacts.", compileArtifacts );
+ assertEquals( "Must contain 2 compile-scoped artifacts.", 2, compileArtifacts.size() );
+
+ Artifact artifact1 = (Artifact) compileArtifacts.get( 0 );
+ assertEquals( "Child dependency should be listed first in compile-scoped artifacts list.", "test-from-child", artifact1.getArtifactId() );
+
+ Artifact artifact2 = (Artifact) compileArtifacts.get( 1 );
+ assertEquals( "Parent dependency should be listed last in compile-scoped artifacts list.", "test-from-parent", artifact2.getArtifactId() );
+ }
+}
\ No newline at end of file
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml Tue Apr 1 12:31:46 2008
@@ -0,0 +1,18 @@
+<project>
+ <parent>
+ <artifactId>p0</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>p1</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-child</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml Tue Apr 1 12:31:46 2008
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-parent</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.jar
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.jar?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.jar (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.jar Tue Apr 1 12:31:46 2008
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-parent</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom Tue Apr 1 12:31:46 2008
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>tests</groupId>
+ <artifactId>test-from-child</artifactId>
+ <version>1</version>
+
+</project>
\ No newline at end of file
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/1/test-from-child-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.jar
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.jar?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.jar (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.jar Tue Apr 1 12:31:46 2008
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-parent</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom?rev=643528&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom (added)
+++ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom Tue Apr 1 12:31:46 2008
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>tests</groupId>
+ <artifactId>test-from-parent</artifactId>
+ <version>1</version>
+
+</project>
\ No newline at end of file
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-parent/1/test-from-parent-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"