Repository: maven-integration-testing Updated Branches: refs/heads/master ee10d9991 -> 06e3a23ae
[MNG-2478] add filtered resource directories to super POM This reverts commit 3ffb28978eb4e2522e8a7700e196677df5ccc76c. Will be part of 3.4. 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/06e3a23a Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/06e3a23a Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/06e3a23a Branch: refs/heads/master Commit: 06e3a23aed5f00a6f8a7bce0b564e650f512ae46 Parents: ee10d99 Author: Christian Schulte <schu...@apache.org> Authored: Sat Nov 12 20:31:57 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Nov 12 20:31:57 2016 +0100 ---------------------------------------------------------------------- .../it/MavenITmng3843PomInheritanceTest.java | 35 +++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/06e3a23a/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 b6e7fd1..5011360 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,11 +95,36 @@ 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" ) ); - 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" ) ); + + 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" ) ); + + } + 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" ) );
