From 310e0e23b14320a50915f27f4722f0fe510e32ef Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <ascheman@apache.org>
Date: Thu, 23 Jul 2026 08:11:39 +0200
Subject: [PATCH] Pin maven-jar-plugin 3.5.1 in modular IT fixtures

The windows-latest jdk-11 CI cell fails for every PR since Maven
3.10.0-rc-1 became the IT baseline: its super-POM pins maven-jar-plugin
3.5.0, whose plexus-archiver 4.10.4 throws an NPE
(JarToolModularJarArchiver.fixLastModifiedTimeZipEntries) when
packaging modular JARs on Windows with JDK < 14 (no 'jar --date'; POSIX
attribute view is null on Windows). Details and validation:
https://github.com/apache/maven-jar-plugin/issues/555

maven-jar-plugin 3.5.1 (released 2026-07-22) ships plexus-archiver
4.12.0 with the fix. Pin 3.5.1 explicitly in the four affected modular
fixtures so they stop depending on the super-POM's jar-plugin version.

Verified locally under Maven 3.10.0-rc-1: Surefire1733JUnit4IT,
Surefire1733TestngIT, Surefire2190JUnit4IT and
Surefire1993JpmsProvidingModulesIT green; fixture logs confirm
maven-jar-plugin:3.5.1:jar executed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
(cherry picked from commit 6e80c7571d51f7cf32d7a53645c3222a7df73afa)
---
 .../src/test/resources/surefire-1733-junit4/pom.xml       | 8 ++++++++
 .../src/test/resources/surefire-1733-testng/pom.xml       | 8 ++++++++
 .../surefire-1993-jpms-providing-modules/pom.xml          | 8 ++++++++
 surefire-its/src/test/resources/surefire-2190/pom.xml     | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml b/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
index 5935e4b874..a555690f09 100644
--- a/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
@@ -96,6 +96,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <!-- explicit 3.5.1: the Maven 3.10.0(-rc-1) super-POM pins 3.5.0, which
+                     breaks modular JARs on Windows with JDK < 14 (plexus-archiver 4.10.4
+                     NPE), see https://github.com/apache/maven-jar-plugin/issues/555 -->
+                <version>3.5.1</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/surefire-its/src/test/resources/surefire-1733-testng/pom.xml b/surefire-its/src/test/resources/surefire-1733-testng/pom.xml
index d9b9dda713..b747cf6d98 100644
--- a/surefire-its/src/test/resources/surefire-1733-testng/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1733-testng/pom.xml
@@ -96,6 +96,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <!-- explicit 3.5.1: the Maven 3.10.0(-rc-1) super-POM pins 3.5.0, which
+                     breaks modular JARs on Windows with JDK < 14 (plexus-archiver 4.10.4
+                     NPE), see https://github.com/apache/maven-jar-plugin/issues/555 -->
+                <version>3.5.1</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml b/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
index 9d46d0a467..f3292114fb 100644
--- a/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
@@ -93,6 +93,14 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${surefire.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <!-- explicit 3.5.1: the Maven 3.10.0(-rc-1) super-POM pins 3.5.0, which
+                         breaks modular JARs on Windows with JDK < 14 (plexus-archiver 4.10.4
+                         NPE), see https://github.com/apache/maven-jar-plugin/issues/555 -->
+                    <version>3.5.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/surefire-its/src/test/resources/surefire-2190/pom.xml b/surefire-its/src/test/resources/surefire-2190/pom.xml
index 3cdfd1e819..b72d37e1d1 100644
--- a/surefire-its/src/test/resources/surefire-2190/pom.xml
+++ b/surefire-its/src/test/resources/surefire-2190/pom.xml
@@ -63,6 +63,14 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <!-- explicit 3.5.1: the Maven 3.10.0(-rc-1) super-POM pins 3.5.0, which
+                     breaks modular JARs on Windows with JDK < 14 (plexus-archiver 4.10.4
+                     NPE), see https://github.com/apache/maven-jar-plugin/issues/555 -->
+                <version>3.5.1</version>
+            </plugin>
         </plugins>
     </build>
 </project>