[Maven4] Migrate from Maven Archiver to standard jar tool

pom.xml

@@ -34,6 +34,26 @@
   <name>Apache Maven JAR Plugin</name>
   <description>Builds a Java Archive (JAR) file from the compiled project classes and resources.</description>
 
+  <developers>
+    <developer>
+      <id>evenisse</id>
+      <name>Emmanuel Venisse</name>
+      <email>evenisse@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>desruisseaux</id>
+      <name>Martin Desruisseaux</name>
+      <email>desruisseaux@apache.org</email>
+      <organization>Geomatys</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
   <contributors>
     <contributor>
       <name>Jerome Lacoste</name>
@@ -133,9 +153,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>file-management</artifactId>
-      <version>${mavenFileManagementVersion}</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-support</artifactId>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -205,7 +225,7 @@
               <!--
                 ! The manifest specification does not describe any method for writing comments into the manifest.
               -->
-              <exclude>src/it/mjar-71-01/src/main/resources/META-INF/MANIFEST.MF</exclude>
+              <exclude>src/it/mjar-71-01/src/main/my-custom-dir/some-manifest.mf</exclude>
               <exclude>src/it/mjar-71-02/src/main/resources/META-INF/MANIFEST.MF</exclude>
             </excludes>
           </configuration>

src/it/MJAR-260-invalid-automatic-module-name/verify.bsh

@@ -45,8 +45,7 @@ try
     String[] snippets = new String[] {
       "[INFO] BUILD FAILURE",
       "[ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin",
-      "Caused by: org.apache.maven.api.plugin.MojoException: Error assembling JAR",
-      "Caused by: org.codehaus.plexus.archiver.jar.ManifestException: Invalid automatic module name: 'in-valid.name.with.new.keyword'"
+      "Caused by: org.apache.maven.api.plugin.MojoException: Invalid automatic module name: \"in-valid.name.with.new.keyword\"."
     };
 
     System.out.println("\nVerifying log snippets...");

src/it/MJAR-275-reproducible-module-info/invoker.properties

@@ -5,17 +5,15 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
 
-# NOTE: Requires Java 10+ to compile the module declaration for Java 9+,
-# this is due that compiling the module declaration generates a
-# module descriptor with the JDK version on it, making it unreproducible.
-invoker.java.version = 10+
+# The --date option needed for reproducible build is available only since Java 19.
+invoker.java.version = 19+

src/it/MJAR-292-detect-mjar/pom.xml

@@ -86,8 +86,8 @@
             </manifest>
             <manifestEntries>
               <!--
-                We override this config since we are detecting the versioned area,
-                The output JAR should contain `Multi-Release: true`
+                For verifying that this entry will be overridden.
+                If users really want to disable multi-release, they should set <detectMultiReleaseJar> to false.
                -->
               <Multi-Release>false</Multi-Release>
             </manifestEntries>

src/it/MJAR-292-disable-detect-mjar/pom.xml

@@ -84,6 +84,7 @@
               <mainClass>myproject.HelloWorld</mainClass>
             </manifest>
           </archive>
+          <detectMultiReleaseJar>false</detectMultiReleaseJar>
         </configuration>
       </plugin>
     </plugins>

src/it/MJAR-30-include/verify.groovy

@@ -67,7 +67,7 @@ try
     {
         String artifactName = artifactNames[i];
 		if ( !contents.contains( artifactName ) )
-		{
+        {
         	System.err.println( "Artifact[" + artifactName + "] not found in jar archive" );
         	return false;
         }

src/it/MJAR-70-recreation/verify.bsh

@@ -58,7 +58,7 @@ if ( buildLog.exists() ) {
 int jarPluginExecutions = 0;
 String[] lines = buildLogContent.split( "\n" );
 for ( String line : lines ) {
-    if ( line.contains( "Building jar:" ) && line.contains( "MJAR-70-recreation-1.0-SNAPSHOT.jar" ) ) {
+    if ( line.contains( "Building JAR:" ) && line.contains( "MJAR-70-recreation-1.0-SNAPSHOT.jar" ) ) {
         jarPluginExecutions++;
         System.out.println( "Found JAR creation: " + line );
     }

src/it/directory-entries-mr/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>directory-entries-mr</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>directory-entries-mr-it</name>
+  <description>Verifies that a non-modular multi-release JAR preserves the intermediate directory
+    entries (com/, com/acme/, com/acme/sub/) in the base area and in the versioned area
+    (META-INF/versions/17/, .../com/, .../com/acme/). Consumers relying on JAR directory
+    traversal (e.g. Spring @ComponentScan) depend on those entries being present.
+
+    This is the same test as `directory-entries` but with multi-release.</description>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.10.1</version>
+          <configuration>
+            <release>11</release>
+          </configuration>
+          <executions>
+            <execution>
+              <id>java17</id>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+              <configuration>
+                <release>17</release>
+                <compileSourceRoots>
+                  <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
+                </compileSourceRoots>
+                <multiReleaseOutput>true</multiReleaseOutput>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>@project.version@</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>

src/it/directory-entries-mr/src/main/java/com/acme/App.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.acme;
+
+public class App {
+    public String greet() {
+        return "Hello (base) from " + new com.acme.sub.Helper().name();
+    }
+}

src/it/directory-entries-mr/src/main/java/com/acme/sub/Helper.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.acme.sub;
+
+public class Helper {
+    public String name() {
+        return "helper";
+    }
+}

src/it/directory-entries-mr/src/main/java17/com/acme/App.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.acme;
+
+/**
+ * JDK-17 specific override of {@link App}. Placed under {@code src/main/java17} and compiled with
+ * {@code multiReleaseOutput=true}, so it lands in {@code META-INF/versions/17/com/acme/App.class}.
+ */
+public class App {
+    public String greet() {
+        return "Hello (java17) from " + new com.acme.sub.Helper().name();
+    }
+}

src/it/directory-entries-mr/verify.groovy

@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.jar.Attributes
+import java.util.jar.JarFile
+
+File artifact = new File(basedir, "target/directory-entries-mr-1.0-SNAPSHOT.jar")
+assert artifact.isFile() : "JAR artifact is missing: " + artifact
+
+JarFile jar = new JarFile(artifact)
+try {
+    // Sanity: this must really be a multi-release JAR.
+    assert jar.manifest.mainAttributes.getValue(Attributes.Name.MULTI_RELEASE) == "true" :
+        "Expected Multi-Release: true in the manifest"
+
+    // Regression guard for maven-jar-plugin #508, extended to non-modular multi-release JARs.
+    // if the JAR is built by enumerating individual files, the intermediate directory entries
+    // can not be specified (if they were, they would be traversed), which breaks consumers
+    // relying on JAR directory traversal (e.g. Spring Boot @ComponentScan). Assert that the
+    // directory entries are present in both the base area and the "META-INF/versions/17" area.
+    def requiredDirectoryEntries = [
+        // base area
+        "com/",
+        "com/acme/",
+        "com/acme/sub/",
+        // versioned area
+        "META-INF/versions/17/",
+        "META-INF/versions/17/com/",
+        "META-INF/versions/17/com/acme/"
+    ]
+    for (String name : requiredDirectoryEntries) {
+        def entry = jar.getEntry(name)
+        assert entry != null : "Missing directory entry: " + name
+        assert entry.isDirectory() : "Entry is not a directory: " + name
+    }
+
+    // The class files must of course still be present.
+    def requiredFileEntries = [
+        "com/acme/App.class",
+        "com/acme/sub/Helper.class",
+        "META-INF/versions/17/com/acme/App.class"
+    ]
+    for (String name : requiredFileEntries) {
+        def entry = jar.getEntry(name)
+        assert entry != null : "Missing class entry: " + name
+        assert !entry.isDirectory() : "Class entry unexpectedly a directory: " + name
+    }
+} finally {
+    jar.close()
+}
+
+return true

src/it/directory-entries/invoker.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = clean package