Skip to content

Commit cb7c1a2

Browse files
comiuscopybara-github
comius
authored and
copybara-github
committed
Update Jacoco version to 0.8.6.
RELNOTES[inc]: Jacoco version upgraded to 0.8.6. Related to #11674 Closes #13335. PiperOrigin-RevId: 367997415
1 parent 97aebaa commit cb7c1a2

9 files changed

Lines changed: 97 additions & 103 deletions

File tree

‎src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ java_binary(
2424
":JacocoCoverageLib",
2525
":bitfield",
2626
"//third_party:guava",
27-
"//third_party/java/jacoco:blaze-agent-0.8.3",
28-
"//third_party/java/jacoco:core-0.8.3",
29-
"//third_party/java/jacoco:report-0.8.3",
27+
"//third_party/java/jacoco:blaze-agent-0.8.6",
28+
"//third_party/java/jacoco:core-0.8.6",
29+
"//third_party/java/jacoco:report-0.8.6",
3030
],
3131
)
3232

@@ -45,9 +45,9 @@ java_library(
4545
deps = [
4646
":bitfield",
4747
"//third_party:guava",
48-
"//third_party/java/jacoco:blaze-agent-0.8.3",
49-
"//third_party/java/jacoco:core-0.8.3",
50-
"//third_party/java/jacoco:report-0.8.3",
48+
"//third_party/java/jacoco:blaze-agent-0.8.6",
49+
"//third_party/java/jacoco:core-0.8.6",
50+
"//third_party/java/jacoco:report-0.8.6",
5151
],
5252
)
5353

‎src/java_tools/junitrunner/javatests/com/google/testing/coverage/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java_test(
2222
"//third_party:junit4",
2323
"//third_party:mockito",
2424
"//third_party:truth",
25-
"//third_party/java/jacoco:core-0.8.3",
26-
"//third_party/java/jacoco:report-0.8.3",
25+
"//third_party/java/jacoco:core-0.8.6",
26+
"//third_party/java/jacoco:report-0.8.6",
2727
],
2828
)

‎src/test/java/com/google/devtools/build/android/desugar/BUILD‎

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

‎src/test/shell/bazel/BUILD‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,7 @@ sh_test(
508508
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
509509
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:coverage_output_generator_repo",
510510
],
511-
# TODO(#11674) reenable after the upgrade
512-
tags = [
513-
"manual",
514-
"no_windows",
515-
],
511+
tags = ["no_windows"],
516512
)
517513
for java_version in JAVA_VERSIONS
518514
]

‎src/test/shell/bazel/bazel_java_tools_dist_test.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,13 @@ function test_java_tools_has_javac() {
138138
expect_path_in_java_tools "javac-9+181-r4173-1.srcjar"
139139
}
140140

141-
# TODO(#11674) reenable after the upgrade
142-
function disable_test_java_tools_has_jacocoagent() {
143-
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.3-sources.jar"
144-
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.3-sources.jar"
145-
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.3-sources.jar"
146-
expect_path_in_java_tools "third_party/asm/asm-analysis-8.0-sources.jar"
147-
expect_path_in_java_tools "third_party/asm/asm-commons-8.0-sources.jar"
148-
expect_path_in_java_tools "third_party/asm/asm-8.0-sources.jar"
141+
function test_java_tools_has_jacocoagent() {
142+
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.6-sources.jar"
143+
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.6-sources.jar"
144+
expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.6-sources.jar"
145+
expect_path_in_java_tools "third_party/asm/asm-analysis-9.1-sources.jar"
146+
expect_path_in_java_tools "third_party/asm/asm-commons-9.1-sources.jar"
147+
expect_path_in_java_tools "third_party/asm/asm-9.1-sources.jar"
149148
}
150149

151150
function test_java_tools_has_proguard() {

‎src/test/shell/bazel/bazel_java_tools_test.sh‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,14 @@ function test_java_tools_has_BUILD() {
176176
expect_path_in_java_tools "BUILD"
177177
}
178178

179-
# TODO(#11674) reenable after the upgrade
180-
function disable_test_java_tools_has_jacocoagent() {
181-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"
182-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"
183-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"
184-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar"
185-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-8.0.jar"
186-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-8.0.jar"
187-
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-8.0.jar"
179+
function test_java_tools_has_jacocoagent() {
180+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"
181+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6.jar"
182+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"
183+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.6.jar"
184+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-9.1.jar"
185+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-9.1.jar"
186+
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-9.1.jar"
188187
expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE"
189188
}
190189

‎src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ filegroup(
3737

3838
genrule(
3939
name = "jacoco_agent_jar",
40-
srcs = ["//third_party/java/jacoco:blaze-agent-0.8.3"],
40+
srcs = ["//third_party/java/jacoco:blaze-agent-0.8.6"],
4141
outs = ["jacoco_agent.jar"],
4242
cmd = """
43-
cp $(location //third_party/java/jacoco:blaze-agent-0.8.3) $(OUTS)
43+
cp $(location //third_party/java/jacoco:blaze-agent-0.8.6) $(OUTS)
4444
""",
4545
)
4646

‎tools/distributions/debian/debian_java.BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ filegroup(
230230
)
231231

232232
# libjacoco-java - BEGIN
233-
JACOCOVERSION = "0.8.3"
233+
JACOCOVERSION = "0.8.6"
234234
java_import(
235235
name = "agent",
236236
jars = ["org.jacoco.agent.jar"],

‎tools/jdk/BUILD.java_tools‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ filegroup(
7777

7878
java_import(
7979
name = "jacoco-agent",
80-
jars = ["java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"],
81-
srcjar = "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3-src.jar",
80+
jars = ["java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6.jar"],
81+
srcjar = "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6-src.jar",
8282
)
8383

8484
java_import(
8585
name = "jacoco-core",
86-
jars = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"],
87-
srcjar = "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3-src.jar",
86+
jars = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"],
87+
srcjar = "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6-src.jar",
8888
exports = [
8989
":asm",
9090
":asm-commons",
@@ -94,12 +94,12 @@ java_import(
9494

9595
filegroup(
9696
name = "jacoco-core-jars",
97-
srcs = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"],
97+
srcs = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"],
9898
)
9999

100100
java_import(
101101
name = "jacoco-report",
102-
jars = ["java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar"],
102+
jars = ["java_tools/third_party/java/jacoco/org.jacoco.report-0.8.6.jar"],
103103
srcjar = "java_tools/third_party/java/jacoco/org.jacoco.report-sources.jar",
104104
exports = [
105105
":asm",
@@ -109,32 +109,32 @@ java_import(
109109

110110
java_import(
111111
name = "bazel-jacoco-agent",
112-
jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"],
112+
jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"],
113113
)
114114

115115
java_import(
116116
name = "bazel-jacoco-agent-neverlink",
117-
jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"],
117+
jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"],
118118
neverlink = 1,
119119
)
120120

121121
java_import(
122122
name = "asm",
123-
jars = ["java_tools/third_party/java/jacoco/asm-8.0.jar"],
124-
srcjar = "java_tools/third_party/java/jacoco/asm-8.0-sources.jar",
123+
jars = ["java_tools/third_party/java/jacoco/asm-9.1.jar"],
124+
srcjar = "java_tools/third_party/java/jacoco/asm-9.1-sources.jar",
125125
)
126126

127127
java_import(
128128
name = "asm-commons",
129-
jars = ["java_tools/third_party/java/jacoco/asm-commons-8.0.jar"],
130-
srcjar = "java_tools/third_party/java/jacoco/asm-commons-8.0-sources.jar",
129+
jars = ["java_tools/third_party/java/jacoco/asm-commons-9.1.jar"],
130+
srcjar = "java_tools/third_party/java/jacoco/asm-commons-9.1-sources.jar",
131131
runtime_deps = [":asm-tree"],
132132
)
133133

134134
java_import(
135135
name = "asm-tree",
136-
jars = ["java_tools/third_party/java/jacoco/asm-tree-8.0.jar"],
137-
srcjar = "java_tools/third_party/java/jacoco/asm-tree-8.0-sources.jar",
136+
jars = ["java_tools/third_party/java/jacoco/asm-tree-9.1.jar"],
137+
srcjar = "java_tools/third_party/java/jacoco/asm-tree-9.1-sources.jar",
138138
runtime_deps = [":asm"],
139139
)
140140

0 commit comments

Comments
 (0)