Author: jdcasey
Date: Tue Sep 13 21:13:38 2005
New Revision: 280761
URL: http://svn.apache.org/viewcvs?rev=280761&view=rev
Log:
Cleaning up faulty logic in MavenMetadataSource related to the last commit, and
updating the it2001 test to (hopefully) straighten out the repository
definitions.
Added:
maven/components/trunk/maven-core-it/it2001/settings-norepo.xml (with
props)
Modified:
maven/components/trunk/maven-core-it/it2001/test.sh
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Added: maven/components/trunk/maven-core-it/it2001/settings-norepo.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2001/settings-norepo.xml?rev=280761&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it2001/settings-norepo.xml (added)
+++ maven/components/trunk/maven-core-it/it2001/settings-norepo.xml Tue Sep 13
21:13:38 2005
@@ -0,0 +1,4 @@
+<settings>
+ <localRepository>file:../target/local-repo</localRepository>
+ <usePluginRegistry>false</usePluginRegistry>
+</settings>
Propchange: maven/components/trunk/maven-core-it/it2001/settings-norepo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it2001/settings-norepo.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-core-it/it2001/test.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2001/test.sh?rev=280761&r1=280760&r2=280761&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2001/test.sh (original)
+++ maven/components/trunk/maven-core-it/it2001/test.sh Tue Sep 13 21:13:38 2005
@@ -10,13 +10,13 @@
(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`
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=280761&r1=280760&r2=280761&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Tue Sep 13 21:13:38 2005
@@ -181,12 +181,7 @@
// 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 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
