This is an automated email from the ASF dual-hosted git repository.
lesun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 58666e4 [GOBBLIN-1235] Migrate Log4J to SLF4J to provide a clean log
environment for downstream users
58666e4 is described below
commit 58666e4174ac8623fd50954798486eaaa8b18e56
Author: Zihan Li <[email protected]>
AuthorDate: Thu Aug 27 14:55:57 2020 -0700
[GOBBLIN-1235] Migrate Log4J to SLF4J to provide a clean log environment
for downstream users
change dependencies to make gobblin code only use
slf4j and unit test still use log4j as
implementation
remove dependency on log4j
resolve conflict
Merge branch 'master' into slf4jtest
Closes #3081 from ZihanLi58/slf4jtest
---
gobblin-admin/build.gradle | 1 +
gobblin-api/build.gradle | 1 +
gobblin-aws/build.gradle | 1 +
gobblin-binary-management/build.gradle | 1 +
gobblin-cluster/build.gradle | 1 -
gobblin-config-management/gobblin-config-client/build.gradle | 1 -
gobblin-config-management/gobblin-config-core/build.gradle | 1 -
gobblin-data-management/build.gradle | 1 -
gobblin-hive-registration/build.gradle | 1 -
gobblin-metastore/build.gradle | 1 +
gobblin-modules/gobblin-azkaban/build.gradle | 1 -
gobblin-modules/gobblin-kafka-common/build.gradle | 1 +
gobblin-runtime/build.gradle | 1 -
gobblin-service/build.gradle | 1 -
gobblin-yarn/build.gradle | 2 +-
gradle/scripts/dependencyDefinitions.gradle | 5 ++++-
gradle/scripts/globalDependencies.gradle | 4 ++++
17 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/gobblin-admin/build.gradle b/gobblin-admin/build.gradle
index 80e9275..7b5ee28 100644
--- a/gobblin-admin/build.gradle
+++ b/gobblin-admin/build.gradle
@@ -34,6 +34,7 @@ dependencies {
compile externalDependency.jodaTime
testCompile externalDependency.testng
+ testCompile externalDependency.slf4jToLog4j
}
ext.classification="library"
diff --git a/gobblin-api/build.gradle b/gobblin-api/build.gradle
index 67a2f5f..b083bb7 100644
--- a/gobblin-api/build.gradle
+++ b/gobblin-api/build.gradle
@@ -33,6 +33,7 @@ dependencies {
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.log4j
+ testCompile externalDependency.slf4jToLog4j
}
configurations {
diff --git a/gobblin-aws/build.gradle b/gobblin-aws/build.gradle
index 37d4389..0d9717e 100644
--- a/gobblin-aws/build.gradle
+++ b/gobblin-aws/build.gradle
@@ -68,6 +68,7 @@ dependencies {
testCompile externalDependency.curatorTest
testCompile externalDependency.mockito
testCompile externalDependency.powermock
+ testCompile externalDependency.slf4jToLog4j
}
task testJar(type: Jar, dependsOn: testClasses) {
diff --git a/gobblin-binary-management/build.gradle
b/gobblin-binary-management/build.gradle
index 28f7dff..37d8592 100644
--- a/gobblin-binary-management/build.gradle
+++ b/gobblin-binary-management/build.gradle
@@ -37,6 +37,7 @@ dependencies {
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.assertj
+ testCompile externalDependency.slf4jToLog4j
}
configurations {
diff --git a/gobblin-cluster/build.gradle b/gobblin-cluster/build.gradle
index 016871b..8e92618 100644
--- a/gobblin-cluster/build.gradle
+++ b/gobblin-cluster/build.gradle
@@ -33,7 +33,6 @@ dependencies {
compile externalDependency.guava
compile externalDependency.commonsLang
compile externalDependency.slf4j
- compile externalDependency.log4j
compile externalDependency.commonsCli
compile externalDependency.gson
compile externalDependency.hiveCommon
diff --git a/gobblin-config-management/gobblin-config-client/build.gradle
b/gobblin-config-management/gobblin-config-client/build.gradle
index 941f431..45b70f0 100644
--- a/gobblin-config-management/gobblin-config-client/build.gradle
+++ b/gobblin-config-management/gobblin-config-client/build.gradle
@@ -23,7 +23,6 @@ dependencies {
compile externalDependency.guava
compile externalDependency.slf4j
- compile externalDependency.log4j
compile externalDependency.typesafeConfig
testCompile externalDependency.testng
diff --git a/gobblin-config-management/gobblin-config-core/build.gradle
b/gobblin-config-management/gobblin-config-core/build.gradle
index a97d0ca..5ce82ba 100644
--- a/gobblin-config-management/gobblin-config-core/build.gradle
+++ b/gobblin-config-management/gobblin-config-core/build.gradle
@@ -22,7 +22,6 @@ dependencies {
compile project(':gobblin-utility')
compile externalDependency.slf4j
- compile externalDependency.log4j
compile externalDependency.typesafeConfig
compile externalDependency.commonsLang
compile externalDependency.commonsIo
diff --git a/gobblin-data-management/build.gradle
b/gobblin-data-management/build.gradle
index c1a00c8..d7eb3fc 100644
--- a/gobblin-data-management/build.gradle
+++ b/gobblin-data-management/build.gradle
@@ -30,7 +30,6 @@ dependencies {
compile externalDependency.commonsLang3
compile externalDependency.guava
compile externalDependency.slf4j
- compile externalDependency.log4j
compile externalDependency.jodaTime
compile externalDependency.metricsCore
compile externalDependency.mockito
diff --git a/gobblin-hive-registration/build.gradle
b/gobblin-hive-registration/build.gradle
index b4c1535..47d71f0 100644
--- a/gobblin-hive-registration/build.gradle
+++ b/gobblin-hive-registration/build.gradle
@@ -33,7 +33,6 @@ dependencies {
compile externalDependency.hiveMetastore
compile externalDependency.hiveSerDe
compile externalDependency.libthrift
- compile externalDependency.log4j
compile externalDependency.slf4j
compile externalDependency.commonsIo
compile externalDependency.commonsLang3
diff --git a/gobblin-metastore/build.gradle b/gobblin-metastore/build.gradle
index 4a119f4..2a0e85e 100644
--- a/gobblin-metastore/build.gradle
+++ b/gobblin-metastore/build.gradle
@@ -41,6 +41,7 @@ dependencies {
testCompile externalDependency.testng
testCompile externalDependency.embeddedProcess
testCompile externalDependency.testMysqlServer
+ testCompile externalDependency.slf4jToLog4j
}
// Begin HACK to get around POM being depenendent on the (empty)
gobblin-rest-api instead of gobblin-rest-api-rest-client
diff --git a/gobblin-modules/gobblin-azkaban/build.gradle
b/gobblin-modules/gobblin-azkaban/build.gradle
index d0dbd91..5acc034 100644
--- a/gobblin-modules/gobblin-azkaban/build.gradle
+++ b/gobblin-modules/gobblin-azkaban/build.gradle
@@ -33,7 +33,6 @@ dependencies {
compile externalDependency.curatorTest
compile externalDependency.azkaban
- compile externalDependency.log4j
compile externalDependency.guava
compile externalDependency.commonsLang
compile externalDependency.httpclient
diff --git a/gobblin-modules/gobblin-kafka-common/build.gradle
b/gobblin-modules/gobblin-kafka-common/build.gradle
index 199ff40..d92774b 100644
--- a/gobblin-modules/gobblin-kafka-common/build.gradle
+++ b/gobblin-modules/gobblin-kafka-common/build.gradle
@@ -46,6 +46,7 @@ dependencies {
testCompile externalDependency.mockito
testCompile externalDependency.testng
testCompile externalDependency.jmh
+ testCompile externalDependency.slf4jToLog4j
}
configurations {
diff --git a/gobblin-runtime/build.gradle b/gobblin-runtime/build.gradle
index f11e44a..e6d1785 100644
--- a/gobblin-runtime/build.gradle
+++ b/gobblin-runtime/build.gradle
@@ -72,7 +72,6 @@ dependencies {
compile externalDependency.jacksonMapper
compile externalDependency.javaxInject
compile externalDependency.jodaTime
- compile externalDependency.log4j
compile externalDependency.metricsCore
compile externalDependency.metricsJvm
compile externalDependency.mockito
diff --git a/gobblin-service/build.gradle b/gobblin-service/build.gradle
index 9d9b3f1..d83cc57 100644
--- a/gobblin-service/build.gradle
+++ b/gobblin-service/build.gradle
@@ -60,7 +60,6 @@ dependencies {
compile externalDependency.jgit
compile externalDependency.jodaTime
compile externalDependency.jgrapht
- compile externalDependency.log4j
compile externalDependency.metricsCore
compile externalDependency.metricsJvm
compile externalDependency.pegasus.data
diff --git a/gobblin-yarn/build.gradle b/gobblin-yarn/build.gradle
index b938c02..4215d06 100644
--- a/gobblin-yarn/build.gradle
+++ b/gobblin-yarn/build.gradle
@@ -38,7 +38,7 @@ dependencies {
compile externalDependency.guava
compile externalDependency.commonsLang
compile externalDependency.slf4j
- compile externalDependency.log4j
+
compile externalDependency.commonsCli
compile externalDependency.gson
compile externalDependency.hiveCommon
diff --git a/gradle/scripts/dependencyDefinitions.gradle
b/gradle/scripts/dependencyDefinitions.gradle
index 67435a6..8a12f44 100644
--- a/gradle/scripts/dependencyDefinitions.gradle
+++ b/gradle/scripts/dependencyDefinitions.gradle
@@ -180,13 +180,16 @@ ext.externalDependency = [
'reactivex': 'io.reactivex.rxjava2:rxjava:2.1.0',
"slf4j": [
"org.slf4j:slf4j-api:" + slf4jVersion,
- "org.slf4j:slf4j-log4j12:" + slf4jVersion,
+ "org.slf4j:log4j-over-slf4j:" + slf4jVersion,
"org.slf4j:jcl-over-slf4j:" + slf4jVersion
],
"log4j": [
"log4j:log4j:" + log4jVersion,
"log4j:apache-log4j-extras:" + log4jVersion
],
+ "slf4jToLog4j":[
+ "org.slf4j:slf4j-log4j12:" + slf4jVersion
+ ],
"postgresConnector": "org.postgresql:postgresql:42.1.4",
"assertj": 'org.assertj:assertj-core:3.8.0',
]
diff --git a/gradle/scripts/globalDependencies.gradle
b/gradle/scripts/globalDependencies.gradle
index ed7b500..34e00cd 100644
--- a/gradle/scripts/globalDependencies.gradle
+++ b/gradle/scripts/globalDependencies.gradle
@@ -44,6 +44,10 @@ subprojects {
testCompile (files(((URLClassLoader)
ToolProvider.getSystemToolClassLoader()).getURLs()))
}
all*.exclude group: 'org.apache.calcite', module: 'calcite-avatica' //
replaced by org.apache.calcite.avatica:avatica-core
+ //exclude this jar because we introduce log4j-over-slf4j, these two jars
cannot present at the same time
+ compileClasspath.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+ //exclude this jar in test class path because we are using log4j
implementation to test
+ testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
}
}
