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

Fixed regression on MNG-3821. Should not add any subcontainers to the Model Container Info list, which is the one that the ModelTransformerContext uses. This will match ids for subcontainers from different parent containers. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-01-26 01:40:40 +00:00
parent dc27facb7e
commit 379f614660
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
View File

@ -59,7 +59,7 @@ public class PomTransformer
null, goals_infos) null, goals_infos)
); );
//Don't add subcontainers here, breaks MNG-3821
public static final Collection<ModelContainerInfo> MODEL_CONTAINER_INFOS = Arrays.asList( public static final Collection<ModelContainerInfo> MODEL_CONTAINER_INFOS = Arrays.asList(
ModelContainerInfo.Factory.createModelContainerInfo( ModelContainerInfo.Factory.createModelContainerInfo(
new ArtifactModelContainerFactory(), null, plugin_executions), new ArtifactModelContainerFactory(), null, plugin_executions),
@ -67,8 +67,8 @@ public class PomTransformer
new IdModelContainerFactory(ProjectUri.PluginRepositories.PluginRepository.xUri), null, null), new IdModelContainerFactory(ProjectUri.PluginRepositories.PluginRepository.xUri), null, null),
ModelContainerInfo.Factory.createModelContainerInfo( ModelContainerInfo.Factory.createModelContainerInfo(
new IdModelContainerFactory(ProjectUri.Repositories.Repository.xUri), null, null), new IdModelContainerFactory(ProjectUri.Repositories.Repository.xUri), null, null),
ModelContainerInfo.Factory.createModelContainerInfo( // ModelContainerInfo.Factory.createModelContainerInfo(
new IdModelContainerFactory(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri), null, null), // new IdModelContainerFactory(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri), null, null),
ModelContainerInfo.Factory.createModelContainerInfo( ModelContainerInfo.Factory.createModelContainerInfo(
new IdModelContainerFactory(ProjectUri.Profiles.Profile.xUri), null, null) new IdModelContainerFactory(ProjectUri.Profiles.Profile.xUri), null, null)
); );

5
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
View File

@ -91,7 +91,7 @@ public class PomConstructionTest
assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() ); assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
} }
/** MNG-3821 FIX THIS /** MNG-3821 */
public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds() public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
throws Exception throws Exception
{ {
@ -105,7 +105,7 @@ public class PomConstructionTest
assertEquals( "maven-it-plugin-b", pom.getValue( "reporting/plugins[2]/artifactId" ) ); assertEquals( "maven-it-plugin-b", pom.getValue( "reporting/plugins[2]/artifactId" ) );
assertEquals( 1, ( (List<?>) pom.getValue( "reporting/plugins[1]/reportSets" ) ).size() ); assertEquals( 1, ( (List<?>) pom.getValue( "reporting/plugins[1]/reportSets" ) ).size() );
} }
*/
/** MNG-3998 */ /** MNG-3998 */
public void testExecutionConfiguration() public void testExecutionConfiguration()
throws Exception throws Exception
@ -145,6 +145,7 @@ public class PomConstructionTest
throws Exception throws Exception
{ {
PomTestWrapper pom = buildPom( "foo/sub" ); PomTestWrapper pom = buildPom( "foo/sub" );
System.out.println(pom.getDomainModel().asString());
} }
/** MNG-3985 */ /** MNG-3985 */