Merge pull request #130 from zhicwu/remove-log4j

prepare 2.0.7

Author: zhicwu

NOTICE

@@ -19,7 +19,6 @@ under the License.
 
 This project includes:
   Apache Commons Compress under Apache License, Version 2.0
-  Apache Log4j under The Apache Software License, Version 2.0
   Caffeine cache under Apache License, Version 2.0
   Checker Qual under The MIT License
   ClickHouse JDBC Bridge under Apache License, Version 2.0
@@ -56,7 +55,7 @@ This project includes:
   Prometheus Java Simpleclient under The Apache Software License, Version 2.0
   Prometheus Java Simpleclient Common under The Apache Software License, Version 2.0
   SLF4J API Module under MIT License
-  SLF4J LOG4J-12 Binding under MIT License
+  SLF4J JDK14 Binding under MIT License
   Testcontainers Core under MIT
   testng under Apache 2.0
   Vert.x Bridge Common under The Apache Software License, Version 2.0 or Eclipse Public License - v 1.0

README.md

@@ -286,7 +286,7 @@ Assuming you started a test environment using docker-compose, please refer to ex
 
 * Logging
 
-    You can customize logging configuration in [log4j.properties](docker/log4j.properties).
+    You can customize logging configuration in [logging.properties](docker/logging.properties).
 
 * Vert.x
 

docker/docker-entrypoint.sh

@@ -24,12 +24,12 @@ start_server() {
 		local classpath="./clickhouse-jdbc-bridge-shaded.jar:$(echo $(ls ${DRIVER_DIR:="drivers"}/*.jar) | tr ' ' ':'):."
 		java -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle \
 			-Xdump:none -Xdump:tool:events=systhrow+throw,filter=*OutOfMemoryError,exec="kill -9 %pid" \
-			-Dlog4j.configuration=file:///$JDBC_BRIDGE_HOME/log4j.properties -Dnashorn.args=--language=es6 \
+			-Djava.util.logging.config.file=$JDBC_BRIDGE_HOME/logging.properties -Dnashorn.args=--language=es6 \
 			${JDBC_BRIDGE_JVM_OPTS:=""} -cp $classpath ru.yandex.clickhouse.jdbcbridge.JdbcBridgeVerticle
 	else
 		java -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle \
 			-Xdump:none -Xdump:tool:events=systhrow+throw,filter=*OutOfMemoryError,exec="kill -9 %pid" \
-			-Dlog4j.configuration=file:///$JDBC_BRIDGE_HOME/log4j.properties -Dnashorn.args=--language=es6 \
+			-Djava.util.logging.config.file=$JDBC_BRIDGE_HOME/logging.properties -Dnashorn.args=--language=es6 \
 			${JDBC_BRIDGE_JVM_OPTS:=""} -jar clickhouse-jdbc-bridge-shaded.jar
 	fi
 }

docker/log4j.properties

@@ -0,0 +1,14 @@
+handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level=DEBUG
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%4$-7s] %5$s %n
+
+java.util.logging.FileHandler.level=INFO
+java.util.logging.FileHandler.pattern=/var/log/clickhouse-jdbc-bridge/console.log
+java.util.logging.FileHandler.limit=10000000
+java.util.logging.FileHandler.count=5
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%4$-7s] %5$s %n
+
+.level=DEBUG

docker/logging.properties

@@ -532,11 +532,6 @@
         <artifactId>slf4j-api</artifactId>
         <license>MIT License</license>
     </artifact>
-    <artifact>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <license>MIT License</license>
-    </artifact>
     <artifact>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jdk14</artifactId>

misc/license-mappings.xml

@@ -5,7 +5,7 @@
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc-bridge</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
     <name>ClickHouse JDBC Bridge</name>
     <url>https://github.com/ClickHouse/clickhouse-jdbc-bridge</url>
     <description>JDBC bridge for ClickHouse.</description>
@@ -131,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-jdk14</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
 
@@ -301,7 +301,7 @@
                                     <groupname>root</groupname>
                                     <sources>
                                         <source>
-                                            <location>docker/log4j.properties</location>
+                                            <location>docker/logging.properties</location>
                                         </source>
                                         <source>
                                             <location>docker/set-env.sh.example</location>
@@ -409,29 +409,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>${replacer-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>src/main/resources/log4j.properties</file>
-                    <outputFile>target/classes/log4j.properties</outputFile>
-                    <replacements>
-                        <replacement>
-                            <token>org.apache.log4j</token>
-                            <value>${shade.base}.log4j</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -557,10 +534,6 @@
                             <pattern>com.codahale.metrics</pattern>
                             <shadedPattern>${shade.base}.metrics</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>org.apache.log4j</pattern>
-                            <shadedPattern>${shade.base}.log4j</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>org.checkerframework</pattern>
                             <shadedPattern>${shade.base}.checker</shadedPattern>

pom.xml

@@ -62,7 +62,7 @@ start_server() {
 
     echo "Work directory is set to [$WORK_DIRECTORY]"
     cd "$WORK_DIRECTORY"
-    java $JVM_ARGS -Dlog4j.configuration=file:///$WORK_DIRECTORY/log4j.properties \
+    java $JVM_ARGS -Djava.util.logging.config.file=$WORK_DIRECTORY/logging.properties \
         -Duser.dir="$WORK_DIRECTORY" -jar "$APP_PACKAGE"
 }
 

src/main/bin/clickhouse-jdbc-bridge

@@ -0,0 +1,7 @@
+handlers=java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level=DEBUG
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%4$-7s] %5$s %n
+
+.level=DEBUG