commit fddc697fdb3fb3331815e357188a8a7d8efee55a
author Anders Hammar <andham@apache.org> Wed Apr 27 13:14:30 2016 +0000
committer Anders Hammar <andham@apache.org> Wed Apr 27 13:14:30 2016 +0000
tree 0bfb5b0fc2970a9e610277688802af196d9d6f35
parent 8f16f2da8ed7b854c3549a4f48e7292de15dd175

[MSHARED-513] Regression: Created-By row in manifest does not include Maven version

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

src/main/java/org/apache/maven/archiver/MavenArchiver.java

diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 313a1fa..839066c 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -655,7 +655,7 @@
         String createdBy = "Apache Maven";
         if ( session != null ) // can be null due to API backwards compatibility
         {
-            String mavenVersion = session.getUserProperties().getProperty( "maven.version" );
+            String mavenVersion = session.getSystemProperties().getProperty( "maven.version" );
             if ( mavenVersion != null )
             {
                 createdBy += " " + mavenVersion;

src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java

diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
index 618c598..44a744d 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
@@ -91,7 +91,7 @@
             String createdBy = CREATED_BY_MAVEN;
             if ( session != null ) // can be null due to API backwards compatibility
             {
-                String mavenVersion = session.getUserProperties().getProperty( "maven.version" );
+                String mavenVersion = session.getSystemProperties().getProperty( "maven.version" );
                 if ( mavenVersion != null )
                 {
                     createdBy += " " + mavenVersion;

src/test/java/org/apache/maven/archiver/MavenArchiverTest.java

diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index bf1c68b..8189289 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -1095,10 +1095,10 @@
 
     private MavenSession getDummySession()
     {
-        Properties executionProperties = new Properties();
-        executionProperties.put( "maven.version", "3.0.4" );
+        Properties systemProperties = new Properties();
+        systemProperties.put( "maven.version", "3.0.4" );
 
-        return getDummySession( executionProperties );
+        return getDummySession( systemProperties );
     }
 
     private MavenSession getDummySessionWithoutMavenVersion()
@@ -1106,7 +1106,7 @@
         return getDummySession( new Properties() );
     }
 
-    private MavenSession getDummySession( Properties executionProperties )
+    private MavenSession getDummySession( Properties systemProperties )
     {
         PlexusContainer container = null;
         File settings = null;
@@ -1114,7 +1114,7 @@
         Date startTime = new Date();
 
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
-        request.setUserProperties( executionProperties );
+        request.setSystemProperties( systemProperties );
         request.setGoals( goals );
         request.setStartTime( startTime );
         request.setUserSettingsFile( settings );