Author: jvanzyl
Date: Fri Sep 7 15:29:34 2007
New Revision: 573736
URL: http://svn.apache.org/viewvc?rev=573736&view=rev
Log:
o we don't need to run processProjectLogic on the super pom but we do need to
make sure the plugin repositories are populated
for plugins like archetype which have no POM to start with but need
repositories.
Added:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
- copied, changed from r573705,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=573736&r1=573735&r2=573736&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Fri Sep 7 15:29:34 2007
@@ -294,7 +294,6 @@
files,
request.getLocalRepository(),
request.isRecursive(),
- request.getSettings(),
request.getProfileManager(),
!request.useReactor() );
@@ -323,7 +322,6 @@
private List collectProjects( List files,
ArtifactRepository localRepository,
boolean recursive,
- Settings settings,
ProfileManager globalProfileManager,
boolean isRoot )
throws ArtifactResolutionException, ProjectBuildingException,
ProfileActivationException,
@@ -425,7 +423,6 @@
moduleFiles,
localRepository,
recursive,
- settings,
globalProfileManager,
false );
projects.addAll( collectedProjects );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=573736&r1=573735&r2=573736&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Fri Sep 7 15:29:34 2007
@@ -269,6 +269,8 @@
try
{
superProject.setRemoteArtifactRepositories(
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
+
+ superProject.setPluginArtifactRepositories(
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
}
catch ( InvalidRepositoryException e )
{
@@ -974,6 +976,7 @@
project.setPluginArtifactRepositories(
mavenTools.buildArtifactRepositories( model.getPluginRepositories() ) );
DistributionManagement dm = model.getDistributionManagement();
+
if ( dm != null )
{
ArtifactRepository repo =
mavenTools.buildDeploymentArtifactRepository( dm.getRepository() );
@@ -990,10 +993,6 @@
if ( parentProject != null )
{
-// Artifact parentArtifact = artifactFactory.createParentArtifact(
parentProject.getGroupId(),
-//
parentProject.getArtifactId(),
-//
parentProject.getVersion() );
- // the parent artifact from the parameter passed project instance
is resolved.
project.setParentArtifact( parentArtifact );
}
Copied:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
(from r573705,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java&r1=573705&r2=573736&rev=573736&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
Fri Sep 7 15:29:34 2007
@@ -29,80 +29,23 @@
import java.util.Iterator;
import java.util.List;
-public class DefaultMavenProjectBuilderTest
+public class SuperPomProjectBuilderTest
extends AbstractMavenProjectTestCase
{
-
- private List filesToDelete = new ArrayList();
-
- private File localRepoDir;
-
- private DefaultMavenProjectBuilder projectBuilder;
-
public void setUp()
throws Exception
{
super.setUp();
projectBuilder = (DefaultMavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
-
- localRepoDir = new File( System.getProperty( "java.io.tmpdir" ),
"local-repo." + System.currentTimeMillis() );
- localRepoDir.mkdirs();
-
- filesToDelete.add( localRepoDir );
}
- public void tearDown()
- throws Exception
- {
- super.tearDown();
-
- if ( !filesToDelete.isEmpty() )
- {
- for ( Iterator it = filesToDelete.iterator(); it.hasNext(); )
- {
- File file = (File) it.next();
-
- if ( file.exists() )
- {
- if ( file.isDirectory() )
- {
- FileUtils.deleteDirectory( file );
- }
- else
- {
- file.delete();
- }
- }
- }
- }
- }
-
- /**
- * Check that we can build ok from the middle pom of a
(parent,child,grandchild) heirarchy
- * @throws Exception
- */
public void testBuildFromMiddlePom() throws Exception
{
- File f1 = getTestFile(
"src/test/resources/projects/grandchild-check/child/pom.xml");
- File f2 = getTestFile(
"src/test/resources/projects/grandchild-check/child/grandchild/pom.xml");
-
- getProject( f1 );
-
- // it's the building of the grandchild project, having already cached
the child project
- // (but not the parent project), which causes the problem.
- getProject( f2 );
- }
-
- protected ArtifactRepository getLocalRepository()
- throws Exception
- {
- ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout)
lookup( ArtifactRepositoryLayout.ROLE,
-
"legacy" );
+ MavenProject project = projectBuilder.buildStandaloneSuperProject();
- ArtifactRepository r = new DefaultArtifactRepository( "local",
"file://" + localRepoDir.getAbsolutePath(),
- repoLayout );
+ assertNotNull( project.getRemoteArtifactRepositories() );
- return r;
+ assertNotNull( project.getPluginArtifactRepositories() );
}
-}
+}
\ No newline at end of file
