diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java index 1e638c1654..379e15cbb5 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java @@ -34,7 +34,6 @@ import org.apache.tools.ant.PropertyHelper; import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; import java.io.File; -import java.util.Collections; /** * A POM typedef. @@ -114,7 +113,7 @@ public class Pom try { // TODO: should the profiles be constructed and passed in here? From Ant, or perhaps settings? - mavenProject = builder.build( file, localRepository, Collections.EMPTY_LIST ); + mavenProject = builder.build( file, localRepository, null ); } catch ( ProjectBuildingException e ) { 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 f5decadc32..3fb6f6e49d 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 @@ -259,30 +259,6 @@ public class DefaultMavenProjectBuilder return map; } - /** - * @deprecated Use build( File, ArtifactRepository, ProfileManager) - */ - public MavenProject build( File projectDescriptor, ArtifactRepository localRepository, List activeExternalProfiles ) - throws ProjectBuildingException - { - ProfileManager profileManager = new DefaultProfileManager( container ); - - if ( activeExternalProfiles != null ) - { - for ( Iterator it = activeExternalProfiles.iterator(); it.hasNext(); ) - { - Profile profile = (Profile) it.next(); - - // since it's already determined to be active, we'll explicitly set it as activated in the mgr. - profileManager.explicitlyActivate( profile.getId() ); - - profileManager.addProfile( profile ); - } - } - - return buildFromSourceFile( projectDescriptor, localRepository, profileManager ); - } - public MavenProject build( 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 4d1e0bf0fd..db324c8307 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 @@ -35,12 +35,6 @@ public interface MavenProjectBuilder String STANDALONE_SUPERPOM_VERSION = "2.0"; - /** - * @deprecated Use build( File, ArtifactRepository, ProfileManager) - */ - public MavenProject build( File projectDescriptor, ArtifactRepository localRepository, List activeExternalProfiles ) - throws ProjectBuildingException; - MavenProject build( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager ) throws ProjectBuildingException; @@ -48,14 +42,11 @@ public interface MavenProjectBuilder // These methods are used by the MavenEmbedder // ---------------------------------------------------------------------- - MavenProject buildWithDependencies( File project, - ArtifactRepository localRepository, - ProfileManager globalProfileManager, - TransferListener transferListener ) + MavenProject buildWithDependencies( File project, ArtifactRepository localRepository, + ProfileManager globalProfileManager, TransferListener transferListener ) throws ProjectBuildingException, ArtifactResolutionException; - MavenProject buildWithDependencies( File project, - ArtifactRepository localRepository, + MavenProject buildWithDependencies( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager ) throws ProjectBuildingException, ArtifactResolutionException;