This is an automated email from the ASF dual-hosted git repository. srowen pushed a commit to branch branch-3.3 in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.3 by this push: new 5daf367 [SPARK-38544][BUILD] Upgrade log4j2 to 2.17.2 5daf367 is described below commit 5daf367e11c71371b8dda139a2ea912e2427936f Author: jackylee-ch <lijunq...@baidu.com> AuthorDate: Sat Mar 19 08:56:15 2022 -0500 [SPARK-38544][BUILD] Upgrade log4j2 to 2.17.2 ### What changes were proposed in this pull request? This pr aims to upgrade log4j2 to 2.17.2. ### Why are the changes needed? This version brings a lot of fixes released to log1.x support, the release notes and change report as follows: - https://logging.apache.org/log4j/2.x/index.html#News - https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.2 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? GA Closes #35898 from jackylee-ch/fix_update_log4j2_to_2.17.2. Authored-by: jackylee-ch <lijunq...@baidu.com> Signed-off-by: Sean Owen <sro...@gmail.com> (cherry picked from commit 4661455aa03e30af3a2fe911ad8c5c5a12e1790b) Signed-off-by: Sean Owen <sro...@gmail.com> --- dev/deps/spark-deps-hadoop-2-hive-2.3 | 8 ++++---- dev/deps/spark-deps-hadoop-3-hive-2.3 | 8 ++++---- pom.xml | 2 +- .../deploy/k8s/integrationtest/SparkConfPropagateSuite.scala | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3 b/dev/deps/spark-deps-hadoop-2-hive-2.3 index 28cb7c1..06d5939 100644 --- a/dev/deps/spark-deps-hadoop-2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2-hive-2.3 @@ -187,10 +187,10 @@ lapack/2.2.1//lapack-2.2.1.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.12.0//libthrift-0.12.0.jar -log4j-1.2-api/2.17.1//log4j-1.2-api-2.17.1.jar -log4j-api/2.17.1//log4j-api-2.17.1.jar -log4j-core/2.17.1//log4j-core-2.17.1.jar -log4j-slf4j-impl/2.17.1//log4j-slf4j-impl-2.17.1.jar +log4j-1.2-api/2.17.2//log4j-1.2-api-2.17.2.jar +log4j-api/2.17.2//log4j-api-2.17.2.jar +log4j-core/2.17.2//log4j-core-2.17.2.jar +log4j-slf4j-impl/2.17.2//log4j-slf4j-impl-2.17.2.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 07549ef..2e9b0e3 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -172,10 +172,10 @@ lapack/2.2.1//lapack-2.2.1.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.12.0//libthrift-0.12.0.jar -log4j-1.2-api/2.17.1//log4j-1.2-api-2.17.1.jar -log4j-api/2.17.1//log4j-api-2.17.1.jar -log4j-core/2.17.1//log4j-core-2.17.1.jar -log4j-slf4j-impl/2.17.1//log4j-slf4j-impl-2.17.1.jar +log4j-1.2-api/2.17.2//log4j-1.2-api-2.17.2.jar +log4j-api/2.17.2//log4j-api-2.17.2.jar +log4j-core/2.17.2//log4j-core-2.17.2.jar +log4j-slf4j-impl/2.17.2//log4j-slf4j-impl-2.17.2.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.8.0//lz4-java-1.8.0.jar mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar diff --git a/pom.xml b/pom.xml index d8b5b87..a751bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> <sbt.project.name>spark</sbt.project.name> <slf4j.version>1.7.32</slf4j.version> - <log4j.version>2.17.1</log4j.version> + <log4j.version>2.17.2</log4j.version> <!-- make sure to update IsolatedClientLoader whenever this version is changed --> <hadoop.version>3.3.2</hadoop.version> <protobuf.version>2.5.0</protobuf.version> diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/SparkConfPropagateSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/SparkConfPropagateSuite.scala index 7ed82e3..318b928 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/SparkConfPropagateSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/SparkConfPropagateSuite.scala @@ -41,8 +41,9 @@ private[spark] trait SparkConfPropagateSuite { k8sSuite: KubernetesSuite => sparkAppConf.set("spark.executor.extraJavaOptions", "-Dlog4j2.debug") sparkAppConf.set("spark.kubernetes.executor.deleteOnTermination", "false") + // since 2.17.2, log4j2 loads the original log4j2.properties instead of the soft link. val log4jExpectedLog = - Seq("Reconfiguration complete for context", "at URI /opt/spark/conf/log4j2.properties") + Seq("Reconfiguration complete for context", "at URI /opt/spark/conf", "/log4j2.properties") runSparkApplicationAndVerifyCompletion( appResource = containerLocalSparkDistroExamplesJar, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org