You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/13 08:51:09 UTC
[logging-log4j-jmx-gui] branch main updated: Bump `logging-parent` version to `10.0.0`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git
The following commit(s) were added to refs/heads/main by this push:
new 49b2793 Bump `logging-parent` version to `10.0.0`
49b2793 is described below
commit 49b27931b7f8f2033741266aaa1893c56a3cb0c0
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Sep 13 10:48:54 2023 +0200
Bump `logging-parent` version to `10.0.0`
---
.github/generate-email.sh | 2 +-
RELEASING.adoc | 19 ++++++++++++---
pom.xml | 27 +---------------------
.../{.1.x.x => .2.x.x}/.release-notes.md.ftl | 0
.../{.1.x.x => .2.x.x}/add-repository.xml | 2 +-
5 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
index afff0bc..8d93ba7 100755
--- a/.github/generate-email.sh
+++ b/.github/generate-email.sh
@@ -82,7 +82,7 @@ EOF
announce)
cat <<EOF
-To: log4j-user@logging.apache.org
+To: log4j-user@logging.apache.org, dev@logging.apache.org
Title: [ANNOUNCE] $PROJECT_NAME $PROJECT_VERSION released
${PROJECT_NAME}[1] team is pleased to announce the $PROJECT_VERSION
diff --git a/RELEASING.adoc b/RELEASING.adoc
index b173ef6..f0dcbc5 100644
--- a/RELEASING.adoc
+++ b/RELEASING.adoc
@@ -99,19 +99,32 @@ I will continue the release process.
=== In the git repository
. Pull the most recent changes and tags
++
+[source,bash]
+----
+git fetch -p
+----
. Tag the release (e.g., `rel/7.8.0`) and push it
+
[source,bash]
----
-git tag -a rel/7.8.0 <COMMIT-ID> -m 7.8.0
+git tag -a rel/7.8.0 <COMMIT-ID> -m 7.8.0 # <1>
git push origin rel/7.8.0
----
+
+<1> You can find the `COMMIT-ID` in the generated vote email.
++
[IMPORTANT]
====
The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons.
====
. Merge `release/7.8.0` to `main`
++
+[source,bash]
+----
+git checkout main
+git merge release/7.8.0
+----
. Set the revision property to the next development version (e.g., `7.9.0-SNAPSHOT`) in xref:pom.xml[`pom.xml`]
. Commit changes and push the `main` branch
. Delete the local and remote copies of the `release/7.8.0` branch
@@ -121,9 +134,9 @@ The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures the
. _Release_ the repository in https://reporter.apache.org/addrelease.html?logging[repository.apache.org]
. In https://dist.apache.org/repos/dist/release/logging/{project-name}[dist.apache.org/repos/dist] Subversion repository,
.. create the `*release*/logging/{project-name}/7.8.0` folder, and copy the signed sources and their checksum from `*dev*/logging/{project-name}` to there
-.. delete the folder from an earlier release in `*release*/logging/{project-name}`
+.. delete the folder from an earlier release in `*release*/logging/{project-name}` (stash the generated announcement email somewhere, you will need it later on)
.. commit changes
-. Report the release at https://reporter.apache.org/[reporter.apache.org]
+. Report the release at https://reporter.apache.org/addrelease.html?logging[reporter.apache.org]
=== In GitHub
diff --git a/pom.xml b/pom.xml
index 7517959..4c3131c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <version>10.0.0</version>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
@@ -156,16 +156,6 @@
</dependencies>
- <!-- `repositories` is only needed for testing unreleased `logging-parent` functionality!
- This block should not go into any release or whatsoever! -->
- <repositories>
- <repository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- </repository>
- </repositories>
-
<build>
<plugins>
@@ -188,21 +178,6 @@
</executions>
</plugin>
- <!-- `logging-parent` is not released yet, hence we still need to use its SNAPSHOT.
- Temporarily disable `enforce-no-snapshots` inherited from `logging-parent`. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-no-snapshots</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
diff --git a/src/changelog/.1.x.x/.release-notes.md.ftl b/src/changelog/.2.x.x/.release-notes.md.ftl
similarity index 100%
rename from src/changelog/.1.x.x/.release-notes.md.ftl
rename to src/changelog/.2.x.x/.release-notes.md.ftl
diff --git a/src/changelog/.1.x.x/add-repository.xml b/src/changelog/.2.x.x/add-repository.xml
similarity index 62%
rename from src/changelog/.1.x.x/add-repository.xml
rename to src/changelog/.2.x.x/add-repository.xml
index 01e08f7..3ff4e5d 100644
--- a/src/changelog/.1.x.x/add-repository.xml
+++ b/src/changelog/.2.x.x/add-repository.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
type="added">
<author id="github:vy"/>
- <description format="markdown">New repository is bootstrapped with auxiliary support files (`README.adoc`, `NOTICE.txt`, etc.) and CI (`build.yml` and `dependabot.yml`) infrastructure</description>
+ <description format="markdown">Project is moved to a new [repository](https://github.com/apache/logging-log4j-jmx-gui) with its own release cycle</description>
</entry>