[calcite] branch master updated: Refine logging dependencies: keep slf4j bridges in runtime classpath only

[vl...@apache.org]

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

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 0f94bcd  Refine logging dependencies: keep slf4j bridges in runtime classpath only
0f94bcd is described below

commit 0f94bcd2c18fd14c2e30c598bc83dbe9ccdc80cd
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Jan 11 15:50:15 2020 +0300

    Refine logging dependencies: keep slf4j bridges in runtime classpath only
---
 bom/build.gradle.kts           | 6 ++++--
 core/build.gradle.kts          | 5 ++++-
 elasticsearch/build.gradle.kts | 2 +-
 gradle.properties              | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 8aabcb0..ed4e16d 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -72,6 +72,7 @@ dependencies {
         apiv("javax.servlet:javax.servlet-api", "servlet")
         apiv("joda-time:joda-time")
         apiv("junit:junit", "junit4")
+        apiv("log4j:log4j", "log4j")
         apiv("mysql:mysql-connector-java")
         apiv("net.hydromatic:aggdesigner-algorithm")
         apiv("net.hydromatic:chinook-data-hsqldb")
@@ -97,8 +98,9 @@ dependencies {
         apiv("org.apache.kerby:kerb-client", "kerby")
         apiv("org.apache.kerby:kerb-core", "kerby")
         apiv("org.apache.kerby:kerb-simplekdc", "kerby")
-        apiv("org.apache.logging.log4j:log4j-api", "log4j")
-        apiv("org.apache.logging.log4j:log4j-core", "log4j")
+        apiv("org.apache.logging.log4j:log4j-api", "log4j2")
+        apiv("org.apache.logging.log4j:log4j-core", "log4j2")
+        apiv("org.apache.logging.log4j:log4j-slf4j-impl", "log4j2")
         apiv("org.apache.pig:pig")
         apiv("org.apache.pig:pigunit", "pig")
         apiv("org.apache.spark:spark-core_2.10", "spark")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 42be79a..f80da4c 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -71,13 +71,16 @@ dependencies {
     testImplementation("net.hydromatic:quidem")
     testImplementation("net.hydromatic:scott-data-hsqldb")
     testImplementation("org.apache.commons:commons-pool2")
+    testImplementation("log4j:log4j") {
+        because("SqlHintsConverterTest needs to implement a MockAppender")
+    }
     testImplementation("org.hsqldb:hsqldb")
     testImplementation("org.incava:java-diff")
     testImplementation("sqlline:sqlline")
     testImplementation(kotlin("stdlib-jdk8"))
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit5"))
-    testImplementation("org.slf4j:slf4j-log4j12")
+    testRuntimeOnly("org.slf4j:slf4j-log4j12")
 }
 
 // There are users that reuse/extend test code (e.g. Apache Felix)
diff --git a/elasticsearch/build.gradle.kts b/elasticsearch/build.gradle.kts
index aaf5881..1148daa 100644
--- a/elasticsearch/build.gradle.kts
+++ b/elasticsearch/build.gradle.kts
@@ -59,5 +59,5 @@ dependencies {
     testImplementation("org.elasticsearch:elasticsearch")
     testImplementation(project(":core", "testClasses"))
     testRuntimeOnly("net.java.dev.jna:jna")
-    testRuntimeOnly("org.slf4j:slf4j-log4j12")
+    testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 }
diff --git a/gradle.properties b/gradle.properties
index 2d6e7e4..8090a25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -108,7 +108,8 @@ junit4.version=4.12
 junit5.version=5.6.0-M1
 kafka-clients.version=2.1.1
 kerby.version=1.1.1
-log4j.version=2.11.0
+log4j.version=1.2.17
+log4j2.version=2.11.0
 mockito.version=2.23.4
 mongo-java-driver.version=3.10.2
 mongo-java-server.version=1.16.0