You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2021/12/12 10:49:16 UTC
[flink] branch release-1.13 updated: [FLINK-25240][build] Upgrade Log4j2 to 2.15.0
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.13 by this push:
new 0c2fd40 [FLINK-25240][build] Upgrade Log4j2 to 2.15.0
0c2fd40 is described below
commit 0c2fd40dbcaaa714d7d65ecd219da66f5af08a48
Author: Ada Wong <rs...@foxmail.com>
AuthorDate: Sun Dec 12 18:43:39 2021 +0800
[FLINK-25240][build] Upgrade Log4j2 to 2.15.0
---
docs/content.zh/docs/dev/datastream/project-configuration.md | 2 +-
docs/content/docs/dev/datastream/project-configuration.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/datastream/project-configuration.md b/docs/content.zh/docs/dev/datastream/project-configuration.md
index 3e8f40b..6a9f86a 100644
--- a/docs/content.zh/docs/dev/datastream/project-configuration.md
+++ b/docs/content.zh/docs/dev/datastream/project-configuration.md
@@ -331,7 +331,7 @@ ext {
flinkVersion = '1.13-SNAPSHOT'
scalaBinaryVersion = '2.11'
slf4jVersion = '1.7.15'
- log4jVersion = '2.12.1'
+ log4jVersion = '2.15.0'
}
diff --git a/docs/content/docs/dev/datastream/project-configuration.md b/docs/content/docs/dev/datastream/project-configuration.md
index 1e20f02..2febacc 100644
--- a/docs/content/docs/dev/datastream/project-configuration.md
+++ b/docs/content/docs/dev/datastream/project-configuration.md
@@ -330,7 +330,7 @@ ext {
flinkVersion = '1.13-SNAPSHOT'
scalaBinaryVersion = '2.11'
slf4jVersion = '1.7.15'
- log4jVersion = '2.12.1'
+ log4jVersion = '2.15.0'
}
diff --git a/pom.xml b/pom.xml
index 7fae29d..97bac60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@ under the License.
<akka.version>2.5.21</akka.version>
<target.java.version>1.8</target.java.version>
<slf4j.version>1.7.15</slf4j.version>
- <log4j.version>2.12.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<!-- Overwrite default values from parent pom.
Intellij 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 fba3eb0..833e717 100644
--- a/tools/releasing/NOTICE-binary_PREAMBLE.txt
+++ b/tools/releasing/NOTICE-binary_PREAMBLE.txt
@@ -8,10 +8,10 @@ Copyright 2014-2021 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.12.1
-- org.apache.logging.log4j:log4j-core:2.12.1
-- org.apache.logging.log4j:log4j-slf4j-impl:2.12.1
-- org.apache.logging.log4j:log4j-1.2-api:2.12.1
+- org.apache.logging.log4j:log4j-api:2.15.0
+- org.apache.logging.log4j:log4j-core:2.15.0
+- org.apache.logging.log4j:log4j-slf4j-impl:2.15.0
+- org.apache.logging.log4j:log4j-1.2-api:2.15.0
This project bundles the following dependencies under the BSD license.
See bundled license files for details.