[myfaces-tobago] 01/04: fix: release:prepare

[hn...@apache.org]

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

hnoeth pushed a commit to annotated tag tobago-6.0.0-beta-1
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit a35056c8dfaddb3efd7c8f7026148feb95c9e57b
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Sep 14 12:19:36 2023 +0200

    fix: release:prepare
    
    The "mvn release:prepare" command activates both maven profiles "apache-release" and "generate-assembly". This leads to an issue because the maven-source-plugin is defined two times.
    To fix this, the "mvn release:prepare" command activate the "apache-release" which also execute the tasks of the "generate-assembly" profile.
    
    Remove the "attach-source" profile in the tobago-core POM, because the "jar" goal of the maven-source-plugin is already execute in the default build.
---
 pom.xml             | 30 +++++++++++++++++++++++++++---
 tobago-core/pom.xml | 18 ------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b3ad2ff9f..6e59109f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -781,7 +781,7 @@
             <waitBeforeTagging>20</waitBeforeTagging>
             <useReleaseProfile>false</useReleaseProfile>
             <goals>deploy</goals>
-            <arguments>-Papache-release,generate-assembly ${arguments}</arguments>
+            <arguments>-Papache-release</arguments>
           </configuration>
         </plugin>
         <plugin>
@@ -927,7 +927,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <groupId>org.owasp</groupId>
             <artifactId>dependency-check-maven</artifactId>
@@ -939,7 +938,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <artifactId>maven-source-plugin</artifactId>
             <executions>
@@ -962,6 +960,32 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.apache.resources</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <version>1.5</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                  </descriptorRefs>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index db2443db81..aed7c0a844 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -246,24 +246,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>attach-source</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-source</id>
-                <goals><goal>jar</goal></goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>jsf-4.0</id>
       <activation>