[maven-archiver] branch MSHARED-800 updated (465c6f6 -> 44966b9)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MSHARED-800
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git.


 discard 465c6f6  [MSHARED-800] Remove Maven version from pom.properties
     add cbe8411  [MSHARED-798] Add defaultEntries option (true by default)
     new 44966b9  [MSHARED-800] Remove Maven version from pom.properties

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (465c6f6)
            \
             N -- N -- N   refs/heads/MSHARED-800 (44966b9)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../maven/archiver/ManifestConfiguration.java      | 24 +++++++++++++++++
 .../org/apache/maven/archiver/MavenArchiver.java   | 31 +++++++++++++---------
 .../apache/maven/archiver/PomPropertiesUtil.java   |  3 ---
 src/site/xdoc/index.xml.vm                         | 13 +++++++++
 .../apache/maven/archiver/MavenArchiverTest.java   | 27 +++++++++++++++++++
 5 files changed, 82 insertions(+), 16 deletions(-)

[maven-archiver] 01/01: [MSHARED-800] Remove Maven version from pom.properties

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSHARED-800
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git

commit 44966b9487667adb4bd061c1549fcd9f27ea0522
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Feb 6 20:45:31 2019 +0100

    [MSHARED-800] Remove Maven version from pom.properties
---
 .../java/org/apache/maven/archiver/PomPropertiesUtil.java | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
index ad71b52..5f20756 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
@@ -36,13 +36,9 @@ import org.codehaus.plexus.archiver.Archiver;
 
 /**
  * This class is responsible for creating the pom.properties file.
- *
- * @version $Id$
  */
 public class PomPropertiesUtil
 {
-    private static final String CREATED_BY_MAVEN = "Created by Apache Maven";
-
     private Properties loadPropertiesFile( File file )
         throws IOException
     {
@@ -90,22 +86,11 @@ public class PomPropertiesUtil
         PrintWriter pw = new PrintWriter( outputFile, "ISO-8859-1" );
         try
         {
-            String createdBy = CREATED_BY_MAVEN;
-            if ( session != null ) // can be null due to API backwards compatibility
-            {
-                String mavenVersion = session.getSystemProperties().getProperty( "maven.version" );
-                if ( mavenVersion != null )
-                {
-                    createdBy += " " + mavenVersion;
-                }
-            }
-
             StringWriter sw = new StringWriter();
             properties.store( sw, null );
 
             BufferedReader r = new BufferedReader( new StringReader( sw.toString() ) );
 
-            pw.println( "#" + createdBy );
             String line;
             while ( ( line = r.readLine() ) != null )
             {