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

MNG-3979. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-01-21 07:35:33 +00:00
parent 01f81a5d11
commit 68d8ce9d34
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,12 +380,31 @@ public class PomTransformer
listener.fire(ds.queryFor(uri)); listener.fire(ds.queryFor(uri));
} }
} }
// for(ModelProperty mp : props) {
// if(mp.getUri().startsWith(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration)) { //Cleanup props (MNG-3979)
// System.out.println(mp); List<ModelProperty> p = new ArrayList<ModelProperty>();
// } for(ModelProperty mp : props)
// } {
return factory.createDomainModel( props ); if(mp.getResolvedValue() != null
&& mp.getResolvedValue().trim().equals(""))
{
int index = props.indexOf(mp) + 1;
if(index <= props.size() && mp.isParentOf(props.get(index)) && !props.get(index).getUri().contains("#property"))
{
p.add(new ModelProperty(mp.getUri(), null));
}
else
{
p.add(mp);
}
}
else
{
p.add(mp);
}
}
return factory.createDomainModel( p );
} }
private static List<ModelProperty> transformDependencyManagement( List<ModelProperty> modelProperties ) private static List<ModelProperty> transformDependencyManagement( List<ModelProperty> modelProperties )

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

@ -166,7 +166,7 @@ public class PomConstructionTest
assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
} }
/* FIXME: cf. MNG-3943*/ /* MNG-3943*/
public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions() public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
throws Exception throws Exception
{ {
@ -217,7 +217,7 @@ public class PomConstructionTest
assertEquals( 1, ( (List<?>) pom.getValue( "build/pluginManagement/plugins[1]/executions[1]/goals" ) ).size() ); assertEquals( 1, ( (List<?>) pom.getValue( "build/pluginManagement/plugins[1]/executions[1]/goals" ) ).size() );
} }
/* FIXME: cf. MNG-3937*/ /* MNG-3937*/
public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement() public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()
throws Exception throws Exception
{ {
@ -252,7 +252,7 @@ public class PomConstructionTest
assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) ); assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
} }
/* FIXME: cf. MNG-3938 */ /* MNG-3938 */
public void testOverridingOfInheritedPluginExecutionsWithPluginManagement() public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
throws Exception throws Exception
{ {
@ -428,7 +428,7 @@ public class PomConstructionTest
assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop1" ).toString() ) ); assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop1" ).toString() ) );
} }
/* FIXME: cf. MNG-3979 /* MNG-3979 */
public void testJoiningOfContainersWhenChildHasEmptyElements() public void testJoiningOfContainersWhenChildHasEmptyElements()
throws Exception throws Exception
{ {