From ce7671568bb3fc8170c8e6171fef38e3de10ac96 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 19 Apr 2024 09:14:10 +0200
Subject: [PATCH] Fixes after merge assembly issue

---
 assembly/pom.xml                              |  3 +-
 .../src/main/resources/osgi/admin/shell.ftl   |  0
 core/pom.xml                                  | 45 -------------------
 pom.xml                                       |  2 -
 4 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 bundles/admin/src/main/resources/osgi/admin/shell.ftl

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6dc24d2c1..2654b1c4c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -115,7 +115,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <skipAssembly>false</skipAssembly>
                     <descriptors>
                         <descriptor>src/main/assembly/all.xml</descriptor>
                         <descriptor>src/main/assembly/lib.xml</descriptor>
@@ -125,6 +124,8 @@
                         <descriptor>src/main/assembly/docs.xml</descriptor>
                     </descriptors>
                     <finalName>struts-${project.version}</finalName>
+                    <outputDirectory>${project.build.directory}/assembly/out</outputDirectory>
+                    <workDirectory>${project.build.directory}/assembly/work</workDirectory>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/bundles/admin/src/main/resources/osgi/admin/shell.ftl b/bundles/admin/src/main/resources/osgi/admin/shell.ftl
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/pom.xml b/core/pom.xml
index c03a49dca..5dc84bf39 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -132,53 +132,8 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>alljars</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-source</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <sourcepath>${basedir}/src/main/java;${basedir}/../xwork-core/src/main/java</sourcepath>
-                            <encoding>UTF-8</encoding>
-                            <groups>
-                                <group>
-                                    <title>Struts Packages</title>
-                                    <packages>org.apache.struts2*</packages>
-                                </group>
-                                <group>
-                                    <title>XWork Packages</title>
-                                    <packages>com.opensymphony.xwork2*</packages>
-                                </group>
-                            </groups>
-                            <show>private</show>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/javaee/5/docs/api/</link>
-                                <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                                <link>http://logging.apache.org/log4j/docs/api/</link>
-                            </links>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
-
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
diff --git a/pom.xml b/pom.xml
index ff227afe5..26afcc8ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,8 +349,6 @@
                     <configuration>
                         <skipAssembly>true</skipAssembly>
                         <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        <outputDirectory>assembly/out</outputDirectory>
-                        <workDirectory>assembly/work</workDirectory>
                     </configuration>
                 </plugin>
                 <plugin>