You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/11/21 18:51:57 UTC
svn commit: r597162 - in /maven/components/trunk:
maven-embedder/src/main/java/org/apache/maven/embedder/
maven-project/src/main/java/org/apache/maven/project/
maven-project/src/test/java/org/apache/maven/project/
Author: jvanzyl
Date: Wed Nov 21 09:51:56 2007
New Revision: 597162
URL: http://svn.apache.org/viewvc?rev=597162&view=rev
Log:
o adding backward compat method in the project builder
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=597162&r1=597161&r2=597162&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Nov 21 09:51:56 2007
@@ -405,7 +405,7 @@
try
{
- projectBuildingResult = mavenProjectBuilder.buildWithDependencies(
+ projectBuildingResult = mavenProjectBuilder.buildProjectWithDependencies(
request.getPom(),
request.getLocalRepository(),
request.getProfileManager() );
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=597162&r1=597161&r2=597162&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 Wed Nov 21 09:51:56 2007
@@ -247,7 +247,17 @@
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
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=597162&r1=597161&r2=597162&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Wed Nov 21 09:51:56 2007
@@ -62,12 +62,17 @@
ProfileManager globalProfileManager )
throws ProjectBuildingException;
+ MavenProject buildWithDependencies( File project,
+ ArtifactRepository localRepository,
+ ProfileManager globalProfileManager )
+ throws ProjectBuildingException;
- MavenProjectBuildingResult buildWithDependencies( File project,
- ArtifactRepository localRepository,
- ProfileManager globalProfileManager )
+ MavenProjectBuildingResult buildProjectWithDependencies( File project,
+ ArtifactRepository localRepository,
+ ProfileManager globalProfileManager )
throws ProjectBuildingException;
+
MavenProject buildFromRepository( Artifact artifact,
List remoteArtifactRepositories,
ArtifactRepository localRepository )
@@ -81,7 +86,6 @@
throws ProjectBuildingException;
/**
- *
* @return
* @throws ProjectBuildingException
*/
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=597162&r1=597161&r2=597162&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Wed Nov 21 09:51:56 2007
@@ -106,7 +106,7 @@
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 )