Reenable jacocoagent test. Found an old TODO in the code (misspelled TOODO), reenabled the test, fixed versions. Closes #12409. PiperOrigin-RevId: 340633919
diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh index a0f221d..ff7f1a3 100755 --- a/src/test/shell/bazel/bazel_java_tools_test.sh +++ b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -148,15 +148,14 @@ expect_path_in_java_tools "BUILD" } -# TOODO(iirina): Re-enable this and update jacoco version after #8376 is merged. -function DISABLED_test_java_tools_has_jacocoagent() { - expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.7.5.201505241946.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.7.5.201505241946.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.7.5.201505241946.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-7.0.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-7.0.jar" - expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-7.0.jar" +function test_java_tools_has_jacocoagent() { + expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-8.0.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-8.0.jar" + expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-8.0.jar" expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE" }
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 99f6342..97406e0 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools
@@ -301,21 +301,21 @@ java_import( name = "asm", - jars = ["java_tools/third_party/java/jacoco/asm-7.0.jar"], - srcjar = "java_tools/third_party/java/jacoco/asm-7.0-sources.jar", + jars = ["java_tools/third_party/java/jacoco/asm-8.0.jar"], + srcjar = "java_tools/third_party/java/jacoco/asm-8.0-sources.jar", ) java_import( name = "asm-commons", - jars = ["java_tools/third_party/java/jacoco/asm-commons-7.0.jar"], - srcjar = "java_tools/third_party/java/jacoco/asm-commons-7.0-sources.jar", + jars = ["java_tools/third_party/java/jacoco/asm-commons-8.0.jar"], + srcjar = "java_tools/third_party/java/jacoco/asm-commons-8.0-sources.jar", runtime_deps = [":asm-tree"], ) java_import( name = "asm-tree", - jars = ["java_tools/third_party/java/jacoco/asm-tree-7.0.jar"], - srcjar = "java_tools/third_party/java/jacoco/asm-tree-7.0-sources.jar", + jars = ["java_tools/third_party/java/jacoco/asm-tree-8.0.jar"], + srcjar = "java_tools/third_party/java/jacoco/asm-tree-8.0-sources.jar", runtime_deps = [":asm"], )