This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 25b02e9ca6 Update `apache/logging-parent` to version `` (#2191)
25b02e9ca6 is described below
commit 25b02e9ca6f48ce336938e684ba80040b43bbc70
Author: ASF Logging Services RM <[email protected]>
AuthorDate: Mon Jan 15 10:33:30 2024 +0000
Update `apache/logging-parent` to version `` (#2191)
---
.github/workflows/build.yaml | 6 +++---
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/merge-dependabot.yaml | 4 ++--
src/changelog/.3.x.x/update_apache_logging_parent.xml | 8 ++++++++
src/site/_release-notes/_3.x.x.adoc | 3 ++-
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b427102aae..3651600ebd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
build:
if: github.actor != 'dependabot[bot]'
- uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/10.5.0
+ uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/10.6.0
with:
java-version: 17
site-enabled: true
@@ -46,7 +46,7 @@ jobs:
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j2' && github.ref_name ==
'main'
- uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/10.5.0
+ uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/10.6.0
# Secrets for deployments
secrets:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -57,7 +57,7 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-log4j2' &&
startsWith(github.ref_name, 'release/')
- uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/10.5.0
+ uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/10.6.0
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yaml
b/.github/workflows/codeql-analysis.yaml
index d14fd7c797..25871f3dfd 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -30,7 +30,7 @@ permissions: read-all
jobs:
analyze:
- uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/10.5.0
+ uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/10.6.0
with:
java-version: 17
# Permissions required to publish Security Alerts
diff --git a/.github/workflows/merge-dependabot.yaml
b/.github/workflows/merge-dependabot.yaml
index 0e6d2a13ea..7dbed5f372 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,13 +30,13 @@ 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/10.5.0
+ uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/10.6.0
with:
java-version: 17
merge-dependabot:
needs: build
- uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/10.5.0
+ uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/10.6.0
with:
java-version: 17
permissions:
diff --git a/src/changelog/.3.x.x/update_apache_logging_parent.xml
b/src/changelog/.3.x.x/update_apache_logging_parent.xml
new file mode 100644
index 0000000000..dced805653
--- /dev/null
+++ b/src/changelog/.3.x.x/update_apache_logging_parent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://logging.apache.org/log4j/changelog";
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd";
+ type="updated">
+ <issue id="2191" link="https://github.com/apache/logging-log4j2/pull/2191"/>
+ <description format="asciidoc">Update `apache/logging-parent` to version
``</description>
+</entry>
diff --git a/src/site/_release-notes/_3.x.x.adoc
b/src/site/_release-notes/_3.x.x.adoc
index e50079e4de..bdabf881a1 100644
--- a/src/site/_release-notes/_3.x.x.adoc
+++ b/src/site/_release-notes/_3.x.x.adoc
@@ -29,7 +29,6 @@ This release contains...
[#release-notes-3-x-x-changed]
=== Changed
-* Moves legacy `2.x` properties configuration factory to
`log4j-config-properties-legacy`.
* Split off YAML configuration into a new `log4j-config-yaml` module.
* Update
`com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to
version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2102[2102])
* Update `com.google.guava:guava` to version `33.0.0-jre`
(https://github.com/apache/logging-log4j2/pull/2108[2108])
@@ -48,6 +47,7 @@ This release contains...
[#release-notes-3-x-x-removed]
=== Removed
+* Removed legacy `2.x` properties configuration factory.
* Remove `DefaultLogEventFactory`
* Remove `org.apache.logging.log4j.core.parser` and related packages.
(https://github.com/apache/logging-log4j2/pull/2154[2154])
* Remove `log4j2.enable.threadlocals` property
(https://github.com/apache/logging-log4j2/issues/2105[2105])
@@ -55,6 +55,7 @@ This release contains...
[#release-notes-3-x-x-updated]
=== Updated
+* Update `apache/logging-parent` to version ``
(https://github.com/apache/logging-log4j2/pull/2191[2191])
* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1`
(https://github.com/apache/logging-log4j2/pull/2127[2127])
* Update `org.apache.groovy:groovy-bom` to version `4.0.17`
(https://github.com/apache/logging-log4j2/pull/2124[2124])
* Update `org.apache.logging:logging-parent` to version `10.5.0`
(https://github.com/apache/logging-log4j2/pull/2118[2118])
