You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/27 02:43:55 UTC
svn commit: r768842 - in
/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven:
model/ model/interpolator/ model/processors/ profiles/ profiles/matchers/
Author: jvanzyl
Date: Mon Apr 27 00:43:53 2009
New Revision: 768842
URL: http://svn.apache.org/viewvc?rev=768842&view=rev
Log:
o trying to merge manually
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (contents, props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (contents, props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (contents, props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java (props changed)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ (props changed)
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java:768840-768841
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java:768840-768841
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java:768840-768841
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:688587-696625,696644-699681
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=768842&r1=768841&r2=768842&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Mon Apr 27 00:43:53 2009
@@ -93,7 +93,7 @@
new RepositoriesProcessor(), new DistributionManagementProcessor(),
new LicensesProcessor(), new ScmProcessor(), new PrerequisitesProcessor(),
new ContributorsProcessor(), new DevelopersProcessor(), new ProfilesProcessor() );
- Model target = processModelsForInheritance( convertDomainModelsToMavenModels( domainModels ), processors );
+ Model target = processModelsForInheritance( convertDomainModelsToMavenModels( domainModels ), processors, false );
if(listeners != null)
{
for(ModelEventListener listener : listeners)
@@ -148,7 +148,7 @@
DependencyManagement depMng = model.getDependencyManagement();
- Model target = processModelsForInheritance(profileModels, processors);
+ Model target = processModelsForInheritance(profileModels, processors, true);
PluginsManagementProcessor pmp = new PluginsManagementProcessor();
if( mng != null )
@@ -219,9 +219,9 @@
return models;
}
- private static Model processModelsForInheritance(List<Model> models, List<Processor> processors)
+ private static Model processModelsForInheritance(List<Model> models, List<Processor> processors, boolean isProfile)
{
- ModelProcessor modelProcessor = new ModelProcessor( processors );
+ ModelProcessor modelProcessor = new ModelProcessor( processors, isProfile );
Collections.reverse( models );
int length = models.size();
@@ -251,6 +251,14 @@
}
}
}
+
+ return target;
+
+ }
+
+ public static Model processManagementNodes(Model target)
+ throws IOException
+ {
// Dependency Management
DependencyManagementProcessor depProc = new DependencyManagementProcessor();
@@ -261,16 +269,14 @@
}
// Plugin Management
-
PluginsManagementProcessor procMng = new PluginsManagementProcessor();
if ( target.getBuild() != null && target.getBuild().getPluginManagement() != null)
{
procMng.process( null, new ArrayList<Plugin>( target.getBuild().getPluginManagement().getPlugins() ),
target.getBuild().getPlugins(), true );
}
-
- return target;
-
+
+ return target;
}
public static Profile copyOfProfile(Profile profile)
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java:768840-768841
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator:768840-768841
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java:768840-768841
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors:768840-768841
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java?rev=768842&r1=768841&r2=768842&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java Mon Apr 27 00:43:53 2009
@@ -167,10 +167,7 @@
targetDependency.setGroupId( source.getGroupId() );
}
- if (isMatch(source.getScope(), targetDependency.getScope(), isDependencyManagement) )
- {
- targetDependency.setScope( source.getScope() );
- }
+ targetDependency.setScope( source.getScope() );
if ( isMatch(source.getSystemPath(), targetDependency.getSystemPath(), isDependencyManagement) )
{
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java?rev=768842&r1=768841&r2=768842&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java Mon Apr 27 00:43:53 2009
@@ -37,9 +37,12 @@
extends BaseProcessor
{
- public ModelProcessor( Collection<Processor> processors )
+ private boolean isProfile;
+
+ public ModelProcessor( Collection<Processor> processors, boolean isProfile )
{
super( processors );
+ this.isProfile = isProfile;
}
public void process( Object parent, Object child, Object target, boolean isChildMostSpecialized )
@@ -146,8 +149,17 @@
if(deps.size() > 0)
{
- t.setDependencies(deps);
- // t.getDependencies().addAll( deps );
+ //Multiple profiles may be processed so we need to add them
+ if(isProfile)
+ {
+ t.getDependencies().addAll( deps );
+ }
+ else
+ {
+ t.setDependencies(deps);
+ }
+
+ //
}
//Dependency Management
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:739385,741841,747468
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 00:43:53 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/matchers:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers:768840-768841
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers:688587-696625,696644-699681