You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:27:58 UTC
svn commit: r293340 - in /maven/components/trunk:
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
maven-project/src/main/java/org/apache/maven/project/
Author: brett
Date: Mon Oct 3 06:27:48 2005
New Revision: 293340
URL: http://svn.apache.org/viewcvs?rev=293340&view=rev
Log:
PR: MNG-644
remove deprecated method
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.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
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=293340&r1=293339&r2=293340&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java Mon Oct 3 06:27:48 2005
@@ -34,7 +34,6 @@
import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
import java.io.File;
-import java.util.Collections;
/**
* A POM typedef.
@@ -114,7 +113,7 @@
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 )
{
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=293340&r1=293339&r2=293340&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 Mon Oct 3 06:27:48 2005
@@ -259,30 +259,6 @@
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
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=293340&r1=293339&r2=293340&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 Mon Oct 3 06:27:48 2005
@@ -35,12 +35,6 @@
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 @@
// 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org