You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/05/13 02:23:46 UTC
[3/3] maven-integration-testing git commit: [MNG-2478] add filtered
resource directories to super POM
[MNG-2478] add filtered resource directories to super POM
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/10498697
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/10498697
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/10498697
Branch: refs/heads/master
Commit: 104986975bc374205b927c99e0bba6309cb2903f
Parents: a68e07c
Author: Christian Schulte <sc...@apache.org>
Authored: Fri May 13 04:22:57 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri May 13 04:22:57 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/it/MavenITmng3843PomInheritanceTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/10498697/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 c5c6a2a..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
@@ -102,14 +102,14 @@ public class MavenITmng3843PomInheritanceTest
assertPathEquals( basedir, "src/main/resources",
props.getProperty( "project.build.resources.0.directory" ) );
- assertPathEquals( basedir, "src/main/filtered-resources",
+ 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/filtered-resources",
+ assertPathEquals( basedir, "src/test/resources-filtered",
props.getProperty( "project.build.testResources.1.directory" ) );
}