You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fc...@apache.org on 2024/10/11 11:17:04 UTC

(flink) branch master updated: [FLINK-36440] Bump log4j from 2.17.1 to 2.24.1

This is an automated email from the ASF dual-hosted git repository.

fcsaky pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b351fdf0ee [FLINK-36440] Bump log4j from 2.17.1 to 2.24.1
7b351fdf0ee is described below

commit 7b351fdf0eec5f2df86b63618269d896555f0f5b
Author: r-sidd <13...@users.noreply.github.com>
AuthorDate: Fri Oct 11 16:46:58 2024 +0530

    [FLINK-36440] Bump log4j from 2.17.1 to 2.24.1
---
 docs/content.zh/docs/dev/configuration/overview.md | 2 +-
 docs/content/docs/dev/configuration/overview.md    | 2 +-
 pom.xml                                            | 2 +-
 tools/releasing/NOTICE-binary_PREAMBLE.txt         | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/content.zh/docs/dev/configuration/overview.md b/docs/content.zh/docs/dev/configuration/overview.md
index 42241e5cc80..f715ec7b8c1 100644
--- a/docs/content.zh/docs/dev/configuration/overview.md
+++ b/docs/content.zh/docs/dev/configuration/overview.md
@@ -108,7 +108,7 @@ ext {
     flinkVersion = '{{< version >}}'
     scalaBinaryVersion = '{{< scala_version >}}'
     slf4jVersion = '1.7.36'
-    log4jVersion = '2.17.1'
+    log4jVersion = '2.24.1'
 }
 sourceCompatibility = javaVersion
 targetCompatibility = javaVersion
diff --git a/docs/content/docs/dev/configuration/overview.md b/docs/content/docs/dev/configuration/overview.md
index 88b1b49c83c..7e5e20f356a 100644
--- a/docs/content/docs/dev/configuration/overview.md
+++ b/docs/content/docs/dev/configuration/overview.md
@@ -110,7 +110,7 @@ ext {
     flinkVersion = '{{< version >}}'
     scalaBinaryVersion = '{{< scala_version >}}'
     slf4jVersion = '1.7.36'
-    log4jVersion = '2.17.1'
+    log4jVersion = '2.24.1'
 }
 sourceCompatibility = javaVersion
 targetCompatibility = javaVersion
diff --git a/pom.xml b/pom.xml
index 458a139b6a9..ee89fba30b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@ under the License.
 		<flink.markBundledAsOptional>true</flink.markBundledAsOptional>
 		<target.java.version>11</target.java.version>
 		<slf4j.version>1.7.36</slf4j.version>
-		<log4j.version>2.17.1</log4j.version>
+		<log4j.version>2.24.1</log4j.version>
 		<!-- Overwrite default values from parent pom.
 			 IntelliJ IDEA is (sometimes?) using those values to choose target language level
 			 and thus is changing back to java 1.6 on each maven re-import -->
diff --git a/tools/releasing/NOTICE-binary_PREAMBLE.txt b/tools/releasing/NOTICE-binary_PREAMBLE.txt
index c0178d3a004..2e15657f252 100644
--- a/tools/releasing/NOTICE-binary_PREAMBLE.txt
+++ b/tools/releasing/NOTICE-binary_PREAMBLE.txt
@@ -8,10 +8,10 @@ Copyright 2014-2024 The Apache Software Foundation
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- org.apache.logging.log4j:log4j-api:2.17.1
-- org.apache.logging.log4j:log4j-core:2.17.1
-- org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
-- org.apache.logging.log4j:log4j-1.2-api:2.17.1
+- org.apache.logging.log4j:log4j-api:2.24.1
+- org.apache.logging.log4j:log4j-core:2.24.1
+- org.apache.logging.log4j:log4j-slf4j-impl:2.24.1
+- org.apache.logging.log4j:log4j-1.2-api:2.24.1
 
 This project bundles the following dependencies under the BSD license.
 See bundled license files for details.