maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject maven-integration-testing git commit: [MNG-2478] add filtered resource directories to super POM
Date Wed, 24 Feb 2016 22:41:32 GMT
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 2c44c4db5 -> 5faef7b9d


[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/5faef7b9
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/5faef7b9
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/5faef7b9

Branch: refs/heads/master
Commit: 5faef7b9d4c2a2f8a7c0abee533864b614fe3021
Parents: 2c44c4d
Author: Christian Schulte <schulte@apache.org>
Authored: Wed Feb 24 23:24:13 2016 +0100
Committer: Christian Schulte <schulte@apache.org>
Committed: Wed Feb 24 23:24:13 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/5faef7b9/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..c5c6a2a 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/filtered-resources",
+                              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",
+                              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"
) );


Mime
View raw message