From abec748f2340eda2060e0278ace1d493e5d272ca Mon Sep 17 00:00:00 2001
From: Britton Isbell <sisbell@apache.org>
Date: Wed, 29 Apr 2009 21:52:56 +0000
Subject: [PATCH] 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
---
 .../DefaultMavenExecutionRequest.java         |  3 --
 .../project/DefaultMavenProjectBuilder.java   |  2 +-
 .../DefaultProjectBuilderConfiguration.java   | 34 +------------------
 .../project/ProjectBuilderConfiguration.java  |  7 ----
 .../apache/maven/embedder/MavenEmbedder.java  |  1 -
 5 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 5d6f0589d8..cb3dc185d7 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -156,7 +156,6 @@ public static MavenExecutionRequest copy( MavenExecutionRequest original )
         copy.setProfileManager( original.getProfileManager() );
         copy.setRemoteRepositories( original.getRemoteRepositories() );
         copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() );
-        copy.setPlugins(original.getPlugins());//TODO - deeper copy
         return original;        
     }
    
@@ -702,10 +701,8 @@ public ProjectBuilderConfiguration getProjectBuildingConfiguration()
             projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
             projectBuildingConfiguration.setExecutionProperties( getProperties() );
             projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
-            projectBuildingConfiguration.setUserProperties( getUserProperties() );
             projectBuildingConfiguration.setBuildStartTime( getStartTime() );
             projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() );
-            projectBuildingConfiguration.setPlugins(getPlugins());
         }
 
         return projectBuildingConfiguration;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 64e407801c..ae63ce6f02 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -136,7 +136,7 @@ public MavenProject build( File pomFile, ProjectBuilderConfiguration configurati
         List<Profile> projectProfiles;
 	    Properties props = new Properties();
 	    props.putAll(configuration.getExecutionProperties());
-	    props.putAll(configuration.getUserProperties());
+
         try
         {
         	projectProfiles = DefaultProfileManager.getActiveProfilesFrom(configuration.getGlobalProfileManager(), props, domainModel.getModel() );
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
index 76f0ab151e..35c22172da 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
@@ -50,22 +50,6 @@ public class DefaultProjectBuilderConfiguration
     
     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()
     {
     	return topProject;
@@ -108,23 +92,7 @@ public ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepositor
         this.remoteRepositories = remoteRepositories;
         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()
     {
         return executionProperties;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
index 03f80169d0..bb955ab68f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
@@ -17,8 +17,6 @@ public interface ProjectBuilderConfiguration
 
     ProfileManager getGlobalProfileManager();
 
-    Properties getUserProperties();
-
     Properties getExecutionProperties();
 
     ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager );
@@ -27,8 +25,6 @@ public interface ProjectBuilderConfiguration
 
     ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
 
-    ProjectBuilderConfiguration setUserProperties( Properties userProperties );
-
     ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties );
 
     //TODO: these do not belong here, we can profile things else where
@@ -40,7 +36,4 @@ public interface ProjectBuilderConfiguration
     
     void setTopLevelProjectForReactor(MavenProject mavenProject);
     
-    void setPlugins(Set<Plugin> plugins);
-    
-    Set<Plugin> getPlugins();
 }
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
index c8a5de6bd7..bade7a9641 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
@@ -585,7 +585,6 @@ public MavenExecutionResult execute( MavenExecutionRequest request )
 
             try
             {
-            	request.setPlugins(lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles("jar"));
                 request = populator.populateDefaults( request, configuration );
             }
             catch ( MavenEmbedderException e )