You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/01/01 18:11:39 UTC
svn commit: r895035 - in
/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project:
DefaultMavenProjectBuilder.java MavenProjectBuilder.java
Author: bentmann
Date: Fri Jan 1 17:11:38 2010
New Revision: 895035
URL: http://svn.apache.org/viewvc?rev=895035&view=rev
Log:
[MNG-4511] API incompatibility in MavenProjectBuilder (Maven-3)
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=895035&r1=895034&r2=895035&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri Jan 1 17:11:38 2010
@@ -23,6 +23,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.ModelBuildingException;
@@ -32,6 +34,7 @@
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -209,4 +212,30 @@
return buildStandaloneSuperProject( configuration );
}
+ public MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ ProfileManager profileManager, TransferListener transferListener )
+ throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
+ {
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
+
+ configuration.setLocalRepository( localRepository );
+
+ if ( profileManager != null )
+ {
+ configuration.setActiveProfileIds( profileManager.getExplicitlyActivatedIds() );
+ configuration.setInactiveProfileIds( profileManager.getExplicitlyDeactivatedIds() );
+ }
+
+ configuration.setResolveDependencies( true );
+
+ return build( project, configuration );
+ }
+
+ public MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ ProfileManager profileManager )
+ throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
+ {
+ return buildWithDependencies( project, localRepository, profileManager, null );
+ }
+
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=895035&r1=895034&r2=895035&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Fri Jan 1 17:11:38 2010
@@ -20,7 +20,10 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.wagon.events.TransferListener;
@Deprecated
public interface MavenProjectBuilder
@@ -53,4 +56,12 @@
MavenProject buildStandaloneSuperProject( ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
+ MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ ProfileManager globalProfileManager, TransferListener transferListener )
+ throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException;
+
+ MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ ProfileManager globalProfileManager )
+ throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException;
+
}