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

Removed unused methods from ProjectBuilderConfig. Since we collapsed maven-project into maven-core, method not needed. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769957 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-29 21:52:56 +00:00
parent 01f79cf31a
commit abec748f23
5 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -156,7 +156,6 @@ public class DefaultMavenExecutionRequest
copy.setProfileManager( original.getProfileManager() ); copy.setProfileManager( original.getProfileManager() );
copy.setRemoteRepositories( original.getRemoteRepositories() ); copy.setRemoteRepositories( original.getRemoteRepositories() );
copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() ); copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() );
copy.setPlugins(original.getPlugins());//TODO - deeper copy
return original; return original;
} }
@ -702,10 +701,8 @@ public class DefaultMavenExecutionRequest
projectBuildingConfiguration.setLocalRepository( getLocalRepository() ); projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
projectBuildingConfiguration.setExecutionProperties( getProperties() ); projectBuildingConfiguration.setExecutionProperties( getProperties() );
projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() ); projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
projectBuildingConfiguration.setUserProperties( getUserProperties() );
projectBuildingConfiguration.setBuildStartTime( getStartTime() ); projectBuildingConfiguration.setBuildStartTime( getStartTime() );
projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() ); projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() );
projectBuildingConfiguration.setPlugins(getPlugins());
} }
return projectBuildingConfiguration; return projectBuildingConfiguration;

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

@ -136,7 +136,7 @@ public class DefaultMavenProjectBuilder
List<Profile> projectProfiles; List<Profile> projectProfiles;
Properties props = new Properties(); Properties props = new Properties();
props.putAll(configuration.getExecutionProperties()); props.putAll(configuration.getExecutionProperties());
props.putAll(configuration.getUserProperties());
try try
{ {
projectProfiles = DefaultProfileManager.getActiveProfilesFrom(configuration.getGlobalProfileManager(), props, domainModel.getModel() ); projectProfiles = DefaultProfileManager.getActiveProfilesFrom(configuration.getGlobalProfileManager(), props, domainModel.getModel() );

34
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
View File

@ -50,22 +50,6 @@ public class DefaultProjectBuilderConfiguration
private MavenProject topProject; private MavenProject topProject;
private Set<Plugin> plugins;
public void setPlugins(Set<Plugin> plugins)
{
this.plugins = plugins;
}
public Set<Plugin> getPlugins()
{
if(plugins == null)
{
plugins = new HashSet<Plugin>();
}
return plugins;
}
public MavenProject getTopLevelProjectFromReactor() public MavenProject getTopLevelProjectFromReactor()
{ {
return topProject; return topProject;
@ -108,23 +92,7 @@ public class DefaultProjectBuilderConfiguration
this.remoteRepositories = remoteRepositories; this.remoteRepositories = remoteRepositories;
return this; return this;
} }
public ProjectBuilderConfiguration setUserProperties( Properties userProperties )
{
this.userProperties = userProperties;
return this;
}
public Properties getUserProperties()
{
if ( userProperties == null )
{
userProperties = new Properties();
}
return userProperties;
}
public Properties getExecutionProperties() public Properties getExecutionProperties()
{ {
return executionProperties; return executionProperties;

7
maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
View File

@ -17,8 +17,6 @@ public interface ProjectBuilderConfiguration
ProfileManager getGlobalProfileManager(); ProfileManager getGlobalProfileManager();
Properties getUserProperties();
Properties getExecutionProperties(); Properties getExecutionProperties();
ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager ); ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager );
@ -27,8 +25,6 @@ public interface ProjectBuilderConfiguration
ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories ); ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
ProjectBuilderConfiguration setUserProperties( Properties userProperties );
ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties ); ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties );
//TODO: these do not belong here, we can profile things else where //TODO: these do not belong here, we can profile things else where
@ -40,7 +36,4 @@ public interface ProjectBuilderConfiguration
void setTopLevelProjectForReactor(MavenProject mavenProject); void setTopLevelProjectForReactor(MavenProject mavenProject);
void setPlugins(Set<Plugin> plugins);
Set<Plugin> getPlugins();
} }

1
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -585,7 +585,6 @@ public class MavenEmbedder
try try
{ {
request.setPlugins(lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles("jar"));
request = populator.populateDefaults( request, configuration ); request = populator.populateDefaults( request, configuration );
} }
catch ( MavenEmbedderException e ) catch ( MavenEmbedderException e )