diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 144e839c62..326dfb3b61 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -145,18 +145,7 @@ public class DefaultMavenProjectBuilder setBuildOutputDirectoryOnParent( project ); hm.put( ArtifactUtils.artifactId( project.getGroupId(), project.getArtifactId(), "pom", project.getVersion() ), project ); - try - { - if("maven-project-builder".equals( project.getModel().getArtifactId())){ - System.out.println(convertToDomainModel(project.getModel(), true).asString()); - } - - } - catch ( IOException e ) - { - // TODO Auto-generated catch block - e.printStackTrace(); - } + return project; } diff --git a/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java b/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java index a9fbb38ab6..4706eca0da 100644 --- a/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java +++ b/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java @@ -65,10 +65,11 @@ public class BuildProcessor copy(p.getBuild(), t.getBuild(), isProfile); copy(build, t.getBuild(), isProfile); - - copyResources(build, t.getBuild()); - copyResources(p.getBuild(), t.getBuild()); + copyResources(build, t.getBuild()); + copyResources(p.getBuild(), t.getBuild()); + + pluginsProcessor.process( p.getBuild().getPlugins(), build.getPlugins(), t.getBuild().getPlugins(), isChildMostSpecialized ); inheritManagement(p.getBuild().getPluginManagement(), build.getPluginManagement(), t.getBuild()); } @@ -109,35 +110,7 @@ public class BuildProcessor private static void copyResources(BuildBase source, Build target) { - if(target.getResources().isEmpty()) - { - for(Resource resource : source.getResources()) - { - Resource r = new Resource(); - r.setDirectory( resource.getDirectory()); - r.setFiltering( resource.isFiltering() ); - r.setMergeId( resource.getMergeId() ); - r.setTargetPath( resource.getTargetPath() ); - r.setExcludes( new ArrayList(resource.getExcludes()) ); - r.setIncludes( new ArrayList(resource.getIncludes()) ); - target.getResources().add( r ); - } - } - - if(target.getTestResources().isEmpty()) - { - for(Resource resource : source.getTestResources()) - { - Resource r = new Resource(); - r.setDirectory( resource.getDirectory()); - r.setFiltering( resource.isFiltering() ); - r.setMergeId( resource.getMergeId() ); - r.setTargetPath( resource.getTargetPath() ); - r.setExcludes( new ArrayList(resource.getExcludes()) ); - r.setIncludes( new ArrayList(resource.getIncludes()) ); - target.getTestResources().add( r ); - } - } + List filters = new ArrayList(target.getFilters()); for(String filter : source.getFilters()) @@ -170,8 +143,41 @@ public class BuildProcessor if(source.getDirectory() != null) { target.setDirectory( source.getDirectory() ); - } - + } + + if(!source.getResources().isEmpty()) + { + List resources = new ArrayList(); + for(Resource resource : source.getResources()) + { + Resource r = new Resource(); + r.setDirectory( resource.getDirectory()); + r.setFiltering( resource.isFiltering() ); + r.setMergeId( resource.getMergeId() ); + r.setTargetPath( resource.getTargetPath() ); + r.setExcludes( new ArrayList(resource.getExcludes()) ); + r.setIncludes( new ArrayList(resource.getIncludes()) ); + resources.add( r ); + } + target.setResources( resources ); + } + + if(!source.getTestResources().isEmpty()) + { + List resources = new ArrayList(); + for(Resource resource : source.getTestResources()) + { + Resource r = new Resource(); + r.setDirectory( resource.getDirectory()); + r.setFiltering( resource.isFiltering() ); + r.setMergeId( resource.getMergeId() ); + r.setTargetPath( resource.getTargetPath() ); + r.setExcludes( new ArrayList(resource.getExcludes()) ); + r.setIncludes( new ArrayList(resource.getIncludes()) ); + resources.add( r ); + } + target.setTestResources( resources ); + } if(!isProfile) { copyBuild((Build) source, target); diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java index 185cbce9d6..030c8b3b03 100644 --- a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -960,7 +960,7 @@ public class PomConstructionTest testCompleteModel( pom ); } - /* FIXME + /* FIXME*/ public void testCompleteModelWithParent() throws Exception {