From 673440f6d4b27eaae841b277c75bd07af5b9d393 Mon Sep 17 00:00:00 2001 From: ASF Logging Services RM Date: Fri, 1 Mar 2024 10:53:24 +0000 Subject: [PATCH 1/2] Update `github/codeql-action` to version `3.24.6` (#2332) --- .github/workflows/scorecards-analysis.yaml | 2 +- src/changelog/.2.x.x/update_github_codeql_action.xml | 4 ++-- src/site/_release-notes/_2.x.x.adoc | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scorecards-analysis.yaml b/.github/workflows/scorecards-analysis.yaml index 1519c3e89b0..cc61f7fdabc 100644 --- a/.github/workflows/scorecards-analysis.yaml +++ b/.github/workflows/scorecards-analysis.yaml @@ -70,6 +70,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # 2.1.22 + uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 2.1.22 with: sarif_file: results.sarif diff --git a/src/changelog/.2.x.x/update_github_codeql_action.xml b/src/changelog/.2.x.x/update_github_codeql_action.xml index efcbf4fbd60..70718fb54c3 100644 --- a/src/changelog/.2.x.x/update_github_codeql_action.xml +++ b/src/changelog/.2.x.x/update_github_codeql_action.xml @@ -3,6 +3,6 @@ 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"> - - Update `github/codeql-action` to version `3.24.5` + + Update `github/codeql-action` to version `3.24.6` diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index d0138e216b0..a7fd8a1dd35 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -28,13 +28,19 @@ This releases contains ... * Improve performance of `CloseableThreadContext#closeMap()` (https://github.com/apache/logging-log4j2/pull/2296[2296]) +[#release-notes-2-x-x-fixed] +=== Fixed + +* Add `log4j2.StatusLogger.DateFormatZone` system property to set the time-zone `StatusLogger` uses to format `java.time.Instant`. Without this formatting patterns accessing to time-zone-specific fields (e.g., year-of-era) cause failures. +* Fix stack overflow in `StatusLogger` + [#release-notes-2-x-x-updated] === Updated * Update `co.elastic.clients:elasticsearch-java` to version `8.12.2` (https://github.com/apache/logging-log4j2/pull/2315[2315]) * Update `co.elastic.logging:log4j2-ecs-layout` to version `1.6.0` (https://github.com/apache/logging-log4j2/pull/2301[2301]) * Update `com.github.tomakehurst:wiremock-jre8` to version `2.35.2` (https://github.com/apache/logging-log4j2/pull/2306[2306]) -* Update `github/codeql-action` to version `3.24.5` (https://github.com/apache/logging-log4j2/pull/2317[2317]) +* Update `github/codeql-action` to version `3.24.6` (https://github.com/apache/logging-log4j2/pull/2332[2332]) * Update `io.fabric8:docker-maven-plugin` to version `0.44.0` (https://github.com/apache/logging-log4j2/pull/2299[2299]) * Update `org.apache.commons:commons-compress` to version `1.26.0` (https://github.com/apache/logging-log4j2/pull/2304[2304]) * Update `org.apache.kafka:kafka-clients` to version `3.7.0` (https://github.com/apache/logging-log4j2/pull/2326[2326]) From 9c234901e15c9e7f54e527e56d994aa100bc1cbf Mon Sep 17 00:00:00 2001 From: ASF Logging Services RM Date: Fri, 1 Mar 2024 11:30:46 +0000 Subject: [PATCH 2/2] Update `jakarta.activation:jakarta.activation-api` to version `2.1.3` (#2335) --- log4j-parent/pom.xml | 2 +- .../update_jakarta_activation_jakarta_activation_api.xml | 8 ++++++++ src/site/_release-notes/_2.x.x.adoc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/changelog/.2.x.x/update_jakarta_activation_jakarta_activation_api.xml diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index d276e4a6178..5517c43c0c9 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -93,7 +93,7 @@ 2.7.2 2.16.1 - 2.1.2 + 2.1.3 2.1.2 9.1.0 diff --git a/src/changelog/.2.x.x/update_jakarta_activation_jakarta_activation_api.xml b/src/changelog/.2.x.x/update_jakarta_activation_jakarta_activation_api.xml new file mode 100644 index 00000000000..89c3529e332 --- /dev/null +++ b/src/changelog/.2.x.x/update_jakarta_activation_jakarta_activation_api.xml @@ -0,0 +1,8 @@ + + + + Update `jakarta.activation:jakarta.activation-api` to version `2.1.3` + diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index a7fd8a1dd35..d7acc079e28 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -42,5 +42,6 @@ This releases contains ... * Update `com.github.tomakehurst:wiremock-jre8` to version `2.35.2` (https://github.com/apache/logging-log4j2/pull/2306[2306]) * Update `github/codeql-action` to version `3.24.6` (https://github.com/apache/logging-log4j2/pull/2332[2332]) * Update `io.fabric8:docker-maven-plugin` to version `0.44.0` (https://github.com/apache/logging-log4j2/pull/2299[2299]) +* Update `jakarta.activation:jakarta.activation-api` to version `2.1.3` (https://github.com/apache/logging-log4j2/pull/2335[2335]) * Update `org.apache.commons:commons-compress` to version `1.26.0` (https://github.com/apache/logging-log4j2/pull/2304[2304]) * Update `org.apache.kafka:kafka-clients` to version `3.7.0` (https://github.com/apache/logging-log4j2/pull/2326[2326])