From 75eb0d32f2de5353e79049b5369b292efce66ca9 Mon Sep 17 00:00:00 2001 From: Tobin Baker Date: Wed, 6 Sep 2017 13:41:47 -0700 Subject: [PATCH] Revert "no need to shadow deps after restricting classpath to uberjar" This reverts commit ee3311bb49d7843c2a515349df706e2ac92cca16. --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b14070452..999e0c4e4 100644 --- a/build.gradle +++ b/build.gradle @@ -289,8 +289,11 @@ shadowJar { transform(ApacheLicenseResourceTransformer) /* merge service descriptors to avoid Hadoop FileSystem services shadowing each other */ mergeServiceFiles() - /* conflicts with REEF deps */ + /* Some of our deps conflict with old versions in Hadoop distro */ relocate 'com.google.common', 'myriadeps.com.google.common' + relocate 'javax.ws.rs', 'myriadeps.javax.ws.rs' + relocate 'com.fasterxml.jackson', 'myriadeps.com.fasterxml.jackson' + relocate 'org.glassfish.jersey', 'myriadeps.org.glassfish.jersey' } /* Coveralls */