Switch to latest Maven APIs to handle build output timestamp.

stefanseifert · stefanseifert · commit 358a5bd67870 · 2023-07-18T14:35:57.000+02:00
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.19.6" date="not released">
+      <action type="update" dev="sseifert">
+        Switch to latest Maven APIs to handle build output timestamp.
+      </action>
+    </release>
+
     <release version="2.19.4" date="2023-03-27">
       <action type="update" dev="sseifert">
         Update to SnakeYAML 2.0.
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/BuildOutputTimestamp.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/BuildOutputTimestamp.java
@@ -20,7 +20,8 @@
 package io.wcm.devops.conga.plugins.aem.maven;
 
 import java.nio.file.attribute.FileTime;
-import java.util.Date;
+import java.time.Instant;
+import java.util.Optional;
 
 import org.apache.maven.archiver.MavenArchiver;
 import org.jetbrains.annotations.Nullable;
@@ -30,40 +31,31 @@
  */
 public class BuildOutputTimestamp {
 
-  private final Date date;
+  private final Optional<Instant> instant;
 
   /**
    * @param outputTimestamp Configured output timestamp
    */
   public BuildOutputTimestamp(@Nullable String outputTimestamp) {
-    MavenArchiver mavenArchiver = new MavenArchiver();
-    this.date = mavenArchiver.parseOutputTimestamp(outputTimestamp);
+    this.instant = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp);
   }
 
   /**
    * @return true if a valid timestamp is configured
    */
   public boolean isValid() {
-    return date != null;
-  }
-
-  /**
-   * @return Date or null if not a valid date
-   */
-  @Nullable
-  public Date toDate() {
-    return date;
+    return instant.isPresent();
   }
 
   /**
    * @return FileTime or null if not a valid date
    */
   @Nullable
   public FileTime toFileTime() {
-    if (date != null) {
-      return FileTime.fromMillis(date.toInstant().getEpochSecond());
-    }
-    return null;
+    return instant
+        .map(Instant::toEpochMilli)
+        .map(FileTime::fromMillis)
+        .orElse(null);
   }
 
 }
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerDispatcherConfigMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerDispatcherConfigMojo.java
@@ -97,7 +97,7 @@ private void buildDispatcherConfig(File environmentDir, File nodeDir) throws Moj
 
       BuildOutputTimestamp buildOutputTimestamp = new BuildOutputTimestamp(outputTimestamp);
       if (buildOutputTimestamp.isValid()) {
-        zipArchiver.configureReproducible(buildOutputTimestamp.toDate());
+        zipArchiver.configureReproducibleBuild(buildOutputTimestamp.toFileTime());
       }
 
       zipArchiver.createArchive();
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParser.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParser.java
@@ -143,7 +143,6 @@ private Map<String, Object> getModelData() {
     return parseYaml(modelFile);
   }
 
-  @SuppressWarnings("unchecked")
   private Map<String, Object> parseYaml(File modelFile) {
     try {
       try (InputStream is = new FileInputStream(modelFile);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private void buildDispatcherConfig(File environmentDir, File nodeDir) throws Moj`
`97`	`97`
`98`	`98`	`BuildOutputTimestamp buildOutputTimestamp = new BuildOutputTimestamp(outputTimestamp);`
`99`	`99`	`if (buildOutputTimestamp.isValid()) {`
`100`		`- zipArchiver.configureReproducible(buildOutputTimestamp.toDate());`
	`100`	`+ zipArchiver.configureReproducibleBuild(buildOutputTimestamp.toFileTime());`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`zipArchiver.createArchive();`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ private Map<String, Object> getModelData() {`
`143`	`143`	`return parseYaml(modelFile);`
`144`	`144`	`}`
`145`	`145`
`146`		`- @SuppressWarnings("unchecked")`
`147`	`146`	`private Map<String, Object> parseYaml(File modelFile) {`
`148`	`147`	`try {`
`149`	`148`	`try (InputStream is = new FileInputStream(modelFile);`