[bazel] Generate stable, repeatable zip files

Author: shs96c

java/client/src/org/openqa/selenium/tools/javadoc/BUILD.bazel

@@ -2,7 +2,9 @@ java_binary(
     name = "javadoc",
     main_class = "org.openqa.selenium.tools.javadoc.JavadocJarMaker",
     srcs = glob(["*.java"]),
-    deps = [],
+    deps = [
+        "//java/client/src/org/openqa/selenium/tools/zip",
+    ],
     visibility = [
         "//visibility:public",
     ]

java/client/src/org/openqa/selenium/tools/javadoc/JavadocJarMaker.java

@@ -1,5 +1,7 @@
 package org.openqa.selenium.tools.javadoc;
 
+import org.openqa.selenium.tools.zip.StableZipEntry;
+
 import javax.tools.DocumentationTool;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
@@ -76,8 +78,7 @@ public static void main(String[] args) throws IOException {
         tempDirs.add(unpackTo);
         Set<String> fileNames = new HashSet<>();
         readSourceFiles(unpackTo, fileManager, sourceJars, sources, topLevelPackages, fileNames);
-        List<String> options = new ArrayList<>();
-        options.addAll(List.of("-html5", "-notimestamp", "-use", "-quiet", "-Xdoclint:-missing", "-encoding", "UTF8"));
+        List<String> options = new ArrayList<>(List.of("-html5", "-notimestamp", "-use", "-quiet", "-Xdoclint:-missing", "-encoding", "UTF8"));
         if (!classpath.isEmpty()) {
           options.add("-cp");
           options.add(classpath.stream().map(Path::toAbsolutePath).map(String::valueOf).collect(Collectors.joining(File.pathSeparator)));
@@ -110,12 +111,12 @@ public static void main(String[] args) throws IOException {
               try {
                 if (Files.isDirectory(path)) {
                   String name = outputTo.relativize(path) + "/";
-                  ZipEntry entry = new ZipEntry(name);
+                  ZipEntry entry = new StableZipEntry(name);
                   zos.putNextEntry(entry);
                   zos.closeEntry();
                 } else {
                   String name = outputTo.relativize(path).toString();
-                  ZipEntry entry = new ZipEntry(name);
+                  ZipEntry entry = new StableZipEntry(name);
                   zos.putNextEntry(entry);
                   try (InputStream is = Files.newInputStream(path)) {
                     is.transferTo(zos);

java/client/src/org/openqa/selenium/tools/modules/BUILD.bazel

@@ -12,6 +12,7 @@ java_binary(
     main_class = "org.openqa.selenium.tools.modules.ModuleGenerator",
     visibility = ["//visibility:public"],
     deps = [
+        "//java/client/src/org/openqa/selenium/tools/zip",
         artifact("net.bytebuddy:byte-buddy"),
         artifact("com.github.javaparser:javaparser-core"),
     ],

java/client/src/org/openqa/selenium/tools/modules/ModuleGenerator.java

@@ -35,6 +35,7 @@
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import net.bytebuddy.jar.asm.ClassWriter;
 import net.bytebuddy.jar.asm.ModuleVisitor;
+import org.openqa.selenium.tools.zip.StableZipEntry;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -82,10 +83,7 @@
 import static net.bytebuddy.jar.asm.Opcodes.ACC_TRANSITIVE;
 
 public class ModuleGenerator {
-
-  // Starts at 1980-01-01. We'll match what buck uses
-  private static final long DOS_EPOCH = Instant.parse("1985-02-01T00:00:00.00Z").toEpochMilli();
-
+  
   public static void main(String[] args) throws IOException {
     Path outJar = null;
     Path inJar = null;
@@ -292,30 +290,18 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
          JarOutputStream jos = new JarOutputStream(os, manifest)) {
       jos.setLevel(ZipOutputStream.STORED);
 
-      ZipEntry dir = new ZipEntry("META-INF/");
-      dir.setTime(DOS_EPOCH);
-      dir.setCreationTime(FileTime.fromMillis(DOS_EPOCH));
-      dir.setLastModifiedTime(FileTime.fromMillis(DOS_EPOCH));
+      ZipEntry dir = new StableZipEntry("META-INF/");
       jos.putNextEntry(dir);
 
-      dir = new ZipEntry("META-INF/versions/");
-      dir.setTime(DOS_EPOCH);
-      dir.setCreationTime(FileTime.fromMillis(DOS_EPOCH));
-      dir.setLastModifiedTime(FileTime.fromMillis(DOS_EPOCH));
+      dir = new StableZipEntry("META-INF/versions/");
       jos.putNextEntry(dir);
 
-      dir = new ZipEntry("META-INF/versions/9/");
-      dir.setTime(DOS_EPOCH);
-      dir.setCreationTime(FileTime.fromMillis(DOS_EPOCH));
-      dir.setLastModifiedTime(FileTime.fromMillis(DOS_EPOCH));
+      dir = new StableZipEntry("META-INF/versions/9/");
       jos.putNextEntry(dir);
 
       byte[] bytes = classWriter.toByteArray();
 
-      JarEntry entry = new JarEntry("META-INF/versions/9/module-info.class");
-      entry.setTime(DOS_EPOCH);
-      entry.setCreationTime(FileTime.fromMillis(DOS_EPOCH));
-      entry.setLastModifiedTime(FileTime.fromMillis(DOS_EPOCH));
+      ZipEntry entry = new StableZipEntry("META-INF/versions/9/module-info.class");
       entry.setSize(bytes.length);
 
       jos.putNextEntry(entry);

java/client/src/org/openqa/selenium/tools/zip/BUILD.bazel

@@ -0,0 +1,7 @@
+java_library(
+    name = "zip",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "//java/client/src/org/openqa/selenium/tools:__subpackages__",
+    ],
+)

java/client/src/org/openqa/selenium/tools/zip/StableZipEntry.java

@@ -0,0 +1,19 @@
+package org.openqa.selenium.tools.zip;
+
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
+import java.util.zip.ZipEntry;
+
+public class StableZipEntry extends ZipEntry {
+
+  // Starts at 1980-01-01. We'll match what buck uses
+  private static final long DOS_EPOCH = Instant.parse("1985-02-01T00:00:00.00Z").toEpochMilli();
+
+  public StableZipEntry(String name) {
+    super(name);
+
+    setTime(DOS_EPOCH);
+    setCreationTime(FileTime.fromMillis(DOS_EPOCH));
+    setLastModifiedTime(FileTime.fromMillis(DOS_EPOCH));
+  }
+}