commit d6e2e1abcdb47002aef4ac2ac91e86ea29b56923
author Michael Osipov <michaelo@apache.org> Mon Apr 27 23:35:14 2020 +0200
committer Michael Osipov <michaelo@apache.org> Mon Apr 27 23:35:14 2020 +0200
tree 7122cb997ce6b4f6c09a7e2234d59e8737515856
parent ebd1031a0d1de1f313351c617f37d6fac64334cb

[MNG-2478] add "resources-filtered" filtered resource directories to super POM

Modified MavenITmng3843PomInheritanceTest to accommodate additional resource
directories.

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 ac235d3..5620554 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,25 @@
         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" ) );
+        if ( matchesVersionRange( "[3.7.0,)" ) )
+        {
+            assertEquals( "2", props.getProperty( "project.build.resources" ) );
+            assertEquals( "2", props.getProperty( "project.build.testResources" ) );
+        }
+        else
+        {
+            assertEquals( "1", props.getProperty( "project.build.resources" ) );
+            assertEquals( "1", props.getProperty( "project.build.testResources" ) );
+        }
         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.7.0,)" ) )
+        {
+            assertPathEquals( basedir, "src/main/resources-filtered", props.getProperty( "project.build.resources.1.directory" ) );
+            assertPathEquals( basedir, "src/test/resources-filtered",
+                              props.getProperty( "project.build.testResources.1.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" ) );