Skip to content

Commit

Permalink
Upgrade asm to 9.7.1.
Browse files Browse the repository at this point in the history
This allows some java_tools (e.g., coverage) to work with the absolute latest JDK.
  • Loading branch information
benjaminp committed Jan 22, 2025
1 parent a0a2c25 commit c6658e0
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 35 deletions.
10 changes: 5 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ maven.install(
"org.checkerframework:checker-qual:3.19.0",
"org.openjdk.jmh:jmh-core:1.37",
"org.openjdk.jmh:jmh-generator-annprocess:1.37",
"org.ow2.asm:asm:9.2",
"org.ow2.asm:asm-analysis:9.2",
"org.ow2.asm:asm-commons:9.2",
"org.ow2.asm:asm-tree:9.2",
"org.ow2.asm:asm-util:9.2",
"org.ow2.asm:asm:9.7.1",
"org.ow2.asm:asm-analysis:9.7.1",
"org.ow2.asm:asm-commons:9.7.1",
"org.ow2.asm:asm-tree:9.7.1",
"org.ow2.asm:asm-util:9.7.1",
"org.pcollections:pcollections:3.1.4",
"org.threeten:threeten-extra:1.5.0",
"org.tukaani:xz:1.9",
Expand Down
26 changes: 12 additions & 14 deletions maven_install.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1897763682,
"__RESOLVED_ARTIFACTS_HASH": -165154966,
"__INPUT_ARTIFACTS_HASH": -1309313306,
"__RESOLVED_ARTIFACTS_HASH": 170305773,
"conflict_resolution": {
"com.google.api.grpc:proto-google-common-protos:2.29.0": "com.google.api.grpc:proto-google-common-protos:2.41.0",
"com.google.auth:google-auth-library-credentials:1.6.0": "com.google.auth:google-auth-library-credentials:1.23.0",
Expand All @@ -26,7 +26,6 @@
"io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1",
"org.checkerframework:checker-qual:3.19.0": "org.checkerframework:checker-qual:3.42.0",
"org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.4.0",
"org.ow2.asm:asm:9.2": "org.ow2.asm:asm:9.6",
"org.pcollections:pcollections:3.1.4": "org.pcollections:pcollections:4.0.1",
"org.yaml:snakeyaml:1.28": "org.yaml:snakeyaml:2.0"
},
Expand Down Expand Up @@ -956,33 +955,33 @@
},
"org.ow2.asm:asm": {
"shasums": {
"jar": "3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1"
"jar": "8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281"
},
"version": "9.6"
"version": "9.7.1"
},
"org.ow2.asm:asm-analysis": {
"shasums": {
"jar": "878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4"
"jar": "85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2"
},
"version": "9.2"
"version": "9.7.1"
},
"org.ow2.asm:asm-commons": {
"shasums": {
"jar": "be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6"
"jar": "9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0"
},
"version": "9.2"
"version": "9.7.1"
},
"org.ow2.asm:asm-tree": {
"shasums": {
"jar": "aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011"
"jar": "9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f"
},
"version": "9.2"
"version": "9.7.1"
},
"org.ow2.asm:asm-util": {
"shasums": {
"jar": "ff5b3cd331ae8a9a804768280da98f50f424fef23dd3c788bb320e08c94ee598"
"jar": "f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6"
},
"version": "9.2"
"version": "9.7.1"
},
"org.pcollections:pcollections": {
"shasums": {
Expand Down Expand Up @@ -1613,7 +1612,6 @@
],
"org.ow2.asm:asm-commons": [
"org.ow2.asm:asm",
"org.ow2.asm:asm-analysis",
"org.ow2.asm:asm-tree"
],
"org.ow2.asm:asm-tree": [
Expand Down
20 changes: 10 additions & 10 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -85,35 +85,35 @@ java_library(
distrib_java_import(
name = "asm",
enable_distributions = ["debian"],
jars = ["asm/asm-9.6.jar"],
srcjar = "asm/asm-9.6-sources.jar",
jars = ["asm/asm-9.7.1.jar"],
srcjar = "asm/asm-9.7.1-sources.jar",
)

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

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

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

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

Expand Down
Binary file removed third_party/asm/asm-9.6.jar
Binary file not shown.
Binary file not shown.
Binary file added third_party/asm/asm-9.7.1.jar
Binary file not shown.
Binary file removed third_party/asm/asm-analysis-9.6-sources.jar
Binary file not shown.
Binary file removed third_party/asm/asm-analysis-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-analysis-9.7.1-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-analysis-9.7.1.jar
Binary file not shown.
Binary file removed third_party/asm/asm-commons-9.6.jar
Binary file not shown.
Binary file not shown.
Binary file added third_party/asm/asm-commons-9.7.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed third_party/asm/asm-util-9.6-sources.jar
Binary file not shown.
Binary file removed third_party/asm/asm-util-9.6.jar
Binary file not shown.
Binary file added third_party/asm/asm-util-9.7.1-sources.jar
Binary file not shown.
Binary file added third_party/asm/asm-util-9.7.1.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions tools/jdk/BUILD.java_tools
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,21 @@ java_import(

java_import(
name = "asm",
jars = ["java_tools/third_party/java/jacoco/asm-9.6.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-9.6-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-9.7.1.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-9.7.1-sources.jar",
)

java_import(
name = "asm-commons",
jars = ["java_tools/third_party/java/jacoco/asm-commons-9.6.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-commons-9.6-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-commons-9.7.1.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-commons-9.7.1-sources.jar",
runtime_deps = [":asm-tree"],
)

java_import(
name = "asm-tree",
jars = ["java_tools/third_party/java/jacoco/asm-tree-9.6.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-tree-9.6-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-tree-9.7.1.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-tree-9.7.1-sources.jar",
runtime_deps = [":asm"],
)

Expand Down

0 comments on commit c6658e0

Please sign in to comment.