[MNG-2478] add filtered resource directories to super POM This reverts commits 104986975bc374205b927c99e0bba6309cb2903f 5faef7b9d4c2a2f8a7c0abee533864b614fe3021
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/3ffb2897 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3ffb2897 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3ffb2897 Branch: refs/heads/master Commit: 3ffb28978eb4e2522e8a7700e196677df5ccc76c Parents: 6a30b47 Author: Christian Schulte <[email protected]> Authored: Thu Aug 18 21:18:23 2016 +0200 Committer: Christian Schulte <[email protected]> Committed: Thu Aug 18 22:13:57 2016 +0200 ---------------------------------------------------------------------- .../it/MavenITmng3843PomInheritanceTest.java | 35 +++----------------- 1 file changed, 5 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ffb2897/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index 5011360..b6e7fd1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -95,36 +95,11 @@ public class MavenITmng3843PomInheritanceTest assertPathEquals( basedir, "src/main/java", props.getProperty( "project.build.sourceDirectory" ) ); assertPathEquals( basedir, "src/test/java", props.getProperty( "project.build.testSourceDirectory" ) ); assertPathEquals( basedir, "src/main/scripts", props.getProperty( "project.build.scriptSourceDirectory" ) ); - - if ( matchesVersionRange( "[3.4,)" ) ) - { - assertEquals( "2", props.getProperty( "project.build.resources" ) ); - assertPathEquals( basedir, "src/main/resources", - props.getProperty( "project.build.resources.0.directory" ) ); - - assertPathEquals( basedir, "src/main/resources-filtered", - props.getProperty( "project.build.resources.1.directory" ) ); - - assertEquals( "2", props.getProperty( "project.build.testResources" ) ); - assertPathEquals( basedir, "src/test/resources", - props.getProperty( "project.build.testResources.0.directory" ) ); - - assertPathEquals( basedir, "src/test/resources-filtered", - props.getProperty( "project.build.testResources.1.directory" ) ); - - } - else - { - assertEquals( "1", props.getProperty( "project.build.resources" ) ); - assertPathEquals( basedir, "src/main/resources", - props.getProperty( "project.build.resources.0.directory" ) ); - - assertEquals( "1", props.getProperty( "project.build.testResources" ) ); - assertPathEquals( basedir, "src/test/resources", - props.getProperty( "project.build.testResources.0.directory" ) ); - - } - + assertEquals( "1", props.getProperty( "project.build.resources" ) ); + assertPathEquals( basedir, "src/main/resources", props.getProperty( "project.build.resources.0.directory" ) ); + assertEquals( "1", props.getProperty( "project.build.testResources" ) ); + assertPathEquals( basedir, "src/test/resources", + props.getProperty( "project.build.testResources.0.directory" ) ); assertPathEquals( basedir, "target", props.getProperty( "project.build.directory" ) ); assertPathEquals( basedir, "target/classes", props.getProperty( "project.build.outputDirectory" ) ); assertPathEquals( basedir, "target/test-classes", props.getProperty( "project.build.testOutputDirectory" ) );
