You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/04/27 21:39:04 UTC
[maven-integration-testing] branch master updated: [MNG-2478] add
"resources-filtered" filtered resource directories to super POM
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new d6e2e1a [MNG-2478] add "resources-filtered" filtered resource directories to super POM
d6e2e1a is described below
commit d6e2e1abcdb47002aef4ac2ac91e86ea29b56923
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 27 23:35:14 2020 +0200
[MNG-2478] add "resources-filtered" filtered resource directories to super POM
Modified MavenITmng3843PomInheritanceTest to accommodate additional resource
directories.
---
.../maven/it/MavenITmng3843PomInheritanceTest.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
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 @@ 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" ) );
+ 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" ) );