[incubator-gobblin] branch master updated: [GOBBLIN-1296] Solve the dependency issue in gobblin stand alone mode

[le...@apache.org]

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 5db258b  [GOBBLIN-1296] Solve the dependency issue in gobblin stand alone mode
5db258b is described below

commit 5db258bb1e7c1d7f274899b9ef7d1e38674bba46
Author: Zihan Li <zi...@zihli-mn1.linkedin.biz>
AuthorDate: Thu Nov 19 11:15:22 2020 -0800

    [GOBBLIN-1296] Solve the dependency issue in gobblin stand alone mode
    
    Closes #3134 from ZihanLi58/GOBBLIN-1296
---
 gobblin-distribution/build.gradle        | 1 +
 gradle/scripts/globalDependencies.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gobblin-distribution/build.gradle b/gobblin-distribution/build.gradle
index 3e548ad..c7844ba 100644
--- a/gobblin-distribution/build.gradle
+++ b/gobblin-distribution/build.gradle
@@ -25,6 +25,7 @@ configurations {
     if (rootProject.hasProperty('excludeHiveDeps')) {
       exclude group: "org.apache.hive"
     }
+    exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
   }
 }
 
diff --git a/gradle/scripts/globalDependencies.gradle b/gradle/scripts/globalDependencies.gradle
index de3a4af..e4e1bce 100644
--- a/gradle/scripts/globalDependencies.gradle
+++ b/gradle/scripts/globalDependencies.gradle
@@ -47,7 +47,7 @@ subprojects {
         // Required to add JDK's tool jar, which is required to run byteman tests.
         testCompile (files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs()))
       }
-      if (!project.name.contains('gobblin-aws')) {
+      if (!project.name.contains('gobblin-aws') && !project.name.contains('gobblin-distribution')) {
         configurations.compile.dependencies*.each {
           //exclude this jar because we introduce log4j-over-slf4j, these two jars cannot present at the same time
           it.exclude group: 'org.slf4j', module: 'slf4j-log4j12'