From db6d2eccfc6e4fffda2256dc1f0d3ca8cf5f7ec2 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 8 Oct 2020 13:05:35 +0100
Subject: [PATCH] Change order the plugins run so that the resulting jar and
 zip have the same artifacts as before

---
 distribution/pom.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index ba846f6cd..3eb4d5ffc 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -117,6 +117,7 @@
                 <executions>
                     <execution>
                         <id>default-resources</id>
+                        <!-- runs in process-resources phase. -->
                         <configuration>
                             <overwrite>true</overwrite>
                         </configuration>
@@ -124,7 +125,7 @@
                 </executions>
             </plugin>
 
-            <!-- Copy the enterprise's deployment resources in the validate phase, before default-resources
+            <!-- Copy the enterprise's deployment resources in the generate-resources phase, before default-resources
                  copies this project's resources in the process-resources phase. -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -132,7 +133,7 @@
                 <executions>
                     <execution>
                         <id>unpack-licenses-and-keystore</id>
-                        <phase>validate</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -184,9 +185,11 @@
                     </execution>
 
                     <!-- Copy ROOT.war -->
+                    <!-- This plugin <execution> must be before the "make-assembly" as it is in the same phase -->
                     <execution>
                         <id>copy-resources-war</id>
-                        <phase>generate-resources</phase>
+                        <!-- We want the wars in the zip but not the package's jar. -->
+                        <phase>package</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>