From 1a0534a441dc6023107c72d23d41156a22c7b2b6 Mon Sep 17 00:00:00 2001 From: Simon Resch Date: Fri, 17 Oct 2025 11:35:53 +0200 Subject: [PATCH 1/5] chore: update maven dependencies --- MODULE.bazel | 5 ++--- maven_install.json | 23 ++++++----------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index e1cab50ab..438681549 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -39,9 +39,8 @@ SHADED_RUNTIME_MAVEN_ARTIFACTS = [ # keep sorted # renovate: keep updated "com.github.jsqlparser:jsqlparser:4.9", - "com.google.errorprone:error_prone_annotations:2.26.1", - "com.google.errorprone:error_prone_type_annotations:2.26.1", - "io.github.classgraph:classgraph:jar:4.8.170", + "com.google.errorprone:error_prone_annotations:2.42.0", + "io.github.classgraph:classgraph:jar:4.8.184", "net.bytebuddy:byte-buddy-agent:1.14.13", "net.jodah:typetools:jar:0.6.3", "org.ow2.asm:asm:9.8", diff --git a/maven_install.json b/maven_install.json index c69211c02..891cf4a3b 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,10 +1,9 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1770049243, - "__RESOLVED_ARTIFACTS_HASH": 1091888085, + "__INPUT_ARTIFACTS_HASH": -959354005, + "__RESOLVED_ARTIFACTS_HASH": 858113298, "conflict_resolution": { "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", - "com.google.errorprone:error_prone_annotations:2.26.1": "com.google.errorprone:error_prone_annotations:2.41.0", "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android", "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.4.3-android", "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0", @@ -83,15 +82,9 @@ }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "a56e782b5b50811ac204073a355a21d915a2107fce13ec711331ad036f660fcc" + "jar": "f282a6488838986b8033bd51888928cff6a59c1050426476553ed2622b89e510" }, - "version": "2.41.0" - }, - "com.google.errorprone:error_prone_type_annotations": { - "shasums": { - "jar": "31907edd46a1f5b7801762b84a2c56d6425ba425acc5d6f8c696d6fac81de9bd" - }, - "version": "2.26.1" + "version": "2.42.0" }, "com.google.guava:failureaccess": { "shasums": { @@ -185,9 +178,9 @@ }, "io.github.classgraph:classgraph": { "shasums": { - "jar": "ca0e78c00c074ce99151b5a31ef120cda69e2b4726eb6a0ad7d5081044471951" + "jar": "6e564e29cec95a392268a609f09071d56199383d906ac70e91753a7998d1a3e8" }, - "version": "4.8.170" + "version": "4.8.184" }, "io.micrometer:micrometer-commons": { "shasums": { @@ -1118,9 +1111,6 @@ "com.google.errorprone.annotations", "com.google.errorprone.annotations.concurrent" ], - "com.google.errorprone:error_prone_type_annotations": [ - "com.google.errorprone.annotations" - ], "com.google.guava:failureaccess": [ "com.google.common.util.concurrent.internal" ], @@ -2623,7 +2613,6 @@ "com.google.code.findbugs:jsr305", "com.google.code.gson:gson", "com.google.errorprone:error_prone_annotations", - "com.google.errorprone:error_prone_type_annotations", "com.google.guava:failureaccess", "com.google.guava:guava", "com.google.guava:listenablefuture", From 8c75809372c5843c2f6664c70d2f90fb460d6cab Mon Sep 17 00:00:00 2001 From: Simon Resch Date: Fri, 17 Oct 2025 11:37:06 +0200 Subject: [PATCH 2/5] chore: silence warning about contributing modules --- MODULE.bazel | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index 438681549..1f873a53f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -174,6 +174,11 @@ maven.override( maven.install( artifacts = SHADED_RUNTIME_MAVEN_ARTIFACTS + PROVIDED_RUNTIME_MAVEN_ARTIFACTS, fail_if_repin_required = True, + known_contributing_modules = [ + "bazel_worker_java", + "jazzer", + "protobuf", + ], lock_file = "//:maven_install.json", repositories = ["https://repo1.maven.org/maven2"], strict_visibility = True, From 423058c715fcbe233d1c648060648f363a7e845b Mon Sep 17 00:00:00 2001 From: Simon Resch Date: Mon, 20 Oct 2025 16:18:31 +0200 Subject: [PATCH 3/5] chore: update byte buddy & ASM deps --- MODULE.bazel | 8 ++++---- maven_install.json | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 1f873a53f..522bf16bb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -41,11 +41,11 @@ SHADED_RUNTIME_MAVEN_ARTIFACTS = [ "com.github.jsqlparser:jsqlparser:4.9", "com.google.errorprone:error_prone_annotations:2.42.0", "io.github.classgraph:classgraph:jar:4.8.184", - "net.bytebuddy:byte-buddy-agent:1.14.13", + "net.bytebuddy:byte-buddy-agent:1.17.8", "net.jodah:typetools:jar:0.6.3", - "org.ow2.asm:asm:9.8", - "org.ow2.asm:asm-commons:9.8", - "org.ow2.asm:asm-tree:9.8", + "org.ow2.asm:asm:9.9", + "org.ow2.asm:asm-commons:9.9", + "org.ow2.asm:asm-tree:9.9", ] # Runtime dependencies of Jazzer that are expected to be provided by the fuzzed project. diff --git a/maven_install.json b/maven_install.json index 891cf4a3b..c1dd487b6 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,17 +1,13 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -959354005, - "__RESOLVED_ARTIFACTS_HASH": 858113298, + "__INPUT_ARTIFACTS_HASH": -1805494723, + "__RESOLVED_ARTIFACTS_HASH": -141517399, "conflict_resolution": { "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android", "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.4.3-android", "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0", - "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0", - "net.bytebuddy:byte-buddy-agent:1.14.13": "net.bytebuddy:byte-buddy-agent:1.17.7", - "org.ow2.asm:asm-commons:9.8": "org.ow2.asm:asm-commons:9.9", - "org.ow2.asm:asm-tree:9.8": "org.ow2.asm:asm-tree:9.9", - "org.ow2.asm:asm:9.8": "org.ow2.asm:asm:9.9" + "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0" }, "artifacts": { "com.alibaba:fastjson": { @@ -250,9 +246,9 @@ }, "net.bytebuddy:byte-buddy-agent": { "shasums": { - "jar": "a9ba887dca252ad61b7d5153294f34e6f3bdf4b2736b04373d13615a695fc0ff" + "jar": "5b17113e66e77ca6f8af07ff367c216df964a980f0e9f11e3b1aa793253aa64f" }, - "version": "1.17.7" + "version": "1.17.8" }, "net.jodah:typetools": { "shasums": { From 386cdf9da47dad83c8b36cdd19d11221916e7cb4 Mon Sep 17 00:00:00 2001 From: Simon Resch Date: Tue, 21 Oct 2025 11:31:39 +0200 Subject: [PATCH 4/5] chore: remove ineffective "jar" packaging type This silences a bazel DEBUG warning. --- MODULE.bazel | 4 ++-- maven_install.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 522bf16bb..4affdd12a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -40,9 +40,9 @@ SHADED_RUNTIME_MAVEN_ARTIFACTS = [ # renovate: keep updated "com.github.jsqlparser:jsqlparser:4.9", "com.google.errorprone:error_prone_annotations:2.42.0", - "io.github.classgraph:classgraph:jar:4.8.184", + "io.github.classgraph:classgraph:4.8.184", "net.bytebuddy:byte-buddy-agent:1.17.8", - "net.jodah:typetools:jar:0.6.3", + "net.jodah:typetools:0.6.3", "org.ow2.asm:asm:9.9", "org.ow2.asm:asm-commons:9.9", "org.ow2.asm:asm-tree:9.9", diff --git a/maven_install.json b/maven_install.json index c1dd487b6..97741039c 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1805494723, + "__INPUT_ARTIFACTS_HASH": 1247073039, "__RESOLVED_ARTIFACTS_HASH": -141517399, "conflict_resolution": { "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", From 2c163af08412614d6a58a2be43b4b00637563feb Mon Sep 17 00:00:00 2001 From: Simon Resch Date: Wed, 22 Oct 2025 09:21:09 +0200 Subject: [PATCH 5/5] chore: pin specific version of guava ... to avoid different versions on the class path.. --- MODULE.bazel | 1 + maven_install.json | 60 +++++++--------------------------------------- 2 files changed, 10 insertions(+), 51 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4affdd12a..9313f6cce 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -40,6 +40,7 @@ SHADED_RUNTIME_MAVEN_ARTIFACTS = [ # renovate: keep updated "com.github.jsqlparser:jsqlparser:4.9", "com.google.errorprone:error_prone_annotations:2.42.0", + "com.google.guava:guava:33.5.0-android", "io.github.classgraph:classgraph:4.8.184", "net.bytebuddy:byte-buddy-agent:1.17.8", "net.jodah:typetools:0.6.3", diff --git a/maven_install.json b/maven_install.json index 97741039c..dcd73dc46 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,12 +1,10 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1247073039, - "__RESOLVED_ARTIFACTS_HASH": -141517399, + "__INPUT_ARTIFACTS_HASH": 22269842, + "__RESOLVED_ARTIFACTS_HASH": 236949396, "conflict_resolution": { "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", - "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android", - "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.4.3-android", - "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0", + "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1", "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0" }, "artifacts": { @@ -84,15 +82,15 @@ }, "com.google.guava:failureaccess": { "shasums": { - "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064" + "jar": "cbfc3906b19b8f55dd7cfd6dfe0aa4532e834250d7f080bd8d211a3e246b59cb" }, - "version": "1.0.2" + "version": "1.0.3" }, "com.google.guava:guava": { "shasums": { - "jar": "d09b7ac13b6bc203322b8a3da4d8e39128f5f6a22f816c01a34b93592f771b12" + "jar": "e380b435404653753e894be80ee6fdd5252d55b07f663d8a004b4e5898ecfaa0" }, - "version": "33.4.3-android" + "version": "33.5.0-android" }, "com.google.guava:listenablefuture": { "shasums": { @@ -102,9 +100,9 @@ }, "com.google.j2objc:j2objc-annotations": { "shasums": { - "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64" + "jar": "84d3a150518485f8140ea99b8a985656749629f6433c92b80c75b36aba3b099b" }, - "version": "3.0.0" + "version": "3.1" }, "com.google.protobuf:protobuf-java": { "shasums": { @@ -418,12 +416,6 @@ }, "version": "3.27.6" }, - "org.checkerframework:checker-qual": { - "shasums": { - "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6" - }, - "version": "3.43.0" - }, "org.glassfish:javax.el": { "shasums": { "jar": "c255fe3ff4d7e491caf92c10c497f3c77d19acc4832d9bd2e80180d168fcedd2" @@ -677,7 +669,6 @@ "com.google.guava:failureaccess", "com.google.guava:listenablefuture", "com.google.j2objc:j2objc-annotations", - "org.checkerframework:checker-qual", "org.jspecify:jspecify" ], "com.google.protobuf:protobuf-java-util": [ @@ -1788,38 +1779,6 @@ "org.assertj.core.util.introspection", "org.assertj.core.util.xml" ], - "org.checkerframework:checker-qual": [ - "org.checkerframework.checker.builder.qual", - "org.checkerframework.checker.calledmethods.qual", - "org.checkerframework.checker.compilermsgs.qual", - "org.checkerframework.checker.fenum.qual", - "org.checkerframework.checker.formatter.qual", - "org.checkerframework.checker.guieffect.qual", - "org.checkerframework.checker.i18n.qual", - "org.checkerframework.checker.i18nformatter.qual", - "org.checkerframework.checker.index.qual", - "org.checkerframework.checker.initialization.qual", - "org.checkerframework.checker.interning.qual", - "org.checkerframework.checker.lock.qual", - "org.checkerframework.checker.mustcall.qual", - "org.checkerframework.checker.nullness.qual", - "org.checkerframework.checker.optional.qual", - "org.checkerframework.checker.propkey.qual", - "org.checkerframework.checker.regex.qual", - "org.checkerframework.checker.signature.qual", - "org.checkerframework.checker.signedness.qual", - "org.checkerframework.checker.tainting.qual", - "org.checkerframework.checker.units.qual", - "org.checkerframework.common.aliasing.qual", - "org.checkerframework.common.initializedfields.qual", - "org.checkerframework.common.reflection.qual", - "org.checkerframework.common.returnsreceiver.qual", - "org.checkerframework.common.subtyping.qual", - "org.checkerframework.common.util.count.report.qual", - "org.checkerframework.common.value.qual", - "org.checkerframework.dataflow.qual", - "org.checkerframework.framework.qual" - ], "org.glassfish:javax.el": [ "com.sun.el", "com.sun.el.lang", @@ -2665,7 +2624,6 @@ "org.apache.xmlgraphics:xmlgraphics-commons", "org.apiguardian:apiguardian-api", "org.assertj:assertj-core", - "org.checkerframework:checker-qual", "org.glassfish:javax.el", "org.hamcrest:hamcrest-core", "org.hibernate:hibernate-validator",