diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index e0ad6c1bf1..5460254a03 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -405,7 +405,7 @@ public MavenExecutionResult readProjectWithDependencies( MavenExecutionRequest r try { - projectBuildingResult = mavenProjectBuilder.buildWithDependencies( + projectBuildingResult = mavenProjectBuilder.buildProjectWithDependencies( request.getPom(), request.getLocalRepository(), request.getProfileManager() ); diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 283f876c44..1cfbc9fec5 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -247,7 +247,17 @@ public MavenProject buildStandaloneSuperProject() return superProject; } - public MavenProjectBuildingResult buildWithDependencies( File projectDescriptor, + /** @since 2.0.x */ + public MavenProject buildWithDependencies( File projectDescriptor, + ArtifactRepository localRepository, + ProfileManager profileManager ) + throws ProjectBuildingException + { + return buildProjectWithDependencies( projectDescriptor, localRepository, profileManager ).getProject(); + } + + /** @since 2.1 */ + public MavenProjectBuildingResult buildProjectWithDependencies( File projectDescriptor, ArtifactRepository localRepository, ProfileManager profileManager ) throws ProjectBuildingException diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java index 7df9ffd1bd..b0fa41ad85 100644 --- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java @@ -62,12 +62,17 @@ MavenProject build( File project, ProfileManager globalProfileManager ) throws ProjectBuildingException; - - MavenProjectBuildingResult buildWithDependencies( File project, - ArtifactRepository localRepository, - ProfileManager globalProfileManager ) + MavenProject buildWithDependencies( File project, + ArtifactRepository localRepository, + ProfileManager globalProfileManager ) throws ProjectBuildingException; + MavenProjectBuildingResult buildProjectWithDependencies( File project, + ArtifactRepository localRepository, + ProfileManager globalProfileManager ) + throws ProjectBuildingException; + + MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories, ArtifactRepository localRepository ) @@ -81,7 +86,6 @@ MavenProject buildFromRepository( Artifact artifact, throws ProjectBuildingException; /** - * * @return * @throws ProjectBuildingException */ diff --git a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index ad6bad304d..d0bc19dc30 100644 --- a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -106,7 +106,7 @@ protected ArtifactRepository getLocalRepository() protected MavenProject getProjectWithDependencies( File pom ) throws Exception { - return projectBuilder.buildWithDependencies( pom, getLocalRepository(), null ).getProject(); + return projectBuilder.buildWithDependencies( pom, getLocalRepository(), null ); } protected MavenProject getProject( File pom )