michal 2004/05/18 13:09:17
Modified: maven-project/src/test/java/org/apache/maven/artifact/collector
DefaultArtifactCollectorTest.java
maven-project/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
maven-project/src/main/java/org/apache/maven/artifact/collector
DefaultArtifactCollector.java
Log:
Location of local repository fixed
Revision Changes Path
1.5 +3 -1
maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java
Index: DefaultArtifactCollectorTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultArtifactCollectorTest.java 18 May 2004 19:39:46 -0000 1.4
+++ DefaultArtifactCollectorTest.java 18 May 2004 20:09:17 -0000 1.5
@@ -56,6 +56,8 @@
projectBuilder = ( MavenProjectBuilder ) lookup( MavenProjectBuilder.ROLE );
+ System.setProperty( "maven.repo.local", getLocalRepository() );
+
}
1.6 +1 -0
maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractProjectTestCase.java 16 May 2004 15:58:10 -0000 1.5
+++ AbstractProjectTestCase.java 18 May 2004 20:09:17 -0000 1.6
@@ -32,6 +32,7 @@
return localRepository;
}
+
public void initLocalRepository()
{
File tempLocalRepository = new File( basedir, "target/temp-repo-local" );
1.6 +3 -9
maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java
Index: DefaultArtifactCollector.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultArtifactCollector.java 18 May 2004 19:39:46 -0000 1.5
+++ DefaultArtifactCollector.java 18 May 2004 20:09:17 -0000 1.6
@@ -90,8 +90,7 @@
retValue.getConflicts().put( id, list );
}
-
-
+
list.add( newArtifact );
}
}
@@ -114,12 +113,7 @@
continue;
}
else
- {
- //@hack for testing I need to propagate the location of
mavenRepoLocal
- //this shows that some settings should be detached from
project.
-
- referencedProject.setLocalRepository(
currentProject.getLocalRepository() );
-
+ {
// the pom for given dependency exisit we will add it to the
queue
queue.add( referencedProject );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
