diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java new file mode 100644 index 0000000000..6e7aff2aec --- /dev/null +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java @@ -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 diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java new file mode 100644 index 0000000000..eb782e7981 --- /dev/null +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java @@ -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(); + } +} diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index e8552e12d6..7d8e09dc63 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -71,6 +71,7 @@ under the License. + + --> diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java new file mode 100644 index 0000000000..294d1db1e2 --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java @@ -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 Patrick Schneider + * @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 diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java new file mode 100644 index 0000000000..a0adb4863d --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java @@ -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 Ralph Goers + * @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")); + } + + } +} diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java new file mode 100644 index 0000000000..2fe65165aa --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java @@ -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 Ralph Goers + * @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")); + } + + } +} diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java new file mode 100644 index 0000000000..5fc0831121 --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java @@ -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 Jason van Zyl + * @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")); + } + + } +} diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java new file mode 100644 index 0000000000..94a021ddc6 --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java @@ -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 Ralph Goers + * @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")); + } + + } +} diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java new file mode 100644 index 0000000000..088a27b1be --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java @@ -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 Patrick Schneider + * @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 diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java new file mode 100644 index 0000000000..af71eb31fc --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java @@ -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 Patrick Schneider + * @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 diff --git a/maven-project/src/test/resources/dependencyManagement-pom.xml b/maven-project/src/test/resources/dependencyManagement-pom.xml new file mode 100644 index 0000000000..0ac9b461d7 --- /dev/null +++ b/maven-project/src/test/resources/dependencyManagement-pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + maven + maven-core + Maven + 2.0-SNAPSHOT + + + + maven-test + maven-test-b + 1.0 + + + + + + + maven-plexus-plugin + 1.0 + + src/conf/plexus.conf + src/conf/plexus.properties + Continuum + + + + + plexus:runtime + + + ContinuumPro + + + + + + + diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom new file mode 100644 index 0000000000..5ca34c3a2e --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom @@ -0,0 +1,21 @@ + + 4.0.0 + maven-test + t04-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t04-b + 2.0 + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom new file mode 100644 index 0000000000..4c311ab133 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom new file mode 100644 index 0000000000..d24e3bc1f5 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 2.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom new file mode 100644 index 0000000000..bef2488ba4 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom new file mode 100644 index 0000000000..d24e3bc1f5 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 2.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml new file mode 100644 index 0000000000..c25fc3e738 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml @@ -0,0 +1,41 @@ + + + p0 + maven-t04 + 1.0 + + 4.0.0 + maven-t04 + p1 + pom + p1 + 1.0 + + scm-url + + + + + + maven-test + t04-a + + + + maven-test + t04-c + 1.0 + + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml new file mode 100644 index 0000000000..1b02dc2c0c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + maven-t04 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + + + + maven-test + t04-a + 1.0 + + + + maven-test + t04-b + 1.0 + + + + maven-test + t04-c + 2.0 + + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom new file mode 100644 index 0000000000..a1b8cb9b11 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + t05-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t05-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom new file mode 100644 index 0000000000..097101e81f --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + t05-a + jar + 2.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t05-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom new file mode 100644 index 0000000000..e0490ff73b --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t05-b + jar + 1.0 + + + maven-test + t05-c + 1.0 + jar + compile + + + maven-test + t05-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom new file mode 100644 index 0000000000..ff59f5d2b7 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t05-b + jar + 1.1 + + + maven-test + t05-c + 1.0 + jar + compile + + + maven-test + t05-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom new file mode 100644 index 0000000000..79370ec4f0 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t05-b + jar + 2.0 + + + maven-test + t05-c + 1.0 + jar + compile + + + maven-test + t05-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom new file mode 100644 index 0000000000..0edc3ddd6f --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t05-c + jar + 1.0 + + + maven-test + t05-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom new file mode 100644 index 0000000000..9290b033d5 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom new file mode 100644 index 0000000000..b4af4b2cdb --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom new file mode 100644 index 0000000000..09e1d9470c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml new file mode 100644 index 0000000000..d9c2d52bba --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + p0 + maven-t05 + 1.0 + + 4.0.0 + maven-t05 + p1 + pom + p1 + 1.0 + + scm-url + + + + + maven-test + t05-b + 1.0 + + + maven-test + t05-d + 1.0 + + + + + + maven-test + t05-a + 1.0 + runtime + + + maven-test + t05-c + 1.0 + runtime + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml new file mode 100644 index 0000000000..6c93838b93 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml @@ -0,0 +1,36 @@ + + 4.0.0 + maven-t05 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + maven-test + t05-a + 1.0 + + + maven-test + t05-b + 1.1 + + + maven-test + t05-c + 1.0 + compile + + + maven-test + t05-d + 1.2 + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom new file mode 100644 index 0000000000..21aa5f556b --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + t06-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t06-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom new file mode 100644 index 0000000000..a9af131cba --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t06-b + jar + 1.0 + + + maven-test + t06-c + 1.0 + jar + compile + + + maven-test + t06-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom new file mode 100644 index 0000000000..a9af131cba --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t06-b + jar + 1.0 + + + maven-test + t06-c + 1.0 + jar + compile + + + maven-test + t06-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom new file mode 100644 index 0000000000..80272114a8 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t06-c + jar + 1.0 + + + maven-test + t06-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom new file mode 100644 index 0000000000..e4531ab4a7 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom new file mode 100644 index 0000000000..c146cb89a6 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom new file mode 100644 index 0000000000..ff91f975ae --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml new file mode 100644 index 0000000000..468621901e --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + p0 + maven-t06 + 1.0 + + 4.0.0 + maven-t06 + p1 + pom + p1 + 1.0 + + scm-url + + + + + maven-test + t06-b + 1.0 + + + maven-test + t06-d + 1.0 + test + false + + + + + + maven-test + t06-a + 1.0 + + + maven-test + t06-c + 1.0 + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml new file mode 100644 index 0000000000..60c540ca12 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + maven-t06 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + maven-test + t06-a + 1.0 + + + maven-test + t06-b + 1.1 + + + maven-test + t06-c + 1.0 + + + maven-test + t06-d + 1.2 + test + false + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom new file mode 100644 index 0000000000..05665a9c27 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + t07-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t07-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom new file mode 100644 index 0000000000..8ce6751c93 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t07-b + jar + 1.0 + + + maven-test + t07-c + 1.0 + jar + compile + + + maven-test + t07-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom new file mode 100644 index 0000000000..689ad055ed --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t07-b + jar + 1.1 + + + maven-test + t07-c + 1.0 + jar + compile + + + maven-test + t07-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom new file mode 100644 index 0000000000..494470c49b --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t07-c + jar + 1.0 + + + maven-test + t07-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom new file mode 100644 index 0000000000..5761d51547 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom new file mode 100644 index 0000000000..08fc179c17 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom new file mode 100644 index 0000000000..544ccc59a0 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml new file mode 100644 index 0000000000..6f700429a0 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + p0 + maven-t07 + 1.0 + + 4.0.0 + maven-t07 + p1 + pom + p1 + 1.0 + + scm-url + + + + + maven-test + t07-b + 1.0 + + + maven-test + t07-d + 1.0 + test + false + + + + + + maven-test + t07-a + 1.0 + + + maven-test + t07-c + 1.0 + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml new file mode 100644 index 0000000000..b500ee0e58 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + maven-t07 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + maven-test + t07-a + 1.0 + + + maven-test + t07-b + 1.1 + + + maven-test + t07-c + 1.0 + + + maven-test + t07-d + 1.2 + test + false + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom new file mode 100644 index 0000000000..186c2d89f1 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + t08-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + t08-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom new file mode 100644 index 0000000000..d866ab3556 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t08-b + jar + 1.0 + + + maven-test + t08-c + 1.0 + jar + compile + + + maven-test + t08-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom new file mode 100644 index 0000000000..d402466e9f --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t08-b + jar + 1.1 + + + maven-test + t08-c + 1.0 + jar + compile + + + maven-test + t08-d + 1.1 + jar + compile + false + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom new file mode 100644 index 0000000000..d8250528e2 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t08-c + jar + 1.0 + + + maven-test + t08-d + 1.1 + jar + compile + true + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom new file mode 100644 index 0000000000..f453045880 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom new file mode 100644 index 0000000000..c7703b02db --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom new file mode 100644 index 0000000000..e341be534d --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml new file mode 100644 index 0000000000..331996d87e --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml @@ -0,0 +1,59 @@ + + + p0 + maven-t08 + 1.0 + + 4.0.0 + maven-t08 + p1 + pom + p1 + 1.0 + + scm-url + + + + + maven-test + t08-b + 1.0 + + + maven-test + t08-d + 1.0 + test + true + + + + + + maven-test + t08-a + 1.0 + + + maven-test + t08-c + 1.0 + + + maven-test + t08-d + 1.0 + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml new file mode 100644 index 0000000000..a18ab853d1 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + maven-t08 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + maven-test + t08-a + 1.0 + + + maven-test + t08-b + 1.1 + + + maven-test + t08-c + 1.0 + + + maven-test + t08-d + 1.2 + test + false + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom new file mode 100644 index 0000000000..54cf647b2b --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t09-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + + maven-test + t09-b + 1.0 + compile + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom new file mode 100644 index 0000000000..ce001c2f30 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t09-b + jar + 1.0 + + + + maven-test + t09-c + 1.0 + compile + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom new file mode 100644 index 0000000000..da7bc34946 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t09-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom new file mode 100644 index 0000000000..862274728a --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom @@ -0,0 +1,17 @@ + + 4.0.0 + maven-test + t09-d + jar + 1.0 + + + + maven-test + t09-c + 1.0 + compile + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml new file mode 100644 index 0000000000..ae4358436d --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml @@ -0,0 +1,36 @@ + + + p0 + maven-t09 + 1.0 + + 4.0.0 + maven-t09 + p1 + pom + p1 + 1.0 + + scm-url + + + + + + maven-test + t09-a + + + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml new file mode 100644 index 0000000000..4681c2efe8 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml @@ -0,0 +1,42 @@ + + + p0 + maven-t09 + 1.0 + + 4.0.0 + maven-t09 + p2 + pom + p2 + 1.0 + + scm-url + + + + + + maven-test + t09-a + + + + maven-test + t09-d + 1.0 + + + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml new file mode 100644 index 0000000000..a93746d281 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + maven-t09 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + + + + maven-test + t09-a + 1.0 + + + + maven-test + t09-b + 1.0 + + + maven-test + t09-c + + + + + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom new file mode 100644 index 0000000000..1fc2a2216a --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + maven-test + t10-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + + maven-test + t10-b + 1.0 + compile + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom new file mode 100644 index 0000000000..64b5f97a0c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t10-b + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom new file mode 100644 index 0000000000..6548ab3006 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t10-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml new file mode 100644 index 0000000000..ed82ae1344 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml @@ -0,0 +1,42 @@ + + + p0 + maven-t10 + 1.0 + + 4.0.0 + maven-t10 + p1 + pom + p1 + 1.0 + + scm-url + + + + + + maven-test + t10-a + + + + maven-test + t10-c + runtime + + + + + + + + maven-antrun-plugin + + ${project.parent.basedir} + + + + + \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml new file mode 100644 index 0000000000..853af40df2 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + maven-t10 + p0 + pom + p0 + 1.0 + + Codehaus + + + + + + + + maven-test + t10-a + 1.0 + test + + + + maven-test + t10-b + 1.0 + runtime + + + + maven-test + t10-c + 1.0 + test + + + + + + + \ No newline at end of file