svn commit: r1745000 - /maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java

[mi...@apache.org]

Author: michaelo
Date: Sat May 21 23:00:43 2016
New Revision: 1745000

URL: http://svn.apache.org/viewvc?rev=1745000&view=rev
Log:
[MSHARED-494] Impossible to generate a reproducible build due to timestamp in pom.properties

Stupid hack: write the properties to a StringWriter, iterate with a BufferedReader and drop all comments, finall write real content to the target file.

Modified:
    maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java

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=1745000&r1=1744999&r2=1745000&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 Sat May 21 23:00:43 2016
@@ -19,18 +19,20 @@ package org.apache.maven.archiver;
  * under the License.
  */
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.Properties;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.Archiver;
 import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.archiver.Archiver;
 
 /**
  * This class is responsible for creating the pom.properties file.
@@ -85,7 +87,7 @@ public class PomPropertiesUtil
         {
             return;
         }
-        OutputStream os = new FileOutputStream( outputFile );
+        PrintWriter pw = new PrintWriter( outputFile, "ISO-8859-1" );
         try
         {
             String createdBy = CREATED_BY_MAVEN;
@@ -98,13 +100,31 @@ public class PomPropertiesUtil
                 }
             }
 
-            properties.store( os, createdBy );
-            os.close(); // stream is flushed but not closed by Properties.store()
-            os = null;
+            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 )
+            {
+                if ( !line.startsWith( "#" ) )
+                {
+                    pw.println( line );
+                }
+            }
+
+            r.close();
+            r = null;
+            sw.close();
+            sw = null;
+            pw.close();
+            pw = null;
         }
         finally
         {
-            IOUtil.close( os );
+            IOUtil.close( pw );
         }
     }