Author: sisbell
Date: Mon Dec 22 10:32:56 2008
New Revision: 728739
URL: http://svn.apache.org/viewvc?rev=728739&view=rev
Log:
Fix: MNG-3821 - We can't feed containers of containers into the
ModelTransformerContext. Merging of subcontainers needs to be handled in the
ModelTransformer implementation.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java?rev=728739&r1=728738&r2=728739&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
Mon Dec 22 10:32:56 2008
@@ -37,9 +37,10 @@
private static final Collection<String> uris =
Collections.unmodifiableList( Arrays.asList(
ProjectUri.PluginRepositories.PluginRepository.xUri,
ProjectUri.Repositories.Repository.xUri,
- ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
- ProjectUri.Profiles.Profile.xUri,
- ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri ) );
+ // ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
+ ProjectUri.Profiles.Profile.xUri
+ // ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri
+ ) );
public Collection<String> getUris()
{