Skip to content

Commit

Permalink
Update to jacoco v0.8.11 / asm v9.6
Browse files Browse the repository at this point in the history
Step 1/3 as per https://github.com/bazelbuild/bazel/blob/master/third_party/java/jacoco/README.md

Work towards bazelbuild#20845

Closes bazelbuild#20996

Partial commit for third_party/*, see bazelbuild#20996.

Change-Id: Ib15e09040d6950335d0440f0f289b060b8ccc43e
Signed-off-by: iancha1992 <[email protected]>
  • Loading branch information
hvadehra authored and iancha1992 committed Jan 24, 2024
1 parent b22449f commit ad8ea5a
Show file tree
Hide file tree
Showing 22 changed files with 18 additions and 19 deletions.
20 changes: 10 additions & 10 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -93,35 +93,35 @@ java_library(
distrib_java_import(
name = "asm",
enable_distributions = ["debian"],
jars = ["asm/asm-9.4.jar"],
srcjar = "asm/asm-9.4-sources.jar",
jars = ["asm/asm-9.6.jar"],
srcjar = "asm/asm-9.6-sources.jar",
)

java_import(
name = "asm-analysis",
jars = ["asm/asm-analysis-9.4.jar"],
srcjar = "asm/asm-analysis-9.4-sources.jar",
jars = ["asm/asm-analysis-9.6.jar"],
srcjar = "asm/asm-analysis-9.6-sources.jar",
runtime_deps = [":asm-tree"],
)

java_import(
name = "asm-commons",
jars = ["asm/asm-commons-9.4.jar"],
srcjar = "asm/asm-commons-9.4-sources.jar",
jars = ["asm/asm-commons-9.6.jar"],
srcjar = "asm/asm-commons-9.6-sources.jar",
runtime_deps = [":asm-tree"],
)

java_import(
name = "asm-tree",
jars = ["asm/asm-tree-9.4.jar"],
srcjar = "asm/asm-tree-9.4-sources.jar",
jars = ["asm/asm-tree-9.6.jar"],
srcjar = "asm/asm-tree-9.6-sources.jar",
runtime_deps = [":asm"],
)

java_import(
name = "asm-util",
jars = ["asm/asm-util-9.4.jar"],
srcjar = "asm/asm-util-9.4-sources.jar",
jars = ["asm/asm-util-9.6.jar"],
srcjar = "asm/asm-util-9.6-sources.jar",
runtime_deps = [":asm-tree"],
)

Expand Down
Binary file added third_party/asm/asm-9.6-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-analysis-9.6-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-analysis-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-commons-9.6-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-commons-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-tree-9.6-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-tree-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-util-9.6-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-util-9.6.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions third_party/java/jacoco/BUILD
Original file line number Diff line number Diff line change
@@ -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.9/jacoco-0.8.9.zip
# https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.11/jacoco-0.8.11.zip

load("//tools/distributions:distribution_rules.bzl", "distrib_jar_filegroup", "distrib_java_import")
load("//src:release_archive.bzl", "release_archive")
Expand All @@ -12,9 +12,9 @@ exports_files(["LICENSE"])

package(default_visibility = ["//visibility:public"])

LASTVERSION = "0.8.9-SNAPSHOT"
LASTVERSION = "0.8.11"

VERSIONS = ("0.8.8", "0.8.9-SNAPSHOT")
VERSIONS = ("0.8.8", "0.8.9-SNAPSHOT", "0.8.11")

filegroup(
name = "srcs",
Expand All @@ -38,9 +38,9 @@ filegroup(
["*-sources.jar"],
allow_empty = True,
) + ["LICENSE"] + [
"//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",
"//third_party:asm/asm-9.6-sources.jar",
"//third_party:asm/asm-analysis-9.6-sources.jar",
"//third_party:asm/asm-commons-9.6-sources.jar",
],
)

Expand Down
5 changes: 2 additions & 3 deletions third_party/java/jacoco/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
ASM
ASM 9.4 is subject to the terms and conditions of the following license:
ASM 9.6 is subject to the terms and conditions of the following license:

ASM: a very small and fast Java bytecode manipulation framework
Copyright (c) 2000-2011 INRIA, France Telecom
Expand Down Expand Up @@ -238,5 +238,4 @@ Copyright 2011 Mike Samuel et al
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
JaCoCo 0.8.9.202303300400Copyright © 2009, 2023 Mountainminds GmbH & Co. KG and Contributors
of your accepting any such warranty or additional liability.
Binary file added third_party/java/jacoco/jacocoagent-0.8.11.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added third_party/java/jacoco/org.jacoco.ant-0.8.11.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit ad8ea5a

Please sign in to comment.