This is an automated email from the ASF dual-hosted git repository. granthenke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit e9d62d39f657a08d9ee5846e7b6f00fdc1c75c1c Author: Grant Henke <[email protected]> AuthorDate: Tue Sep 15 10:25:25 2020 -0500 [java] Fix shading of Micrometer dependency This patch adjusts the Java build to ensure Micrometer classes and its dependencies are relocated properly. It also adjusts verify_jars.pl to account for the change. Change-Id: Id2547b5703e5d300de531aa51d55f37718a27b61 Reviewed-on: http://gerrit.cloudera.org:8080/16452 Reviewed-by: Andrew Wong <[email protected]> Reviewed-by: Alexey Serbin <[email protected]> Tested-by: Grant Henke <[email protected]> --- build-support/verify_jars.pl | 2 ++ java/gradle/shadow.gradle | 3 +++ 2 files changed, 5 insertions(+) diff --git a/build-support/verify_jars.pl b/build-support/verify_jars.pl index a1afd73..4bcef20 100755 --- a/build-support/verify_jars.pl +++ b/build-support/verify_jars.pl @@ -42,6 +42,8 @@ my $pat_allow_kudu_shaded = org/apache/(?:commons|http)| org/checkerframework| org/HdrHistogram| + org/LatencyUtils| + io/micrometer| io/netty| scopt) }x; diff --git a/java/gradle/shadow.gradle b/java/gradle/shadow.gradle index c09b06f..5d9eb18 100644 --- a/java/gradle/shadow.gradle +++ b/java/gradle/shadow.gradle @@ -58,6 +58,9 @@ shadowJar { relocate "org.checkerframework", "org.apache.kudu.shaded.org.checkerframework" relocate "org.hamcrest", "org.apache.kudu.shaded.org.hamcrest" relocate "org.HdrHistogram", "org.apache.kudu.shaded.org.HdrHistogram" + // Pulled in via Micrometer. + relocate "org.LatencyUtils", "org.apache.kudu.shaded.org.LatencyUtils" + relocate "io.micrometer", "org.apache.kudu.shaded.io.micrometer" relocate "io.netty", "org.apache.kudu.shaded.io.netty" relocate "scopt", "org.apache.kudu.shaded.scopt" }
