(struts) 01/02: Fixes creating assembly during release process

[lukaszlenart]

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

lukaszlenart pushed a commit to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 0a3b596648348894f52c3cc3e4b3a3fc1b63b47a
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Apr 20 09:17:11 2024 +0200

    Fixes creating assembly during release process
---
 assembly/pom.xml | 1 +
 pom.xml          | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8aa56982b..4fb804e25 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -115,6 +115,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <skipAssembly>false</skipAssembly>
                     <descriptors>
                         <descriptor>src/main/assembly/all.xml</descriptor>
                         <descriptor>src/main/assembly/lib.xml</descriptor>
diff --git a/pom.xml b/pom.xml
index 4fddf7ceb..3a7a2e5be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts-master</artifactId>
-        <version>14</version>
+        <version>15</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -345,10 +345,8 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.6.0</version>
                     <configuration>
                         <skipAssembly>true</skipAssembly>
-                        <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
                     </configuration>
                 </plugin>
                 <plugin>