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 2024/04/18 14:02:16 UTC
(logging-log4j2) branch main updated (1e545f6b35 -> 8bcb2a9597)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 1e545f6b35 Bump `logging-parent` to version `11.0.0`
new 44398dcab6 Fix `generate-email.sh`
new 8bcb2a9597 Remove redundant `java-version` parameter from CI
The 2 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.
Summary of changes:
.github/generate-email.sh | 15 ++++++++-------
.github/workflows/build.yaml | 4 ----
.github/workflows/merge-dependabot.yaml | 4 ----
3 files changed, 8 insertions(+), 15 deletions(-)
(logging-log4j2) 02/02: Remove redundant `java-version` parameter from CI
Posted by vy...@apache.org.
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-log4j2.git
commit 8bcb2a95970e05f310c60a8460ae4bf223d950a6
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Apr 18 16:02:11 2024 +0200
Remove redundant `java-version` parameter from CI
---
.github/workflows/build.yaml | 4 ----
.github/workflows/merge-dependabot.yaml | 4 ----
2 files changed, 8 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1e9a8c6162..69532e45e1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,6 @@ jobs:
if: github.actor != 'dependabot[bot]'
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.0.0
with:
- java-version: 17
site-enabled: true
deploy-snapshot:
@@ -51,8 +50,6 @@ jobs:
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PW }}
- with:
- java-version: 17
deploy-release:
needs: build
@@ -69,5 +66,4 @@ jobs:
permissions:
contents: write
with:
- java-version: 17
project-id: log4j
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
index 67fc0de075..db3b848117 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -31,14 +31,10 @@ jobs:
build:
if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.0.0
- with:
- java-version: 17
merge-dependabot:
needs: build
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.0.0
- with:
- java-version: 17
permissions:
contents: write # to push changelog commits
pull-requests: write # to close the PR
(logging-log4j2) 01/02: Fix `generate-email.sh`
Posted by vy...@apache.org.
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-log4j2.git
commit 44398dcab60ffdd9852dc4fd1f48054479d7d12a
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Apr 18 15:57:55 2024 +0200
Fix `generate-email.sh`
---
.github/generate-email.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
index de718c96ad..17cd36a90c 100755
--- a/.github/generate-email.sh
+++ b/.github/generate-email.sh
@@ -41,7 +41,7 @@ PROJECT_VERSION="$2"
COMMIT_ID="$3"
# Check release notes file
-RELEASE_NOTES_FILE="$SCRIPT_DIR/../src/site/_release-notes/_$PROJECT_VERSION.adoc"
+RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pages/_release-notes/$PROJECT_VERSION.adoc"
[ -f "$RELEASE_NOTES_FILE" ] || {
stderr "Couldn't find release notes file: $RELEASE_NOTES_FILE"
exit 1
@@ -56,7 +56,8 @@ dump_review_kit() {
dump_release_notes() {
awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE" \
- | sed -r 's!'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]!#\2!g'
+ | sed -r 's!'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]!#\2!g' \
+ | sed -r 's!https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]!\5!g'
}
case $1 in
@@ -64,11 +65,11 @@ case $1 in
vote)
cat <<EOF
To: dev@logging.apache.org
-Title: [VOTE] Release $PROJECT_NAME $PROJECT_VERSION
+Title: [VOTE] Release $PROJECT_NAME \`$PROJECT_VERSION\`
-This is a vote to release the $PROJECT_NAME $PROJECT_VERSION.
+This is a vote to release the $PROJECT_NAME \`$PROJECT_VERSION\`.
-Website: $PROJECT_STAGING_SITE
+Website: $PROJECT_STAGING_SITE-$PROJECT_VERSION
GitHub: $PROJECT_REPO
Commit: $COMMIT_ID
Distribution: $PROJECT_DIST_DIR
@@ -101,9 +102,9 @@ EOF
announce)
cat <<EOF
To: log4j-user@logging.apache.org, dev@logging.apache.org
-Title: [ANNOUNCE] $PROJECT_NAME $PROJECT_VERSION released
+Title: [ANNOUNCE] $PROJECT_NAME \`$PROJECT_VERSION\` released
-${PROJECT_NAME} team is pleased to announce the $PROJECT_VERSION
+${PROJECT_NAME} team is pleased to announce the \`$PROJECT_VERSION\`
release. ${PROJECT_NAME} is a versatile, industrial-strength
Java logging framework composed of an API, its implementation,
and components to assist the deployment for various use cases.