Fix timestamp preservation when extracting cached files

The build cache extension was not properly preserving file and directory
timestamps when restoring attachedOutputs from cache. This caused Maven
to warn about files being 'more recent than the packaged artifact' even
after a successful build.
Root Causes:
1. The zip() method did not store directory entries with timestamps
2. The unzip() method set directory timestamps immediately, but they
   were later modified by Files.copy() operations for files within
Changes:
- Modified CacheUtils.zip() to store directory entries with timestamps
  via preVisitDirectory() callback
- Modified CacheUtils.unzip() to defer directory timestamp updates until
  after all files are extracted, preventing them from being overwritten
- Added Map<Path, Long> to track directory timestamps during extraction
This ensures that cached build outputs maintain their original timestamps,
preventing spurious warnings and improving build cache consistency.

Author: cowwoc

src/main/java/org/apache/maven/buildcache/CacheUtils.java

@@ -32,8 +32,10 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -179,6 +181,18 @@ public static boolean zip(final Path dir, final Path zip, final String glob, boo
                     "*".equals(glob) ? null : FileSystems.getDefault().getPathMatcher("glob:" + glob);
             Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
 
+                @Override
+                public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attrs) throws IOException {
+                    if (!path.equals(dir)) {
+                        String relativePath = dir.relativize(path).toString() + "/";
+                        ZipArchiveEntry zipEntry = new ZipArchiveEntry(relativePath);
+                        zipEntry.setTime(attrs.lastModifiedTime().toMillis());
+                        zipOutputStream.putArchiveEntry(zipEntry);
+                        zipOutputStream.closeArchiveEntry();
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+
                 @Override
                 public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttributes)
                         throws IOException {
@@ -187,6 +201,9 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttribu
                         final ZipArchiveEntry zipEntry =
                                 new ZipArchiveEntry(dir.relativize(path).toString());
 
+                        // Preserve timestamp
+                        zipEntry.setTime(basicFileAttributes.lastModifiedTime().toMillis());
+
                         // Preserve Unix permissions if requested and filesystem supports it
                         if (supportsPosix) {
                             Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(path);
@@ -210,6 +227,7 @@ public static void unzip(Path zip, Path out, boolean preservePermissions) throws
         final boolean supportsPosix = preservePermissions
                 && out.getFileSystem().supportedFileAttributeViews().contains("posix");
 
+        Map<Path, Long> directoryTimestamps = new HashMap<>();
         try (ZipArchiveInputStream zis = new ZipArchiveInputStream(Files.newInputStream(zip))) {
             ZipArchiveEntry entry = zis.getNextEntry();
             while (entry != null) {
@@ -218,26 +236,36 @@ public static void unzip(Path zip, Path out, boolean preservePermissions) throws
                     throw new RuntimeException("Bad zip entry");
                 }
                 if (entry.isDirectory()) {
-                    Files.createDirectory(file);
+                    if (!Files.exists(file)) {
+                        Files.createDirectories(file);
+                    }
+                    directoryTimestamps.put(file, entry.getTime());
                 } else {
                     Path parent = file.getParent();
-                    Files.createDirectories(parent);
+                    if (!Files.exists(parent)) {
+                        Files.createDirectories(parent);
+                    }
                     Files.copy(zis, file, StandardCopyOption.REPLACE_EXISTING);
-                }
-                Files.setLastModifiedTime(file, FileTime.fromMillis(entry.getTime()));
-
-                // Restore Unix permissions if requested and filesystem supports it
-                if (supportsPosix) {
-                    int unixMode = entry.getUnixMode();
-                    if (unixMode != 0) {
-                        Set<PosixFilePermission> permissions = modeToPermissions(unixMode);
-                        Files.setPosixFilePermissions(file, permissions);
+                    Files.setLastModifiedTime(file, FileTime.fromMillis(entry.getTime()));
+
+                    // Restore Unix permissions if requested and filesystem supports it
+                    if (supportsPosix) {
+                        int unixMode = entry.getUnixMode();
+                        if (unixMode != 0) {
+                            Set<PosixFilePermission> permissions = modeToPermissions(unixMode);
+                            Files.setPosixFilePermissions(file, permissions);
+                        }
                     }
                 }
-
                 entry = zis.getNextEntry();
             }
         }
+
+        // Set directory timestamps after all files have been extracted to avoid them being
+        // updated by file creation operations
+        for (Map.Entry<Path, Long> dirEntry : directoryTimestamps.entrySet()) {
+            Files.setLastModifiedTime(dirEntry.getKey(), FileTime.fromMillis(dirEntry.getValue()));
+        }
     }
 
     public static <T> void debugPrintCollection(