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

Minor updates to URI and joins. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738340 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-01-28 02:06:27 +00:00
parent 93ec09c8a5
commit 02c557c132
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,11 +206,11 @@ public class PomTransformer
{ {
if(!mc.equals(mc1) && mc.containerAction(mc1).equals(ModelContainerAction.JOIN)) if(!mc.equals(mc1) && mc.containerAction(mc1).equals(ModelContainerAction.JOIN))
{ {
exclusionSource.joinWithOriginalOrder(mc, mc1); exclusionSource.joinWithOriginalOrder(mc1, mc);
} }
} }
} }
managementContainer = new ArtifactModelContainerFactory().create( managementContainer = new ArtifactModelContainerFactory().create(
transformDependencyManagement( exclusionSource.getModelProperties() ) ); transformDependencyManagement( exclusionSource.getModelProperties() ) );
ModelContainerAction action = dependencyContainer.containerAction( managementContainer ); ModelContainerAction action = dependencyContainer.containerAction( managementContainer );

2
maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
View File

@ -295,6 +295,8 @@ public final class PomClassicDomainModel
//TODO: Should add all collections from ProjectUri //TODO: Should add all collections from ProjectUri
s.addAll(PomTransformer.URIS); s.addAll(PomTransformer.URIS);
s.add(ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri); s.add(ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
s.add(ProjectUri.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
s.add(ProjectUri.Dependencies.Dependency.Exclusions.xUri);
s.add(ProjectUri.Build.Plugins.Plugin.Executions.xUri); s.add(ProjectUri.Build.Plugins.Plugin.Executions.xUri);
s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.Goals.xURI); s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri); s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri);

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

@ -96,7 +96,6 @@ public class PomConstructionTest
{ {
PomTestWrapper pom = buildPom( "duplicate-exclusions-dependency/sub" ); PomTestWrapper pom = buildPom( "duplicate-exclusions-dependency/sub" );
assertEquals( 1, ( (List<?>) pom.getValue( "dependencies[1]/exclusions" ) ).size() ); assertEquals( 1, ( (List<?>) pom.getValue( "dependencies[1]/exclusions" ) ).size() );
System.out.println(pom.getDomainModel().asString());
} }