Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-644 

remove deprecated method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293340 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-03 13:27:48 +00:00
parent cbcc49b306
commit 4afb4ba351
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
View File

@ -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 @@ void initialise( MavenProjectBuilder builder, ArtifactRepository localRepository
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 )
{

24
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -259,30 +259,6 @@ private Map createManagedVersionMap( DependencyManagement dependencyManagement )
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

15
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -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 @@ MavenProject build( File project, ArtifactRepository localRepository, ProfileMan
// 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;