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 8e52fd3 [SPARK-37853][CORE][SQL][FOLLOWUP] Clean up log4j2 deprecation api usage 8e52fd3 is described below commit 8e52fd308430b0d723e5d04b3f88d093b02058b0 Author: yangjie01 <yangji...@baidu.com> AuthorDate: Mon Mar 28 18:23:12 2022 -0500 [SPARK-37853][CORE][SQL][FOLLOWUP] Clean up log4j2 deprecation api usage ### What changes were proposed in this pull request? This pr just fix a previously unnoticed deprecation api usage related to log4j2. ### Why are the changes needed? Clean up log4j2 deprecation api usage ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass GA Closes #35796 from LuciferYang/SPARK-37853-FOLLOWUP. Authored-by: yangjie01 <yangji...@baidu.com> Signed-off-by: Sean Owen <sro...@gmail.com> (cherry picked from commit 84bc452bb59d2b4067b617f8dd32d35f875b1e72) Signed-off-by: Sean Owen <sro...@gmail.com> --- .../test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java | 3 ++- .../java/org/apache/hive/service/cli/operation/LogDivertAppender.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java b/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java index b0525a6..6a0c584 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/ChildProcAppHandleSuite.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.stream.Collectors; import static java.nio.file.attribute.PosixFilePermission.*; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.*; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; @@ -249,7 +250,7 @@ public class ChildProcAppHandleSuite extends BaseSuite { Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions) { - super(name, filter, layout, ignoreExceptions); + super(name, filter, layout, ignoreExceptions, Property.EMPTY_ARRAY); } @Override diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java index ca0fbe7..64730f3 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java @@ -38,6 +38,7 @@ import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.AbstractWriterAppender; import org.apache.logging.log4j.core.appender.WriterManager; import com.google.common.base.Joiner; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.message.Message; /** @@ -278,7 +279,7 @@ public class LogDivertAppender extends AbstractWriterAppender<WriterManager> { public LogDivertAppender(OperationManager operationManager, OperationLog.LoggingLevel loggingMode) { - super("LogDivertAppender", initLayout(loggingMode), null, false, true, + super("LogDivertAppender", initLayout(loggingMode), null, false, true, Property.EMPTY_ARRAY, new WriterManager(new CharArrayWriter(), "LogDivertAppender", initLayout(loggingMode), true)); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org