From ce7afe730d90346cf2a67861e6af2fc4462352a5 Mon Sep 17 00:00:00 2001 From: Ryan Beasley Date: Wed, 3 Mar 2021 05:02:55 -0800 Subject: [PATCH] Shade com.google.common.** in the Jacoco test runner. This isolates the Bazel coverage runner's version of Guava from the user's. Resolves #12998 Testing Done: - Verified `bazel coverage` worked against a crufty internal target using this patch with java_tools javac11-10.5 and Bazel 4.0.0. - `bazelisk build src:java_tools.zip`; manual inspection of `JacocoCoverage_jarjar_deploy.jar`. Closes #12999. PiperOrigin-RevId: 360643918 --- .../java/com/google/testing/coverage/JacocoCoverage.jarjar | 1 + 1 file changed, 1 insertion(+) diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar index 56190d874c5862..081c5420f8dc8d 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar +++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar @@ -1,2 +1,3 @@ +rule com.google.common.** com.google.testing.coverage.jarjar.@0 rule org.apache.commons.** com.google.testing.coverage.jarjar.@0 rule org.objectweb.asm.** com.google.testing.coverage.jarjar.@0