From f39ec410da8e03604968d73b3ef89deaddddb124 Mon Sep 17 00:00:00 2001
From: Britton Isbell <sisbell@apache.org>
Date: Tue, 23 Dec 2008 04:57:42 +0000
Subject: [PATCH] Reverted back changes for MNG-3821. Broke bootstrap.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728871 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven/project/builder/IdModelContainerFactory.java     | 7 +++----
 .../org/apache/maven/project/builder/PomTransformer.java   | 4 ++--
 .../apache/maven/project/builder/PomConstructionTest.java  | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
index 424b245bcf..34978bd39a 100644
--- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
+++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
@@ -37,10 +37,9 @@ public class IdModelContainerFactory
     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()
     {
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
index d4192d9d27..b08dafed70 100644
--- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
+++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
@@ -212,11 +212,11 @@ public class PomTransformer
                 {
                     ModelDataSource pluginDatasource = new DefaultModelDataSource();
                     pluginDatasource.init( pluginContainer.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
-                            new PluginExecutionIdModelContainerFactory() ) );
+                            new IdModelContainerFactory() ) );
 
                     ModelDataSource managementDatasource = new DefaultModelDataSource();
                     managementDatasource.init( managementContainer.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
-                            new PluginExecutionIdModelContainerFactory() ) );
+                            new IdModelContainerFactory() ) );
 
                     List<ModelContainer> managementExecutionContainers = managementDatasource.queryFor(ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri);
                     List<ModelProperty> managementPropertiesWithoutExecutions = new ArrayList<ModelProperty>(managementContainer.getProperties());
diff --git a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
index f383c9b4f5..04f6246b37 100644
--- a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
@@ -83,7 +83,7 @@ public class PomConstructionTest
         assertEquals( "maven-it-plugin-b", pom.getValue( "build/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
     }
-
+     /*
     public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
         throws Exception
     {
@@ -97,7 +97,7 @@ public class PomConstructionTest
         assertEquals( "maven-it-plugin-b", pom.getValue( "reporting/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( "reporting/plugins[1]/reportSets" ) ).size() );
     }
-
+     */
     /* FIXME: cf. MNG-3886
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception