You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/12/23 05:57:43 UTC
svn commit: r728871 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/
maven-project/src/test/java/org/apache/maven/project/builder/
Author: sisbell
Date: Mon Dec 22 20:57:42 2008
New Revision: 728871
URL: http://svn.apache.org/viewvc?rev=728871&view=rev
Log:
Reverted back changes for MNG-3821. Broke bootstrap.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.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=728871&r1=728870&r2=728871&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 20:57:42 2008
@@ -37,10 +37,9 @@
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()
{
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=728871&r1=728870&r2=728871&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Mon Dec 22 20:57:42 2008
@@ -212,11 +212,11 @@
{
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());
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=728871&r1=728870&r2=728871&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Mon Dec 22 20:57:42 2008
@@ -83,7 +83,7 @@
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 @@
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