(jackrabbit) branch 2.20 updated: JCR-4980: make webapp build reproducible by switching to maven-jar-plugin (patch by Herve Boutemy)

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 2.20
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git


The following commit(s) were added to refs/heads/2.20 by this push:
     new 79e6c48f8 JCR-4980: make webapp build reproducible by switching to maven-jar-plugin (patch by Herve Boutemy)
79e6c48f8 is described below

commit 79e6c48f8e019857e3d22bbdae648e896d5a9b14
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Nov 14 11:09:19 2023 +0000

    JCR-4980: make webapp build reproducible by switching to maven-jar-plugin (patch by Herve Boutemy)
    
    git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1913763 13f79535-47bb-0310-9956-ffa450edef68
---
 jackrabbit-webapp/pom.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/jackrabbit-webapp/pom.xml b/jackrabbit-webapp/pom.xml
index 3f0005e97..665977f1e 100644
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -134,28 +134,25 @@
     <plugins>
       <plugin>
         <!-- create a jar in addition to our war, to make our servlets reusable -->
-        <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <jar basedir="${project.build.outputDirectory}" destfile="${project.build.directory}/jackrabbit-webapp-${project.version}.jar" />
-              </target>
-            </configuration>
+            <id>prepare-jar</id>
+            <!-- use prepare-package phase to attach before war has already been attached, that would trigger sanity check in maven-jar-plugin requiring a classifier -->
+            <phase>prepare-package</phase>
             <goals>
-              <goal>run</goal>
+              <goal>jar</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <!-- add the jar created by maven-antrun-plugin in our artifacts -->
+        <!-- add the jar created by maven-jar-plugin in our artifacts -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-artifacts</id>
+            <id>attach-jar</id>
             <phase>package</phase>
             <goals>
               <goal>attach-artifact</goal>