commit 3921e5748a3c6ca847f7d1c745c65fa5b2fbb724
author Karl Heinz Marbaise <khmarbaise@apache.org> Sat Oct 31 20:57:19 2015 +0000
committer Karl Heinz Marbaise <khmarbaise@apache.org> Sat Oct 31 20:57:19 2015 +0000
tree d97ebf002a4344dcd1a19964c3e60c29449cfbd6
parent 1451466c5239b7af2edcb137f44a2a850308a016

Removed calling deprecated code.

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