From b7060983227f758c2709579df26cd4945317700c Mon Sep 17 00:00:00 2001
From: StrikeW <wangsiyuanse@gmail.com>
Date: Sat, 11 Mar 2023 16:31:52 +0800
Subject: [PATCH] fix logging after bump to log4j2

---
 .../risingwave-connector-service/pom.xml           |  4 ++--
 .../src/main/resources/log4j.properties            | 14 --------------
 .../src/main/resources/log4j2.properties           | 12 ++++++++++++
 .../risingwave-sink-deltalake/pom.xml              |  4 ++--
 .../connector-node/risingwave-sink-iceberg/pom.xml |  4 ++--
 java/connector-node/risingwave-sink-jdbc/pom.xml   |  4 ++--
 java/pom.xml                                       |  7 +++----
 7 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 java/connector-node/risingwave-connector-service/src/main/resources/log4j.properties
 create mode 100644 java/connector-node/risingwave-connector-service/src/main/resources/log4j2.properties

diff --git a/java/connector-node/risingwave-connector-service/pom.xml b/java/connector-node/risingwave-connector-service/pom.xml
index 89a02597ef35..ff38088c4221 100644
--- a/java/connector-node/risingwave-connector-service/pom.xml
+++ b/java/connector-node/risingwave-connector-service/pom.xml
@@ -32,8 +32,8 @@
 
         <!-- logging -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/log4j.properties b/java/connector-node/risingwave-connector-service/src/main/resources/log4j.properties
deleted file mode 100644
index e9584531b5ed..000000000000
--- a/java/connector-node/risingwave-connector-service/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-log4j.rootLogger=info, stdout, fout
-log4j.logger.com.risingwave=info
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%t] %c{2}:%L - %m%n
-
-log4j.appender.fout=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.fout.File=connector-node.log
-log4j.appender.fout.ImmediateFlush=true
-log4j.appender.fout.Append=true
-log4j.appender.fout.DatePattern='.'yyyy-MM-dd
-log4j.appender.fout.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.fout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%t] %c{2}:%L - %m%n
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/log4j2.properties b/java/connector-node/risingwave-connector-service/src/main/resources/log4j2.properties
new file mode 100644
index 000000000000..55c02dece2c3
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/resources/log4j2.properties
@@ -0,0 +1,12 @@
+rootLogger.level = INFO
+# declare the appender to use
+appenders = console
+
+# appender properties
+appender.console.type = Console
+appender.console.name = stdout
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%t] %c{2}:%L - %m%n
+
+rootLogger.appenderRefs = console
+rootLogger.appenderRef.console.ref = stdout
diff --git a/java/connector-node/risingwave-sink-deltalake/pom.xml b/java/connector-node/risingwave-sink-deltalake/pom.xml
index 71e4f182d1a4..cbb28db6e2ce 100644
--- a/java/connector-node/risingwave-sink-deltalake/pom.xml
+++ b/java/connector-node/risingwave-sink-deltalake/pom.xml
@@ -68,8 +68,8 @@
         </dependency>
         <!-- logging -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml
index 0d8567d5a313..af7478e35a6b 100644
--- a/java/connector-node/risingwave-sink-iceberg/pom.xml
+++ b/java/connector-node/risingwave-sink-iceberg/pom.xml
@@ -104,8 +104,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/java/connector-node/risingwave-sink-jdbc/pom.xml b/java/connector-node/risingwave-sink-jdbc/pom.xml
index 1b6ca9de1e96..65c59aa7c3b5 100644
--- a/java/connector-node/risingwave-sink-jdbc/pom.xml
+++ b/java/connector-node/risingwave-sink-jdbc/pom.xml
@@ -23,8 +23,8 @@
             <artifactId>connector-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/java/pom.xml b/java/pom.xml
index 85cc80a998c3..fe24bacc97bf 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,7 +31,6 @@
         <gson.version>2.10</gson.version>
         <module.version>1.0-SNAPSHOT</module.version>
         <spotless.version>2.27.1</spotless.version>
-        <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.20.0</log4j.version>
         <commons.cli.version>1.5.0</commons.cli.version>
         <debezium.version>1.9.7.Final</debezium.version>
@@ -42,9 +41,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>