From 8b389f27fd4a4c2648c0c6b73daa6e0461d013d2 Mon Sep 17 00:00:00 2001
From: Paul Lin <paullin3280@gmail.com>
Date: Tue, 1 Feb 2022 01:22:58 +0800
Subject: [PATCH] [KYUUBI #1858] Rename test log4j2 properties to
 log4j2-test.properties

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->

Avoid test log4j2 configurations overtaken by the ones in 3rd party dependencies.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1860 from link3280/bug/KYUUBI-1858.

Closes #1858

614e7937 [Paul Lin] [KYUUBI #1858] Update log2j configuration path in pom.xml
71c95613 [Paul Lin] [KYUUBI #1858] Rename test log4j2 properties to log4j2-test.properties

Authored-by: Paul Lin <paullin3280@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 .../resources/{log4j2.properties => log4j2-test.properties}     | 0
 pom.xml                                                         | 2 +-
 15 files changed, 1 insertion(+), 1 deletion(-)
 rename dev/kyuubi-extension-spark-3-1/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename dev/kyuubi-extension-spark-3-2/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename dev/kyuubi-extension-spark-common/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename externals/kyuubi-flink-sql-engine/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename externals/kyuubi-spark-sql-engine/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename externals/kyuubi-trino-engine/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename integration-tests/kyuubi-flink-it/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-common/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-ctl/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-ha/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-metrics/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-server/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
 rename kyuubi-zookeeper/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)

diff --git a/dev/kyuubi-extension-spark-3-1/src/test/resources/log4j2.properties b/dev/kyuubi-extension-spark-3-1/src/test/resources/log4j2-test.properties
similarity index 100%
rename from dev/kyuubi-extension-spark-3-1/src/test/resources/log4j2.properties
rename to dev/kyuubi-extension-spark-3-1/src/test/resources/log4j2-test.properties
diff --git a/dev/kyuubi-extension-spark-3-2/src/test/resources/log4j2.properties b/dev/kyuubi-extension-spark-3-2/src/test/resources/log4j2-test.properties
similarity index 100%
rename from dev/kyuubi-extension-spark-3-2/src/test/resources/log4j2.properties
rename to dev/kyuubi-extension-spark-3-2/src/test/resources/log4j2-test.properties
diff --git a/dev/kyuubi-extension-spark-common/src/test/resources/log4j2.properties b/dev/kyuubi-extension-spark-common/src/test/resources/log4j2-test.properties
similarity index 100%
rename from dev/kyuubi-extension-spark-common/src/test/resources/log4j2.properties
rename to dev/kyuubi-extension-spark-common/src/test/resources/log4j2-test.properties
diff --git a/externals/kyuubi-flink-sql-engine/src/test/resources/log4j2.properties b/externals/kyuubi-flink-sql-engine/src/test/resources/log4j2-test.properties
similarity index 100%
rename from externals/kyuubi-flink-sql-engine/src/test/resources/log4j2.properties
rename to externals/kyuubi-flink-sql-engine/src/test/resources/log4j2-test.properties
diff --git a/externals/kyuubi-spark-sql-engine/src/test/resources/log4j2.properties b/externals/kyuubi-spark-sql-engine/src/test/resources/log4j2-test.properties
similarity index 100%
rename from externals/kyuubi-spark-sql-engine/src/test/resources/log4j2.properties
rename to externals/kyuubi-spark-sql-engine/src/test/resources/log4j2-test.properties
diff --git a/externals/kyuubi-trino-engine/src/test/resources/log4j2.properties b/externals/kyuubi-trino-engine/src/test/resources/log4j2-test.properties
similarity index 100%
rename from externals/kyuubi-trino-engine/src/test/resources/log4j2.properties
rename to externals/kyuubi-trino-engine/src/test/resources/log4j2-test.properties
diff --git a/integration-tests/kyuubi-flink-it/src/test/resources/log4j2.properties b/integration-tests/kyuubi-flink-it/src/test/resources/log4j2-test.properties
similarity index 100%
rename from integration-tests/kyuubi-flink-it/src/test/resources/log4j2.properties
rename to integration-tests/kyuubi-flink-it/src/test/resources/log4j2-test.properties
diff --git a/integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j2.properties b/integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j2-test.properties
similarity index 100%
rename from integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j2.properties
rename to integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-common/src/test/resources/log4j2.properties b/kyuubi-common/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-common/src/test/resources/log4j2.properties
rename to kyuubi-common/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-ctl/src/test/resources/log4j2.properties b/kyuubi-ctl/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-ctl/src/test/resources/log4j2.properties
rename to kyuubi-ctl/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-ha/src/test/resources/log4j2.properties b/kyuubi-ha/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-ha/src/test/resources/log4j2.properties
rename to kyuubi-ha/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-metrics/src/test/resources/log4j2.properties b/kyuubi-metrics/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-metrics/src/test/resources/log4j2.properties
rename to kyuubi-metrics/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-server/src/test/resources/log4j2.properties b/kyuubi-server/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-server/src/test/resources/log4j2.properties
rename to kyuubi-server/src/test/resources/log4j2-test.properties
diff --git a/kyuubi-zookeeper/src/test/resources/log4j2.properties b/kyuubi-zookeeper/src/test/resources/log4j2-test.properties
similarity index 100%
rename from kyuubi-zookeeper/src/test/resources/log4j2.properties
rename to kyuubi-zookeeper/src/test/resources/log4j2-test.properties
diff --git a/pom.xml b/pom.xml
index 3f189e151..4ac26b606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1390,7 +1390,7 @@
                             <KYUUBI_WORK_DIR_ROOT>${project.build.directory}/work</KYUUBI_WORK_DIR_ROOT>
                         </environmentVariables>
                         <systemProperties>
-                            <log4j2.configurationFile>file:src/test/resources/log4j2.properties</log4j2.configurationFile>
+                            <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>
                             <kyuubi.metrics.json.location>${project.build.directory}/metrics</kyuubi.metrics.json.location>