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

o Fixed handling of plugin groups 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749493 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-03 00:33:55 +00:00
parent d670f82e62
commit 352fd0a543
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -158,7 +158,7 @@ public class DefaultMavenExecutionRequestPopulator
Properties userProperties = request.getUserProperties(); Properties userProperties = request.getUserProperties();
if ( userProperties != null ) if ( userProperties != null )
{ {
for ( Iterator it = userProperties.keySet().iterator(); it.hasNext(); ) for ( Iterator<?> it = userProperties.keySet().iterator(); it.hasNext(); )
{ {
String key = (String) it.next(); String key = (String) it.next();
if ( !requestProperties.containsKey( key ) ) if ( !requestProperties.containsKey( key ) )
@ -191,6 +191,8 @@ public class DefaultMavenExecutionRequestPopulator
Settings settings = request.getSettings(); Settings settings = request.getSettings();
request.setPluginGroups( settings.getPluginGroups() );
List settingsProfiles = settings.getProfiles(); List settingsProfiles = settings.getProfiles();
List<String> settingsActiveProfileIds = settings.getActiveProfiles(); List<String> settingsActiveProfileIds = settings.getActiveProfiles();
@ -548,11 +550,11 @@ public class DefaultMavenExecutionRequestPopulator
} }
// Now, add in any event monitors from the Configuration instance. // Now, add in any event monitors from the Configuration instance.
List configEventMonitors = configuration.getEventMonitors(); List<EventMonitor> configEventMonitors = configuration.getEventMonitors();
if ( ( configEventMonitors != null ) && !configEventMonitors.isEmpty() ) if ( ( configEventMonitors != null ) && !configEventMonitors.isEmpty() )
{ {
for ( Iterator it = configEventMonitors.iterator(); it.hasNext(); ) for ( Iterator<EventMonitor> it = configEventMonitors.iterator(); it.hasNext(); )
{ {
EventMonitor monitor = (EventMonitor) it.next(); EventMonitor monitor = (EventMonitor) it.next();
request.addEventMonitor( monitor ); request.addEventMonitor( monitor );