Merge pull request #461 from BrandonSchmitt/improvement/FELIX-6814-reproducible

[FELIX-6814] Improve Reproducible Build Support

Author: paulrutter

tools/maven-bundle-plugin/src/it/reproducible-manifest/pom.xml

@@ -26,7 +26,7 @@ under the License.
   <!-- default packaging: jar -->
 
   <properties>
-    <project.build.outputTimestamp>1</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2000-01-01T00:00:00Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>

tools/maven-bundle-plugin/src/it/reproducible-manifest/verify.groovy

@@ -17,6 +17,12 @@
  * under the License.
  */
 
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
+
 String manifest = new File( basedir, "target/classes/META-INF/MANIFEST.MF" ).text;
 
 assert !manifest.contains( "Build-Jdk:" )
@@ -25,3 +31,14 @@ assert manifest.contains( "Build-Jdk-Spec:" )
 assert !manifest.contains( "Build-By:" )
 
 assert !manifest.contains( "Bnd-LastModified:" )
+
+
+Enumeration<? extends ZipEntry> bundleEntries = new ZipFile(new File( basedir, "target/reproducible-1-SNAPSHOT.jar" )).entries()
+
+// ZipEntry::getTime() interprets the time information in the local timezone.
+long expectedTime = LocalDateTime.of(2000, 1, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
+
+while(bundleEntries.hasMoreElements()) {
+    ZipEntry entry = bundleEntries.nextElement()
+    assert entry.getTime() == expectedTime
+}

tools/maven-bundle-plugin/src/it/reproducible/pom.xml

@@ -25,7 +25,7 @@ under the License.
   <version>1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
-    <project.build.outputTimestamp>1</project.build.outputTimestamp>
+    <project.build.outputTimestamp>946684800</project.build.outputTimestamp>
   </properties>
   <dependencies>
     <dependency>

tools/maven-bundle-plugin/src/it/reproducible/verify.groovy

@@ -17,6 +17,12 @@
  * under the License.
  */
 
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
+
 String manifest = new File( basedir, "target/classes/META-INF/MANIFEST.MF" ).text;
 
 assert !manifest.contains( "Build-Jdk:" )
@@ -25,3 +31,14 @@ assert manifest.contains( "Build-Jdk-Spec:" )
 assert !manifest.contains( "Build-By:" )
 
 assert !manifest.contains( "Bnd-LastModified:" )
+
+
+Enumeration<? extends ZipEntry> bundleEntries = new ZipFile(new File( basedir, "target/reproducible-1-SNAPSHOT.jar" )).entries()
+
+// ZipEntry::getTime() interprets the time information in the local timezone.
+long expectedTime = LocalDateTime.of(2000, 1, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
+
+while(bundleEntries.hasMoreElements()) {
+    ZipEntry entry = bundleEntries.nextElement()
+    assert entry.getTime() == expectedTime
+}

tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

@@ -553,7 +553,7 @@ protected Builder getOSGiBuilder( MavenProject currentProject, Map<String, Strin
 
         if ( new MavenArchiver().parseOutputTimestamp( outputTimestamp ) != null )
         {
-          properties.put( Constants.REPRODUCIBLE, "true" );
+          properties.put( Constants.REPRODUCIBLE, outputTimestamp );
         }
 
         // process overrides from project