Skip to content

Commit

Permalink
Revert "no need to shadow deps after restricting classpath to uberjar"
Browse files Browse the repository at this point in the history
This reverts commit ee3311b.
  • Loading branch information
Tobin Baker committed Sep 6, 2017
1 parent a8a923e commit 75eb0d3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build.gradle
Expand Up @@ -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 */
Expand Down

0 comments on commit 75eb0d3

Please sign in to comment.