From 13c91d11e558e8d4c79b95870ef6c7c1c1b6f952 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 22 Oct 2018 10:33:32 +1000 Subject: [PATCH] Upgrade shadow to 4.0.1 and exclude module-info.class files. --- .../src/main/java/datadog/trace/agent/tooling/Utils.java | 2 -- dd-java-agent/dd-java-agent.gradle | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java index d20d35f063..b706965dce 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java @@ -37,8 +37,6 @@ public class Utils { "org.msgpack", "com.fasterxml.jackson", "org.yaml.snakeyaml", - // modules - "module-info", }; private static Method findLoadedClassMethod = null; diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 4d3d53cde8..c770668d38 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "2.0.4" + id "com.github.johnrengelman.shadow" version "4.0.1" } description = 'dd-java-agent' @@ -32,6 +32,8 @@ def includeShadowJar(subproject, jarname) { mergeServiceFiles() + exclude '**/module-info.class' + dependencies { exclude(dependency("org.projectlombok:lombok:$versions.lombok")) }