Skip to content

Commit

Permalink
[bazel]: Bump rules_protobuf to avoid warning about maven namespa…
Browse files Browse the repository at this point in the history
…ce (#14891)
  • Loading branch information
shs96c authored Dec 12, 2024
1 parent 4ea71ca commit 7cde7f8
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 127 deletions.
9 changes: 8 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ build --tool_java_runtime_version=remotejdk_17
build --javacopt="--release 11"

# Require java dependencies to be used and first-order

build --experimental_strict_java_deps=strict
build --explicit_java_test_deps

# Avoid ErrorProne getting annoyed about "impossible null checks"
build --javacopt="-Xep:ImpossibleNullComparison:OFF"

# Allow spaces in runfile paths
build --nobuild_runfile_links

Expand All @@ -55,6 +57,11 @@ query --@aspect_rules_ts//ts:default_to_tsc_transpiler

build --incompatible_strict_action_env

# Required to get `protobuf` compiling, which is required for `rules_closure`
build --incompatible_enable_cc_toolchain_resolution
build --cxxopt=-std=c++14
build --host_cxxopt=-std=c++14

# For build stamping

build --enable_platform_specific_config
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
bazel_dep(name = "platforms", version = "0.0.10")

# Required for the closure rules
bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "29.1", dev_dependency = True, repo_name = "com_google_protobuf")

# Required for rules_rust to import the crates properly
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
Expand Down
141 changes: 16 additions & 125 deletions java/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": -756051712,
"__RESOLVED_ARTIFACTS_HASH": -748733705,
"__INPUT_ARTIFACTS_HASH": -1348814803,
"__RESOLVED_ARTIFACTS_HASH": -1874042868,
"artifacts": {
"com.beust:jcommander": {
"shasums": {
Expand Down Expand Up @@ -101,13 +101,6 @@
},
"version": "1.1.1"
},
"com.google.auto.value:auto-value-annotations": {
"shasums": {
"jar": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
"sources": "41dbbed2cc92e72fe61e622f715735b05db45dcc49a1276619781b6e19e7a91f"
},
"version": "1.7.4"
},
"com.google.auto:auto-common": {
"shasums": {
"jar": "f50b1ce8a41fad31a8a819c052f8ffa362ea0a3dbe9ef8f7c7dc9a36d4738a59",
Expand All @@ -131,10 +124,10 @@
},
"com.google.errorprone:error_prone_annotations": {
"shasums": {
"jar": "357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d",
"sources": "7ce688ed1582a67097228c050192b7cfd00479a81d2b921f7cd5116994f1402d"
"jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e",
"sources": "2936e9b315d790d8a6364f0574bcec9c8b2d78688b317e1765c4a16f9ef80632"
},
"version": "2.3.2"
"version": "2.28.0"
},
"com.google.googlejavaformat:google-java-format": {
"shasums": {
Expand All @@ -157,13 +150,6 @@
},
"version": "33.3.1-jre"
},
"com.google.guava:guava-testlib": {
"shasums": {
"jar": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
"sources": "7149659f8966197dcd91a42183349f862d3973f8e65efe6d03e678464fa13bfd"
},
"version": "31.1-jre"
},
"com.google.guava:listenablefuture": {
"shasums": {
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
Expand All @@ -172,17 +158,10 @@
},
"com.google.j2objc:j2objc-annotations": {
"shasums": {
"jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
"sources": "ba4df669fec153fa4cd0ef8d02c6d3ef0702b7ac4cabe080facf3b6e490bb972"
"jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
"sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
},
"version": "1.3"
},
"com.google.truth:truth": {
"shasums": {
"jar": "a85e03b8b6ae8780f060cfded9500a3d1b5f52808f99a2ea6da9c683313c7518",
"sources": "a98b2f82af388484dfe1b2b859c3c05a28fcae000fc532ef0155e1814fa3af05"
},
"version": "1.1.2"
"version": "3.0.0"
},
"com.graphql-java:graphql-java": {
"shasums": {
Expand Down Expand Up @@ -471,13 +450,6 @@
},
"version": "2.0.0"
},
"junit:junit": {
"shasums": {
"jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
"sources": "34181df6482d40ea4c046b063cb53c7ffae94bdf1b1d62695bdf3adf9dea7e3a"
},
"version": "4.13.2"
},
"net.bytebuddy:byte-buddy": {
"shasums": {
"jar": "d8390d20685a41a2bdca640f958942cd91bcbf21c42470494bdf5752d9a07b14",
Expand Down Expand Up @@ -606,10 +578,10 @@
},
"org.checkerframework:checker-qual": {
"shasums": {
"jar": "ab0468b1ba35bb2ae45f61a60dc4960bd887660ab8f05113a662a7e675eae776",
"sources": "cbe362ef1dfacb927e0e4bf78a97b1b92ba50ca38b4406ae58b8c11e41ef2075"
"jar": "7e8554c902b9b839e61396cfe3a64c84ecabfb8eb652c410bfd8e4f5c1a8ece8",
"sources": "4f85e422b5da3c73990e894f1ed4cac45358f34fb4b979687848301584eccb57"
},
"version": "3.9.1"
"version": "3.21.2"
},
"org.dom4j:dom4j": {
"shasums": {
Expand Down Expand Up @@ -725,10 +697,10 @@
},
"org.ow2.asm:asm": {
"shasums": {
"jar": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
"sources": "829bc5eb0ccd705a7c8afbf7cdc4b7e9a9f733d3a1a954b9afffd99c8e063366"
"jar": "adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d",
"sources": "11dfd88129204be18c0f592f8e066d0c07d8a6bc001f6c7b2cce5ff0588d5d71"
},
"version": "9.0"
"version": "9.7"
},
"org.ow2.asm:asm-analysis": {
"shasums": {
Expand Down Expand Up @@ -881,22 +853,6 @@
"com.google.j2objc:j2objc-annotations",
"org.checkerframework:checker-qual"
],
"com.google.guava:guava-testlib": [
"com.google.code.findbugs:jsr305",
"com.google.errorprone:error_prone_annotations",
"com.google.guava:guava",
"com.google.j2objc:j2objc-annotations",
"junit:junit",
"org.checkerframework:checker-qual"
],
"com.google.truth:truth": [
"com.google.auto.value:auto-value-annotations",
"com.google.errorprone:error_prone_annotations",
"com.google.guava:guava",
"junit:junit",
"org.checkerframework:checker-qual",
"org.ow2.asm:asm"
],
"com.graphql-java:graphql-java": [
"com.graphql-java:java-dataloader",
"org.reactivestreams:reactive-streams"
Expand Down Expand Up @@ -1345,11 +1301,6 @@
"com.google.auto.service:auto-service-annotations": [
"com.google.auto.service"
],
"com.google.auto.value:auto-value-annotations": [
"com.google.auto.value",
"com.google.auto.value.extension.memoized",
"com.google.auto.value.extension.serializable"
],
"com.google.auto:auto-common": [
"com.google.auto.common"
],
Expand Down Expand Up @@ -1403,21 +1354,9 @@
"com.google.common.xml",
"com.google.thirdparty.publicsuffix"
],
"com.google.guava:guava-testlib": [
"com.google.common.collect.testing",
"com.google.common.collect.testing.features",
"com.google.common.collect.testing.google",
"com.google.common.collect.testing.testers",
"com.google.common.escape.testing",
"com.google.common.testing",
"com.google.common.util.concurrent.testing"
],
"com.google.j2objc:j2objc-annotations": [
"com.google.j2objc.annotations"
],
"com.google.truth:truth": [
"com.google.common.truth"
],
"com.graphql-java:graphql-java": [
"graphql",
"graphql.agent.result",
Expand Down Expand Up @@ -1865,40 +1804,6 @@
"org.jaxen.util",
"org.jaxen.xom"
],
"junit:junit": [
"junit.extensions",
"junit.framework",
"junit.runner",
"junit.textui",
"org.junit",
"org.junit.experimental",
"org.junit.experimental.categories",
"org.junit.experimental.max",
"org.junit.experimental.results",
"org.junit.experimental.runners",
"org.junit.experimental.theories",
"org.junit.experimental.theories.internal",
"org.junit.experimental.theories.suppliers",
"org.junit.function",
"org.junit.internal",
"org.junit.internal.builders",
"org.junit.internal.management",
"org.junit.internal.matchers",
"org.junit.internal.requests",
"org.junit.internal.runners",
"org.junit.internal.runners.model",
"org.junit.internal.runners.rules",
"org.junit.internal.runners.statements",
"org.junit.matchers",
"org.junit.rules",
"org.junit.runner",
"org.junit.runner.manipulation",
"org.junit.runner.notification",
"org.junit.runners",
"org.junit.runners.model",
"org.junit.runners.parameterized",
"org.junit.validator"
],
"net.bytebuddy:byte-buddy": [
"net.bytebuddy",
"net.bytebuddy.agent.builder",
Expand Down Expand Up @@ -2533,27 +2438,22 @@
"org.checkerframework.checker.calledmethods.qual",
"org.checkerframework.checker.compilermsgs.qual",
"org.checkerframework.checker.fenum.qual",
"org.checkerframework.checker.formatter",
"org.checkerframework.checker.formatter.qual",
"org.checkerframework.checker.guieffect.qual",
"org.checkerframework.checker.i18n.qual",
"org.checkerframework.checker.i18nformatter",
"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.nullness",
"org.checkerframework.checker.mustcall.qual",
"org.checkerframework.checker.nullness.qual",
"org.checkerframework.checker.optional.qual",
"org.checkerframework.checker.propkey.qual",
"org.checkerframework.checker.regex",
"org.checkerframework.checker.regex.qual",
"org.checkerframework.checker.signature.qual",
"org.checkerframework.checker.signedness",
"org.checkerframework.checker.signedness.qual",
"org.checkerframework.checker.tainting.qual",
"org.checkerframework.checker.units",
"org.checkerframework.checker.units.qual",
"org.checkerframework.common.aliasing.qual",
"org.checkerframework.common.initializedfields.qual",
Expand All @@ -2563,8 +2463,7 @@
"org.checkerframework.common.util.report.qual",
"org.checkerframework.common.value.qual",
"org.checkerframework.dataflow.qual",
"org.checkerframework.framework.qual",
"org.checkerframework.framework.util"
"org.checkerframework.framework.qual"
],
"org.dom4j:dom4j": [
"org.dom4j",
Expand Down Expand Up @@ -3013,8 +2912,6 @@
"com.google.auto.service:auto-service-annotations",
"com.google.auto.service:auto-service-annotations:jar:sources",
"com.google.auto.service:auto-service:jar:sources",
"com.google.auto.value:auto-value-annotations",
"com.google.auto.value:auto-value-annotations:jar:sources",
"com.google.auto:auto-common",
"com.google.auto:auto-common:jar:sources",
"com.google.code.findbugs:jsr305",
Expand All @@ -3028,14 +2925,10 @@
"com.google.guava:failureaccess",
"com.google.guava:failureaccess:jar:sources",
"com.google.guava:guava",
"com.google.guava:guava-testlib",
"com.google.guava:guava-testlib:jar:sources",
"com.google.guava:guava:jar:sources",
"com.google.guava:listenablefuture",
"com.google.j2objc:j2objc-annotations",
"com.google.j2objc:j2objc-annotations:jar:sources",
"com.google.truth:truth",
"com.google.truth:truth:jar:sources",
"com.graphql-java:graphql-java",
"com.graphql-java:graphql-java:jar:sources",
"com.graphql-java:java-dataloader",
Expand Down Expand Up @@ -3118,8 +3011,6 @@
"javax.cache:cache-api:jar:sources",
"jaxen:jaxen",
"jaxen:jaxen:jar:sources",
"junit:junit",
"junit:junit:jar:sources",
"net.bytebuddy:byte-buddy",
"net.bytebuddy:byte-buddy-agent",
"net.bytebuddy:byte-buddy-agent:jar:sources",
Expand Down

0 comments on commit 7cde7f8

Please sign in to comment.