You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/29 23:52:56 UTC
svn commit: r769957 - in /maven/components/branches/MNG-2766:
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/project/
maven-embedder/src/main/java/org/apache/maven/embedder/
Author: sisbell
Date: Wed Apr 29 21:52:56 2009
New Revision: 769957
URL: http://svn.apache.org/viewvc?rev=769957&view=rev
Log:
Removed unused methods from ProjectBuilderConfig. Since we collapsed maven-project into maven-core, method not needed.
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=769957&r1=769956&r2=769957&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Wed Apr 29 21:52:56 2009
@@ -156,7 +156,6 @@
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 @@
projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
projectBuildingConfiguration.setExecutionProperties( getProperties() );
projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
- projectBuildingConfiguration.setUserProperties( getUserProperties() );
projectBuildingConfiguration.setBuildStartTime( getStartTime() );
projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() );
- projectBuildingConfiguration.setPlugins(getPlugins());
}
return projectBuildingConfiguration;
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=769957&r1=769956&r2=769957&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Apr 29 21:52:56 2009
@@ -136,7 +136,7 @@
List<Profile> projectProfiles;
Properties props = new Properties();
props.putAll(configuration.getExecutionProperties());
- props.putAll(configuration.getUserProperties());
+
try
{
projectProfiles = DefaultProfileManager.getActiveProfilesFrom(configuration.getGlobalProfileManager(), props, domainModel.getModel() );
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=769957&r1=769956&r2=769957&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Wed Apr 29 21:52:56 2009
@@ -50,22 +50,6 @@
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 @@
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;
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=769957&r1=769956&r2=769957&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Wed Apr 29 21:52:56 2009
@@ -17,8 +17,6 @@
ProfileManager getGlobalProfileManager();
- Properties getUserProperties();
-
Properties getExecutionProperties();
ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager );
@@ -27,8 +25,6 @@
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 @@
void setTopLevelProjectForReactor(MavenProject mavenProject);
- void setPlugins(Set<Plugin> plugins);
-
- Set<Plugin> getPlugins();
}
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=769957&r1=769956&r2=769957&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Apr 29 21:52:56 2009
@@ -585,7 +585,6 @@
try
{
- request.setPlugins(lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles("jar"));
request = populator.populateDefaults( request, configuration );
}
catch ( MavenEmbedderException e )