Author: jvanzyl
Date: Mon Dec 15 21:06:29 2008
New Revision: 726958
URL: http://svn.apache.org/viewvc?rev=726958&view=rev
Log:
o use new signature for the project builder
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
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=726958&r1=726957&r2=726958&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
Mon Dec 15 21:06:29 2008
@@ -302,10 +302,8 @@
{
project = constructMavenProjectFromModel( project.getModel(),
null, null, config );
project.setActiveProfiles( activeProfiles );
- project.setRemoteArtifactRepositories(
- mavenTools.buildArtifactRepositories(
superModel.getRepositories() ) );
- project.setPluginArtifactRepositories(
- mavenTools.buildArtifactRepositories(
superModel.getRepositories() ) );
+ project.setRemoteArtifactRepositories(
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
+ project.setPluginArtifactRepositories(
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
}
catch ( InvalidRepositoryException e )
{
@@ -318,8 +316,7 @@
return project;
}
- public MavenProjectBuildingResult buildProjectWithDependencies( File
projectDescriptor,
-
ProjectBuilderConfiguration config )
+ public MavenProjectBuildingResult buildProjectWithDependencies( File
projectDescriptor, ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
MavenProject project = build( projectDescriptor, config );
@@ -556,7 +553,6 @@
null,
interpolatorProperties,
resolver,
-
projectDescriptor.getParentFile(),
config );
}
catch ( IOException e )