You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2023/09/14 10:45:08 UTC
[myfaces-tobago] annotated tag tobago-6.0.0-beta-1 created (now 5dce753ff0)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to annotated tag tobago-6.0.0-beta-1
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
at 5dce753ff0 (tag)
tagging 573e651082986ae9c41bf0da3ce27c6bc6d86941 (commit)
replaces tobago-5.0.0-alpha-2
by Henning Noeth
on Thu Sep 14 12:45:05 2023 +0200
- Log -----------------------------------------------------------------
[maven-release-plugin] copy for tag tobago-6.0.0-beta-1
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new a35056c8df fix: release:prepare
new c3985faee7 delete maven-source-plugin
new 5848add9e7 delete maven-source-plugin from apache-release profile
new 573e651082 delete maven-source-plugin from tobago-core POM
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[myfaces-tobago] 01/04: fix: release:prepare
Posted by 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>
[myfaces-tobago] 04/04: delete maven-source-plugin from tobago-core POM
Posted by 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 573e651082986ae9c41bf0da3ce27c6bc6d86941
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Sep 14 12:43:22 2023 +0200
delete maven-source-plugin from tobago-core POM
---
tobago-core/pom.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index aed7c0a844..c7ef7c4092 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -107,18 +107,6 @@
</archive>
</configuration>
</plugin>
- <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>
[myfaces-tobago] 02/04: delete maven-source-plugin
Posted by 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 c3985faee71c4827d3e2d3fabe56289b56028da7
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Sep 14 12:24:56 2023 +0200
delete maven-source-plugin
---
pom.xml | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e59109f7c..e0db43f585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1112,16 +1112,6 @@
</execution>
</executions>
</plugin>
- <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>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<dependencies>
[myfaces-tobago] 03/04: delete maven-source-plugin from apache-release profile
Posted by 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 5848add9e7e1feca8fb3498b0967384a49554bbd
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Sep 14 12:26:46 2023 +0200
delete maven-source-plugin from apache-release profile
---
pom.xml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index e0db43f585..2a11724008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -938,17 +938,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>