Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Excluded POM artifact from dependency artifacts 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773219 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-09 13:02:06 +00:00
parent 2637a1e5d1
commit 2e111caad4
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -320,6 +320,7 @@ public class DefaultMavenProjectBuilder
} }
project.setArtifacts( result.getArtifacts() ); project.setArtifacts( result.getArtifacts() );
project.getArtifacts().remove( pomArtifact );
return new MavenProjectBuildingResult( project, result ); return new MavenProjectBuildingResult( project, result );
} }

2
maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
View File

@ -69,7 +69,7 @@ public class ProjectInheritanceTest
Set set = project1.getArtifacts(); Set set = project1.getArtifacts();
assertNotNull("No artifacts", set); assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0); assertTrue("No Artifacts", set.size() > 0);
assertTrue("Set size should be 4, is " + set.size(), set.size() == 4); assertTrue("Set size should be 3, is " + set.size(), set.size() == 3);
Iterator iter = set.iterator(); Iterator iter = set.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {

2
maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
View File

@ -66,7 +66,7 @@ public class ProjectInheritanceTest
assertNotNull("No artifacts", set); assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0); assertTrue("No Artifacts", set.size() > 0);
Iterator iter = set.iterator(); Iterator iter = set.iterator();
assertTrue("Set size should be 5, is " + set.size(), set.size() == 5); assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
while (iter.hasNext()) while (iter.hasNext())
{ {

2
maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
View File

@ -67,7 +67,7 @@ public class ProjectInheritanceTest
assertNotNull("No artifacts", set); assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0); assertTrue("No Artifacts", set.size() > 0);
Iterator iter = set.iterator(); Iterator iter = set.iterator();
assertTrue("Set size should be 5, is " + set.size(), set.size() == 5); assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
while (iter.hasNext()) while (iter.hasNext())
{ {

2
maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
View File

@ -71,7 +71,7 @@ public class ProjectInheritanceTest
Map map = project1.getArtifactMap(); Map map = project1.getArtifactMap();
assertNotNull("No artifacts", map); assertNotNull("No artifacts", map);
assertTrue("No Artifacts", map.size() > 0); assertTrue("No Artifacts", map.size() > 0);
assertTrue("Set size should be 4, is " + map.size(), map.size() == 4); assertTrue("Set size should be 3, is " + map.size(), map.size() == 3);
Artifact a = (Artifact) map.get("maven-test:t10-a"); Artifact a = (Artifact) map.get("maven-test:t10-a");
Artifact b = (Artifact) map.get("maven-test:t10-b"); Artifact b = (Artifact) map.get("maven-test:t10-b");