From c8aae644acbc071471fc5bf637fa8705f6146490 Mon Sep 17 00:00:00 2001
From: Brian Burton <brian.burton@adhocteam.us>
Date: Sat, 9 Dec 2023 12:15:29 -0500
Subject: [PATCH] BFD-3111: Deletes assembly files prior to build.

---
 apps/bfd-server/bfd-server-image/pom.xml    | 33 ++++++++++++++++++++-
 apps/bfd-server/bfd-server-launcher/pom.xml | 31 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/apps/bfd-server/bfd-server-image/pom.xml b/apps/bfd-server/bfd-server-image/pom.xml
index aaf3e697b0..27acc8d120 100644
--- a/apps/bfd-server/bfd-server-image/pom.xml
+++ b/apps/bfd-server/bfd-server-image/pom.xml
@@ -23,7 +23,7 @@
         <!-- Name of the image generated by jib plugin. -->
         <image-name>bfd-server</image-name>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <!-- BFD WAR file is required to build the image. -->
@@ -57,6 +57,37 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <!--
+             File permissions on some of the files in the bfd-server-launcher zip file cause builds to
+             fail with a permission violation when unpacking the file while the files already exist.
+             This maven-clean-plugin execution solves that problem by automatically deleting the unpacked
+             files before the dependency plugin unpacks them again.
+             -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.build.directory}/server-launcher</directory>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                    <followSymlinks>false</followSymlinks>
+                                </fileset>
+                            </filesets>
+                            <excludeDefaultDirectories>true</excludeDefaultDirectories>
+                        </configuration>
+                        <id>delete-launcher-artifacts</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/apps/bfd-server/bfd-server-launcher/pom.xml b/apps/bfd-server/bfd-server-launcher/pom.xml
index bfa90c9987..41c1f99853 100644
--- a/apps/bfd-server/bfd-server-launcher/pom.xml
+++ b/apps/bfd-server/bfd-server-launcher/pom.xml
@@ -189,6 +189,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!--
+             File permissions on some of the files in the bfd-server-launcher zip file cause builds to
+             fail with a permission violation when unpacking the file while the files already exist.
+             This maven-clean-plugin execution solves that problem by automatically deleting the unpacked
+             files before the dependency plugin unpacks them again.
+             -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.build.directory}/server-work</directory>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                    <followSymlinks>false</followSymlinks>
+                                </fileset>
+                            </filesets>
+                            <excludeDefaultDirectories>true</excludeDefaultDirectories>
+                        </configuration>
+                        <id>delete-launcher-artifacts</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>