[SW-1672] Remove Relocation of com.google.protobuf in Assembly Jar (#…

…1573)
h2oai · Oct 15, 2019 · 7d25fda · 7d25fda
1 parent 6f9b962
commit 7d25fda
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/assembly/build.gradle b/assembly/build.gradle
@@ -33,7 +33,6 @@ shadowJar {
 
     relocate 'javassist', 'ai.h2o.javassist'
     relocate 'com.google.common', 'ai.h2o.com.google.common'
-    relocate 'com.google.protobuf', 'ai.h2o.com.google.protobuf'
     relocate 'org.eclipse.jetty', 'ai.h2o.org.eclipse.jetty'
     relocate 'org.eclipse.jetty.orbit', 'ai.h2o.org.eclipse.jetty.orbit'
 

diff --git a/gradle/shadowRuntime.gradle b/gradle/shadowRuntime.gradle
@@ -18,6 +18,7 @@ configurations {
         exclude group: 'commons-io', module: 'commons-io' // a dependency of org.apache.spark:spark-core_2.11
         exclude group: 'commons-logging', module: 'commons-logging' // a dependency of org.apache.hadoop:hadoop-auth
         exclude group: 'log4j', module: 'log4j' // a dependency of org.apache.hadoop:hadoop-auth
+        exclude group: 'com.google.protobuf' // a dependency of org.apache.hadoop:hadoop-common
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
         // a dependency of org.apache.spark:spark-sql_2.11
         exclude group: 'org.apache.httpcomponents' // a dependency of org.apache.hadoop:hadoop-auth