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

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
This commit is contained in:
Britton Isbell 2008-12-23 04:57:42 +00:00
parent 222c25a73b
commit f39ec410da
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
View File

@ -37,10 +37,9 @@ public class IdModelContainerFactory
private static final Collection<String> uris = Collections.unmodifiableList( Arrays.asList( private static final Collection<String> uris = Collections.unmodifiableList( Arrays.asList(
ProjectUri.PluginRepositories.PluginRepository.xUri, ProjectUri.PluginRepositories.PluginRepository.xUri,
ProjectUri.Repositories.Repository.xUri, ProjectUri.Repositories.Repository.xUri,
// ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri, ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
ProjectUri.Profiles.Profile.xUri ProjectUri.Profiles.Profile.xUri,
// ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri ) );
) );
public Collection<String> getUris() public Collection<String> getUris()
{ {

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

@ -212,11 +212,11 @@ public final DomainModel transformToDomainModel( List<ModelProperty> properties,
{ {
ModelDataSource pluginDatasource = new DefaultModelDataSource(); ModelDataSource pluginDatasource = new DefaultModelDataSource();
pluginDatasource.init( pluginContainer.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(), pluginDatasource.init( pluginContainer.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
new PluginExecutionIdModelContainerFactory() ) ); new IdModelContainerFactory() ) );
ModelDataSource managementDatasource = new DefaultModelDataSource(); ModelDataSource managementDatasource = new DefaultModelDataSource();
managementDatasource.init( managementContainer.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(), 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<ModelContainer> managementExecutionContainers = managementDatasource.queryFor(ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri);
List<ModelProperty> managementPropertiesWithoutExecutions = new ArrayList<ModelProperty>(managementContainer.getProperties()); List<ModelProperty> managementPropertiesWithoutExecutions = new ArrayList<ModelProperty>(managementContainer.getProperties());

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

@ -83,7 +83,7 @@ public void testErroneousJoiningOfDifferentPluginsWithEqualDependencies()
assertEquals( "maven-it-plugin-b", pom.getValue( "build/plugins[2]/artifactId" ) ); assertEquals( "maven-it-plugin-b", pom.getValue( "build/plugins[2]/artifactId" ) );
assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() ); assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
} }
/*
public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds() public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
throws Exception throws Exception
{ {
@ -97,7 +97,7 @@ public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
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() );
} }
*/
/* FIXME: cf. MNG-3886 /* FIXME: cf. MNG-3886
public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement() public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
throws Exception throws Exception