commit a3a4c5b2869b6efbf5d420764522caf425f12ce6
author Karl Heinz Marbaise <khmarbaise@apache.org> Sat Oct 31 21:30:24 2015 +0000
committer Karl Heinz Marbaise <khmarbaise@apache.org> Sat Oct 31 21:30:24 2015 +0000
tree 51b44f9de617a525e2f89131da7a7f4ecb15cad5
parent 3921e5748a3c6ca847f7d1c745c65fa5b2fbb724

Undone change in r1711686 cause it fails unit tests.

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711687 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/shared/filtering/BaseFilter.java

diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index c8e734b..12396f0 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -118,10 +118,8 @@
         // or do we have to throw an MavenFilteringException with mavenSession cannot be null
         if ( request.getMavenSession() != null )
         {
-            Properties executionProperties = new Properties();
-            executionProperties.putAll( request.getMavenSession().getSystemProperties() );
-            executionProperties.putAll( request.getMavenSession().getUserProperties() );
-            baseProps.putAll( executionProperties );
+            // execution properties wins
+            baseProps.putAll( request.getMavenSession().getExecutionProperties() );
         }
 
         // now we build properties to use for resources interpolation
@@ -159,10 +157,7 @@
         if ( request.getMavenSession() != null )
         {
             // execution properties wins
-            Properties executionProperties = new Properties();
-            executionProperties.putAll( request.getMavenSession().getSystemProperties() );
-            executionProperties.putAll( request.getMavenSession().getUserProperties() );
-            filterProperties.putAll( executionProperties );
+            filterProperties.putAll( request.getMavenSession().getExecutionProperties() );
         }
 
         if ( request.getAdditionalProperties() != null )