From e7259ba001b335d30d043f2f864b39a873dd1665 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sat, 20 Jan 2024 11:10:06 +0100
Subject: [PATCH] Configure assembly plugin to use proper folders

---
 assembly/pom.xml | 2 --
 pom.xml          | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 2c5209364..44f044bd2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -124,8 +124,6 @@
                         <descriptor>src/main/assembly/docs.xml</descriptor>
                     </descriptors>
                     <finalName>struts-${project.version}</finalName>
-                    <outputDirectory>target/assembly/out</outputDirectory>
-                    <workDirectory>target/assembly/work</workDirectory>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 9f8875107..207a92d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,14 @@
                     <artifactId>maven-wrapper-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>assembly/out</outputDirectory>
+                        <workDirectory>assembly/work</workDirectory>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>