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

yao pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/branch-1.5 by this push:
     new 1cca417  [KYUUBI #2043] Upgrade log4j/2.x/ to 2.17.2
1cca417 is described below

commit 1cca417c37c97c3765d7455838d4c0665326696e
Author: --replace-all <[email protected]>
AuthorDate: Tue Mar 8 19:50:37 2022 +0800

    [KYUUBI #2043] Upgrade log4j/2.x/ to 2.17.2
    
    ### _Why are the changes needed?_
    
    Close #2043
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including 
negative and positive cases if possible
    
    - [x] Add screenshots for manual tests if appropriate
    
      ![Screenshot from 2022-03-06 
19-40-30](https://user-images.githubusercontent.com/87641376/156926866-d673efa7-6c3b-4bf4-a48d-446064513b0b.png)
    
    - [ ] [Run 
test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests)
 locally before make a pull request
    
    Closes #2046 from RishiKumarRay/master.
    
    Closes #2043
    
    bf9a4a0b [--replace-all] fixed sql issue
    c119e5c2 [Rishi Kumar Ray] Merge branch 'apache:master' into master
    323d81c7 [--replace-all] Upgrade log4j/2.x/ to 2.17.2
    
    Lead-authored-by: --replace-all <[email protected]>
    Co-authored-by: Rishi Kumar Ray 
<[email protected]>
    Signed-off-by: Kent Yao <[email protected]>
    (cherry picked from commit dc6085e060b68deee9d8a39a28e554414e379ba5)
    Signed-off-by: Kent Yao <[email protected]>
---
 dev/dependencyList | 8 ++++----
 pom.xml            | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/dependencyList b/dev/dependencyList
index 283eda9..b9bd090 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -69,10 +69,10 @@ jetty-util/9.4.41.v20210516//jetty-util-9.4.41.v20210516.jar
 jline/0.9.94//jline-0.9.94.jar
 libfb303/0.9.3//libfb303-0.9.3.jar
 libthrift/0.16.0//libthrift-0.16.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
 metrics-core/4.2.8//metrics-core-4.2.8.jar
 metrics-jmx/4.2.8//metrics-jmx-4.2.8.jar
 metrics-json/4.2.8//metrics-json-4.2.8.jar
diff --git a/pom.xml b/pom.xml
index 5bad864..715cb33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
         <scalatest.version>3.2.9</scalatest.version>
         <scopt.version>4.0.1</scopt.version>
         <slf4j.version>1.7.35</slf4j.version>
-        <log4j.version>2.17.1</log4j.version>
+        <log4j.version>2.17.2</log4j.version>
         <fb303.version>0.9.3</fb303.version>
         <thrift.version>0.16.0</thrift.version>
         <!--
@@ -1497,6 +1497,7 @@
                             
<KYUUBI_WORK_DIR_ROOT>${project.build.directory}/work</KYUUBI_WORK_DIR_ROOT>
                         </environmentVariables>
                         <systemProperties>
+                            <log4j.ignoreTCL>true</log4j.ignoreTCL>
                             
<log4j2.configurationFile>file:src/test/resources/log4j2-test.properties</log4j2.configurationFile>
                             
<java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
                             <spark.driver.memory>1g</spark.driver.memory>

Reply via email to