From 89067cf9f911aad882f06502a2a06953f54571a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Onuki?= Date: Tue, 15 Jun 2021 11:06:34 -0400 Subject: [PATCH] Shadow OkHttp dependencies (#326) so they don't clash with customers' dependencies --- newrelic-agent/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newrelic-agent/build.gradle b/newrelic-agent/build.gradle index 95ef0a23e8..7181fc6a4f 100644 --- a/newrelic-agent/build.gradle +++ b/newrelic-agent/build.gradle @@ -170,7 +170,8 @@ task relocatedShadowJar(type: ShadowJar) { "org.apache.log4j", "org.apache.log", "org.apache.avalon", "org.checkerframework", "org.dom4j", "org.zeromq", "org.apache.kafka", "com.lmax", "com.conversantmedia", "org.jctools", - "com.fasterxml", "org.osgi", "org.codehaus", "org.fusesource", "kotlin", "org.jetbrains" + "com.fasterxml", "org.osgi", "org.codehaus", "org.fusesource", "kotlin", "org.jetbrains", + "okhttp3", "org.bouncycastle", "org.conscrypt", "org.openjsse" ].each { relocate(it, "com.newrelic.agent.deps.$it") }