From d54bf2f761e25276b4a0349b2658ca3925a612ec Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Wed, 18 Jul 2018 09:29:56 +0100 Subject: [PATCH] Remove Guava shading from node-api because Curator already shades its own. --- node-api/build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/node-api/build.gradle b/node-api/build.gradle index bc642a4116..2aa8f97de4 100644 --- a/node-api/build.gradle +++ b/node-api/build.gradle @@ -94,26 +94,19 @@ shadowJar { // systems, the folder and file end up clashing, causing an error when trying to build the JAR. relocate 'META-INF/LICENSE', 'META-INF/LICENCE-2' dependencies { + // Apache Curator 4.0.1 already contains a shaded copy of Guava 20.0 include(dependency("org.apache.curator:curator-client:${curator_version}")) include(dependency("org.apache.curator:curator-recipes:${curator_version}")) include(dependency("org.apache.curator:curator-framework:${curator_version}")) include(dependency('org.apache.zookeeper:zookeeper:3.5.3-beta')) include(dependency('commons-cli:commons-cli:1.2')) include(dependency('io.netty:netty:3.10.5.Final')) - include(dependency('com.google.guava:guava:20.0')) } relocate 'org.apache.curator.', 'net.corda.shaded.org.apache.curator.' relocate 'org.apache.zookeeper.', 'net.corda.shaded.org.apache.zookeeper.' relocate 'org.apache.jute.', 'net.corda.shaded.org.apache.jute.' relocate 'org.apache.commons.', 'net.corda.shaded.org.apache.commons.' relocate 'org.jboss.netty.', 'net.corda.shaded.org.jboss.netty.' - relocate ('com.google.', 'net.corda.shaded.com.google.') { - // This JAR uses annotations from these packages. However, - // the annotation classes themselves are not included here - // and so we cannot relocate their references. - exclude 'com.google.errorprone.**' - exclude 'com.google.j2objc.**' - } } task testJar(type: Jar) {