You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by an...@apache.org on 2016/04/27 15:14:30 UTC
svn commit: r1741255 - in /maven/shared/trunk/maven-archiver/src:
main/java/org/apache/maven/archiver/MavenArchiver.java
main/java/org/apache/maven/archiver/PomPropertiesUtil.java
test/java/org/apache/maven/archiver/MavenArchiverTest.java
Author: andham
Date: Wed Apr 27 13:14:30 2016
New Revision: 1741255
URL: http://svn.apache.org/viewvc?rev=1741255&view=rev
Log:
[MSHARED-513] Regression: Created-By row in manifest does not include Maven version
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Wed Apr 27 13:14:30 2016
@@ -655,7 +655,7 @@ public class MavenArchiver
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;
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java Wed Apr 27 13:14:30 2016
@@ -91,7 +91,7 @@ public class PomPropertiesUtil
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;
Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java Wed Apr 27 13:14:30 2016
@@ -1095,10 +1095,10 @@ public class MavenArchiverTest
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 @@ public class MavenArchiverTest
return getDummySession( new Properties() );
}
- private MavenSession getDummySession( Properties executionProperties )
+ private MavenSession getDummySession( Properties systemProperties )
{
PlexusContainer container = null;
File settings = null;
@@ -1114,7 +1114,7 @@ public class MavenArchiverTest
Date startTime = new Date();
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
- request.setUserProperties( executionProperties );
+ request.setSystemProperties( systemProperties );
request.setGoals( goals );
request.setStartTime( startTime );
request.setUserSettingsFile( settings );