diff --git a/maven-core-it/it2001/settings-norepo.xml b/maven-core-it/it2001/settings-norepo.xml new file mode 100644 index 0000000000..57f8c014c5 --- /dev/null +++ b/maven-core-it/it2001/settings-norepo.xml @@ -0,0 +1,4 @@ + + file:../target/local-repo + false + diff --git a/maven-core-it/it2001/test.sh b/maven-core-it/it2001/test.sh index 48763d5261..c10562f37b 100755 --- a/maven-core-it/it2001/test.sh +++ b/maven-core-it/it2001/test.sh @@ -10,13 +10,13 @@ echo "Installing 'b'" (cd b && m2 --settings ../settings.xml install) echo "Installing 'a'" -(cd a && m2 --settings ../settings.xml install) +(cd a && m2 --settings ../settings-norepo.xml install) echo "Removing 'c' from local repository" rm -Rf target/local-repository/org/apache/maven/it2001/c echo "Re-running 'a' install" -(cd a && m2 --settings ../settings.xml install) +(cd a && m2 --settings ../settings-norepo.xml install) echo "Cleaning up." rm -Rf `find . -type d -name target` diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 58c84a26d8..36b1b91761 100644 --- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -181,12 +181,7 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo // if the project is null, we encountered an invalid model (read: m1 POM) // we'll just return an empty resolution group. // or used the inherited scope (should that be passed to the buildFromRepository method above?) - Set artifacts = project.createArtifacts( artifactFactory, artifact.getScope(), - artifact.getDependencyFilter() ); - - List repositories = aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() ); - - result = new ResolutionGroup( pomArtifact, artifacts, repositories ); + result = new ResolutionGroup( pomArtifact, Collections.EMPTY_SET, Collections.EMPTY_LIST ); } else { @@ -195,7 +190,9 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo Set artifacts = project.createArtifacts( artifactFactory, artifact.getScope(), artifact.getDependencyFilter() ); - result = new ResolutionGroup( pomArtifact, artifacts, project.getRemoteArtifactRepositories() ); + List repositories = aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() ); + + result = new ResolutionGroup( pomArtifact, artifacts, repositories ); } return result;