From ec719b82deebc34c4554bc4483a98fda7e4514c2 Mon Sep 17 00:00:00 2001
From: Fei Wang <fwang12@ebay.com>
Date: Tue, 1 Feb 2022 22:36:30 +0800
Subject: [PATCH] [KYUUBI #1769][FOLLOWUP] Revert the dependency change for
 kyuubi-hive-jdbc(shaded) modules

### _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.
-->
Revert the dependency changes for kyuubi-hive-jdbc and kyuubi-hive-jdbc-shaded modules from #1842

### _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

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

Closes #1854 from turboFei/slf4j-api.

Closes #1769

dffe6c5c [Fei Wang] reserve for kyuubi-hive-beeline
20012434 [Fei Wang] [KYUUBI #1769][FOLLOWUP] Revert the dependency change for kyuubi-hive-beeline and kyuubi-hive-jdbc(shaded) modules

Authored-by: Fei Wang <fwang12@ebay.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 conf/log4j2.properties.template |  2 +-
 docs/deployment/settings.md     |  2 +-
 kyuubi-hive-jdbc-shaded/pom.xml | 10 ++++++++++
 kyuubi-hive-jdbc/pom.xml        | 10 ++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/conf/log4j2.properties.template b/conf/log4j2.properties.template
index 04d7bdedc..102e0d3de 100644
--- a/conf/log4j2.properties.template
+++ b/conf/log4j2.properties.template
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-# Set everything to be logged to the file target/unit-tests.log
+# Set everything to be logged to the file
 rootLogger.level = info
 rootLogger.appenderRef.stdout.ref = STDOUT
 
diff --git a/docs/deployment/settings.md b/docs/deployment/settings.md
index c8734acef..cfb635d1c 100644
--- a/docs/deployment/settings.md
+++ b/docs/deployment/settings.md
@@ -397,7 +397,7 @@ Kyuubi uses [log4j](https://logging.apache.org/log4j/2.x/) for logging. You can
 # limitations under the License.
 #
 
-# Set everything to be logged to the file target/unit-tests.log
+# Set everything to be logged to the file
 rootLogger.level = info
 rootLogger.appenderRef.stdout.ref = STDOUT
 
diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml
index 861a7e9d3..92520d426 100644
--- a/kyuubi-hive-jdbc-shaded/pom.xml
+++ b/kyuubi-hive-jdbc-shaded/pom.xml
@@ -183,6 +183,16 @@
             <artifactId>zookeeper</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client-api</artifactId>
diff --git a/kyuubi-hive-jdbc/pom.xml b/kyuubi-hive-jdbc/pom.xml
index 20fa9d6de..fb22f798d 100644
--- a/kyuubi-hive-jdbc/pom.xml
+++ b/kyuubi-hive-jdbc/pom.xml
@@ -192,6 +192,16 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client-api</artifactId>