diff --git a/third_party/BUILD b/third_party/BUILD index 8a25fe963a090b..b61ee366885b0e 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -99,35 +99,35 @@ java_library( distrib_java_import( name = "asm", enable_distributions = ["debian"], - jars = ["asm/asm-9.2.jar"], - srcjar = "asm/asm-9.2-sources.jar", + jars = ["asm/asm-9.4.jar"], + srcjar = "asm/asm-9.4-sources.jar", ) java_import( name = "asm-analysis", - jars = ["asm/asm-analysis-9.2.jar"], - srcjar = "asm/asm-analysis-9.2-sources.jar", + jars = ["asm/asm-analysis-9.4.jar"], + srcjar = "asm/asm-analysis-9.4-sources.jar", runtime_deps = [":asm-tree"], ) java_import( name = "asm-commons", - jars = ["asm/asm-commons-9.2.jar"], - srcjar = "asm/asm-commons-9.2-sources.jar", + jars = ["asm/asm-commons-9.4.jar"], + srcjar = "asm/asm-commons-9.4-sources.jar", runtime_deps = [":asm-tree"], ) java_import( name = "asm-tree", - jars = ["asm/asm-tree-9.2.jar"], - srcjar = "asm/asm-tree-9.2-sources.jar", + jars = ["asm/asm-tree-9.4.jar"], + srcjar = "asm/asm-tree-9.4-sources.jar", runtime_deps = [":asm"], ) java_import( name = "asm-util", - jars = ["asm/asm-util-9.2.jar"], - srcjar = "asm/asm-util-9.2-sources.jar", + jars = ["asm/asm-util-9.4.jar"], + srcjar = "asm/asm-util-9.4-sources.jar", runtime_deps = [":asm-tree"], ) diff --git a/third_party/asm/asm-9.2-sources.jar b/third_party/asm/asm-9.2-sources.jar deleted file mode 100644 index b4fbd58d85ea51..00000000000000 Binary files a/third_party/asm/asm-9.2-sources.jar and /dev/null differ diff --git a/third_party/asm/asm-9.2.jar b/third_party/asm/asm-9.2.jar deleted file mode 100644 index 3557ae4140ab53..00000000000000 Binary files a/third_party/asm/asm-9.2.jar and /dev/null differ diff --git a/third_party/asm/asm-9.4-sources.jar b/third_party/asm/asm-9.4-sources.jar new file mode 100644 index 00000000000000..89dbb8d506c3f9 Binary files /dev/null and b/third_party/asm/asm-9.4-sources.jar differ diff --git a/third_party/asm/asm-9.4.jar b/third_party/asm/asm-9.4.jar new file mode 100644 index 00000000000000..01cb52ee3ac93e Binary files /dev/null and b/third_party/asm/asm-9.4.jar differ diff --git a/third_party/asm/asm-analysis-9.2-sources.jar b/third_party/asm/asm-analysis-9.2-sources.jar deleted file mode 100644 index 9d9f8de728cf9e..00000000000000 Binary files a/third_party/asm/asm-analysis-9.2-sources.jar and /dev/null differ diff --git a/third_party/asm/asm-analysis-9.2.jar b/third_party/asm/asm-analysis-9.2.jar deleted file mode 100644 index 9d575ca1cc2492..00000000000000 Binary files a/third_party/asm/asm-analysis-9.2.jar and /dev/null differ diff --git a/third_party/asm/asm-analysis-9.4-sources.jar b/third_party/asm/asm-analysis-9.4-sources.jar new file mode 100644 index 00000000000000..3720b1fff5cb9f Binary files /dev/null and b/third_party/asm/asm-analysis-9.4-sources.jar differ diff --git a/third_party/asm/asm-analysis-9.4.jar b/third_party/asm/asm-analysis-9.4.jar new file mode 100644 index 00000000000000..29f78f006f850d Binary files /dev/null and b/third_party/asm/asm-analysis-9.4.jar differ diff --git a/third_party/asm/asm-commons-9.2-sources.jar b/third_party/asm/asm-commons-9.2-sources.jar deleted file mode 100644 index 1d5ad05895ae7f..00000000000000 Binary files a/third_party/asm/asm-commons-9.2-sources.jar and /dev/null differ diff --git a/third_party/asm/asm-commons-9.2.jar b/third_party/asm/asm-commons-9.2.jar deleted file mode 100644 index 01028a00356707..00000000000000 Binary files a/third_party/asm/asm-commons-9.2.jar and /dev/null differ diff --git a/third_party/asm/asm-commons-9.4-sources.jar b/third_party/asm/asm-commons-9.4-sources.jar new file mode 100644 index 00000000000000..aa0687cc460776 Binary files /dev/null and b/third_party/asm/asm-commons-9.4-sources.jar differ diff --git a/third_party/asm/asm-commons-9.4.jar b/third_party/asm/asm-commons-9.4.jar new file mode 100644 index 00000000000000..593621ac9b4fc1 Binary files /dev/null and b/third_party/asm/asm-commons-9.4.jar differ diff --git a/third_party/asm/asm-tree-9.2-sources.jar b/third_party/asm/asm-tree-9.2-sources.jar deleted file mode 100644 index 2c898803e7755c..00000000000000 Binary files a/third_party/asm/asm-tree-9.2-sources.jar and /dev/null differ diff --git a/third_party/asm/asm-tree-9.2.jar b/third_party/asm/asm-tree-9.2.jar deleted file mode 100644 index 0a6833a6886510..00000000000000 Binary files a/third_party/asm/asm-tree-9.2.jar and /dev/null differ diff --git a/third_party/asm/asm-tree-9.4-sources.jar b/third_party/asm/asm-tree-9.4-sources.jar new file mode 100644 index 00000000000000..8d31cf0086eab1 Binary files /dev/null and b/third_party/asm/asm-tree-9.4-sources.jar differ diff --git a/third_party/asm/asm-tree-9.4.jar b/third_party/asm/asm-tree-9.4.jar new file mode 100644 index 00000000000000..c56030525ef979 Binary files /dev/null and b/third_party/asm/asm-tree-9.4.jar differ diff --git a/third_party/asm/asm-util-9.2-sources.jar b/third_party/asm/asm-util-9.2-sources.jar deleted file mode 100644 index 3b289eda917469..00000000000000 Binary files a/third_party/asm/asm-util-9.2-sources.jar and /dev/null differ diff --git a/third_party/asm/asm-util-9.2.jar b/third_party/asm/asm-util-9.2.jar deleted file mode 100644 index 3afe6e69923418..00000000000000 Binary files a/third_party/asm/asm-util-9.2.jar and /dev/null differ diff --git a/third_party/asm/asm-util-9.4-sources.jar b/third_party/asm/asm-util-9.4-sources.jar new file mode 100644 index 00000000000000..dac4ed77c907eb Binary files /dev/null and b/third_party/asm/asm-util-9.4-sources.jar differ diff --git a/third_party/asm/asm-util-9.4.jar b/third_party/asm/asm-util-9.4.jar new file mode 100644 index 00000000000000..fbe1fcbe0fb692 Binary files /dev/null and b/third_party/asm/asm-util-9.4.jar differ diff --git a/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch b/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch deleted file mode 100644 index 27cdc328e026db..00000000000000 --- a/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2421d449639b7cf1d848af65739c564d9379200e Mon Sep 17 00:00:00 2001 -From: Liam Miller-Cushon -Date: Thu, 28 Jan 2021 21:25:28 -0800 -Subject: [PATCH 1/2] Disable use of 'constant dynamic' bytecode - -Ssee b/177688213 and https://github.com/jacoco/jacoco/issues/1151 ---- - .../instr/ProbeArrayStrategyFactory.java | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java -index fb4efa11..582052e7 100644 ---- a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java -+++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java -@@ -51,10 +51,10 @@ public final class ProbeArrayStrategyFactory { - if (counter.getCount() == 0) { - return new NoneProbeArrayStrategy(); - } -- if (version >= Opcodes.V11 && counter.hasMethods()) { -- return new CondyProbeArrayStrategy(className, true, classId, -- accessorGenerator); -- } -+ // if (version >= Opcodes.V11 && counter.hasMethods()) { -+ // return new CondyProbeArrayStrategy(className, true, classId, -+ // accessorGenerator); -+ // } - if (version >= Opcodes.V1_8 && counter.hasMethods()) { - return new InterfaceFieldProbeArrayStrategy(className, classId, - counter.getCount(), accessorGenerator); -@@ -63,10 +63,10 @@ public final class ProbeArrayStrategyFactory { - counter.getCount(), accessorGenerator); - } - } else { -- if (version >= Opcodes.V11) { -- return new CondyProbeArrayStrategy(className, false, classId, -- accessorGenerator); -- } -+ // if (version >= Opcodes.V11) { -+ // return new CondyProbeArrayStrategy(className, false, classId, -+ // accessorGenerator); -+ // } - return new ClassFieldProbeArrayStrategy(className, classId, - InstrSupport.needsFrames(version), accessorGenerator); - } --- -2.32.0.93.g670b81a890-goog - diff --git a/third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch b/third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch similarity index 92% rename from third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch rename to third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch index b10d780e1b642e..a15c3dcfab6dfe 100644 --- a/third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch +++ b/third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch @@ -1,7 +1,7 @@ -From d49447aae32e1794dfc5d5e31c848d57e27d17a7 Mon Sep 17 00:00:00 2001 +From c3d5e0ff638caf0038ce46054b906d51d59623e6 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 28 Jan 2021 22:18:36 -0800 -Subject: [PATCH 2/2] Partially revert 40c8fd89b0bc0c36e30e6a12f5b42d9da13aca86 +Subject: [PATCH] Partially revert 40c8fd89b0bc0c36e30e6a12f5b42d9da13aca86 See b/177687001#comment5. --- @@ -10,7 +10,7 @@ See b/177687001#comment5. 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java -index efb74846..bba5dd1d 100644 +index 1f1696ff..cc5d37db 100644 --- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java +++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java @@ -44,11 +44,8 @@ public class Agent implements IAgent { @@ -46,7 +46,7 @@ index efb74846..bba5dd1d 100644 } diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java -index 476c4e2b..70bb4e8a 100644 +index 60c56686..c425f7a1 100644 --- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java +++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java @@ -23,25 +23,17 @@ import org.jacoco.core.runtime.RuntimeData; @@ -92,5 +92,5 @@ index 476c4e2b..70bb4e8a 100644 .getProbes(); } -- -2.32.0.93.g670b81a890-goog +2.37.1 (Apple Git-137.1) diff --git a/third_party/java/jacoco/BUILD b/third_party/java/jacoco/BUILD index cea88316e10d2b..9326d3d9510a1c 100644 --- a/third_party/java/jacoco/BUILD +++ b/third_party/java/jacoco/BUILD @@ -1,7 +1,7 @@ # Description: # JaCoCo is a free code coverage library for Java, created by the EclEmma team. # -# https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.7/jacoco-0.8.7.zip +# https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.8/jacoco-0.8.8.zip load("//tools/distributions:distribution_rules.bzl", "distrib_jar_filegroup", "distrib_java_import") load("//src:release_archive.bzl", "release_archive") @@ -12,9 +12,9 @@ exports_files(["LICENSE"]) package(default_visibility = ["//visibility:public"]) -LASTVERSION = "0.8.7" +LASTVERSION = "0.8.8" -VERSIONS = ("0.8.7",) +VERSIONS = ("0.8.7", "0.8.8") filegroup( name = "srcs", @@ -38,9 +38,9 @@ filegroup( ["*-sources.jar"], allow_empty = True, ) + ["LICENSE"] + [ - "//third_party:asm/asm-9.2-sources.jar", - "//third_party:asm/asm-analysis-9.2-sources.jar", - "//third_party:asm/asm-commons-9.2-sources.jar", + "//third_party:asm/asm-9.4-sources.jar", + "//third_party:asm/asm-analysis-9.4-sources.jar", + "//third_party:asm/asm-commons-9.4-sources.jar", ], ) diff --git a/third_party/java/jacoco/jacocoagent-0.8.8.jar b/third_party/java/jacoco/jacocoagent-0.8.8.jar new file mode 100644 index 00000000000000..22082760bbff37 Binary files /dev/null and b/third_party/java/jacoco/jacocoagent-0.8.8.jar differ diff --git a/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar new file mode 100644 index 00000000000000..7787ee481129ee Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar differ diff --git a/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar b/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar new file mode 100644 index 00000000000000..d49ac27d2e8f27 Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar differ diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar new file mode 100644 index 00000000000000..766426dd2cc911 Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar differ diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar new file mode 100644 index 00000000000000..2976b05ca80539 Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar differ diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar new file mode 100644 index 00000000000000..326f62082a474c Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar differ diff --git a/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar new file mode 100644 index 00000000000000..3fdadcd615f02e Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar differ diff --git a/third_party/java/jacoco/org.jacoco.core-0.8.8.jar b/third_party/java/jacoco/org.jacoco.core-0.8.8.jar new file mode 100644 index 00000000000000..97f0e6945bac12 Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.core-0.8.8.jar differ diff --git a/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar new file mode 100644 index 00000000000000..ff9acca64525ca Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar differ diff --git a/third_party/java/jacoco/org.jacoco.report-0.8.8.jar b/third_party/java/jacoco/org.jacoco.report-0.8.8.jar new file mode 100644 index 00000000000000..f347f927d2797c Binary files /dev/null and b/third_party/java/jacoco/org.jacoco.report-0.8.8.jar differ