Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o use new signature for the project builder 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726958 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-12-16 05:06:29 +00:00
parent 38e6b15ebc
commit 75456d77ba
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -302,10 +302,8 @@ public class DefaultMavenProjectBuilder
{ {
project = constructMavenProjectFromModel( project.getModel(), null, null, config ); project = constructMavenProjectFromModel( project.getModel(), null, null, config );
project.setActiveProfiles( activeProfiles ); project.setActiveProfiles( activeProfiles );
project.setRemoteArtifactRepositories( project.setRemoteArtifactRepositories( mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) ); project.setPluginArtifactRepositories( mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
project.setPluginArtifactRepositories(
mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
} }
catch ( InvalidRepositoryException e ) catch ( InvalidRepositoryException e )
{ {
@ -318,8 +316,7 @@ public class DefaultMavenProjectBuilder
return project; return project;
} }
public MavenProjectBuildingResult buildProjectWithDependencies( File projectDescriptor, public MavenProjectBuildingResult buildProjectWithDependencies( File projectDescriptor, ProjectBuilderConfiguration config )
ProjectBuilderConfiguration config )
throws ProjectBuildingException throws ProjectBuildingException
{ {
MavenProject project = build( projectDescriptor, config ); MavenProject project = build( projectDescriptor, config );
@ -556,7 +553,6 @@ public class DefaultMavenProjectBuilder
null, null,
interpolatorProperties, interpolatorProperties,
resolver, resolver,
projectDescriptor.getParentFile(),
config ); config );
} }
catch ( IOException e ) catch ( IOException e )