Skip to content

Commit 7cde7f8

Browse files
authored
[bazel]: Bump rules_protobuf to avoid warning about maven namespace (#14891)
1 parent 4ea71ca commit 7cde7f8

File tree

3 files changed

+25
-127
lines changed

3 files changed

+25
-127
lines changed

.bazelrc

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ build --tool_java_runtime_version=remotejdk_17
3030
build --javacopt="--release 11"
3131

3232
# Require java dependencies to be used and first-order
33-
3433
build --experimental_strict_java_deps=strict
3534
build --explicit_java_test_deps
3635

36+
# Avoid ErrorProne getting annoyed about "impossible null checks"
37+
build --javacopt="-Xep:ImpossibleNullComparison:OFF"
38+
3739
# Allow spaces in runfile paths
3840
build --nobuild_runfile_links
3941

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

5658
build --incompatible_strict_action_env
5759

60+
# Required to get `protobuf` compiling, which is required for `rules_closure`
61+
build --incompatible_enable_cc_toolchain_resolution
62+
build --cxxopt=-std=c++14
63+
build --host_cxxopt=-std=c++14
64+
5865
# For build stamping
5966

6067
build --enable_platform_specific_config

MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
1212
bazel_dep(name = "platforms", version = "0.0.10")
1313

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

1717
# Required for rules_rust to import the crates properly
1818
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)

java/maven_install.json

+16-125
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -756051712,
4-
"__RESOLVED_ARTIFACTS_HASH": -748733705,
3+
"__INPUT_ARTIFACTS_HASH": -1348814803,
4+
"__RESOLVED_ARTIFACTS_HASH": -1874042868,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -101,13 +101,6 @@
101101
},
102102
"version": "1.1.1"
103103
},
104-
"com.google.auto.value:auto-value-annotations": {
105-
"shasums": {
106-
"jar": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
107-
"sources": "41dbbed2cc92e72fe61e622f715735b05db45dcc49a1276619781b6e19e7a91f"
108-
},
109-
"version": "1.7.4"
110-
},
111104
"com.google.auto:auto-common": {
112105
"shasums": {
113106
"jar": "f50b1ce8a41fad31a8a819c052f8ffa362ea0a3dbe9ef8f7c7dc9a36d4738a59",
@@ -131,10 +124,10 @@
131124
},
132125
"com.google.errorprone:error_prone_annotations": {
133126
"shasums": {
134-
"jar": "357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d",
135-
"sources": "7ce688ed1582a67097228c050192b7cfd00479a81d2b921f7cd5116994f1402d"
127+
"jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e",
128+
"sources": "2936e9b315d790d8a6364f0574bcec9c8b2d78688b317e1765c4a16f9ef80632"
136129
},
137-
"version": "2.3.2"
130+
"version": "2.28.0"
138131
},
139132
"com.google.googlejavaformat:google-java-format": {
140133
"shasums": {
@@ -157,13 +150,6 @@
157150
},
158151
"version": "33.3.1-jre"
159152
},
160-
"com.google.guava:guava-testlib": {
161-
"shasums": {
162-
"jar": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
163-
"sources": "7149659f8966197dcd91a42183349f862d3973f8e65efe6d03e678464fa13bfd"
164-
},
165-
"version": "31.1-jre"
166-
},
167153
"com.google.guava:listenablefuture": {
168154
"shasums": {
169155
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
@@ -172,17 +158,10 @@
172158
},
173159
"com.google.j2objc:j2objc-annotations": {
174160
"shasums": {
175-
"jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
176-
"sources": "ba4df669fec153fa4cd0ef8d02c6d3ef0702b7ac4cabe080facf3b6e490bb972"
161+
"jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
162+
"sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
177163
},
178-
"version": "1.3"
179-
},
180-
"com.google.truth:truth": {
181-
"shasums": {
182-
"jar": "a85e03b8b6ae8780f060cfded9500a3d1b5f52808f99a2ea6da9c683313c7518",
183-
"sources": "a98b2f82af388484dfe1b2b859c3c05a28fcae000fc532ef0155e1814fa3af05"
184-
},
185-
"version": "1.1.2"
164+
"version": "3.0.0"
186165
},
187166
"com.graphql-java:graphql-java": {
188167
"shasums": {
@@ -471,13 +450,6 @@
471450
},
472451
"version": "2.0.0"
473452
},
474-
"junit:junit": {
475-
"shasums": {
476-
"jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
477-
"sources": "34181df6482d40ea4c046b063cb53c7ffae94bdf1b1d62695bdf3adf9dea7e3a"
478-
},
479-
"version": "4.13.2"
480-
},
481453
"net.bytebuddy:byte-buddy": {
482454
"shasums": {
483455
"jar": "d8390d20685a41a2bdca640f958942cd91bcbf21c42470494bdf5752d9a07b14",
@@ -606,10 +578,10 @@
606578
},
607579
"org.checkerframework:checker-qual": {
608580
"shasums": {
609-
"jar": "ab0468b1ba35bb2ae45f61a60dc4960bd887660ab8f05113a662a7e675eae776",
610-
"sources": "cbe362ef1dfacb927e0e4bf78a97b1b92ba50ca38b4406ae58b8c11e41ef2075"
581+
"jar": "7e8554c902b9b839e61396cfe3a64c84ecabfb8eb652c410bfd8e4f5c1a8ece8",
582+
"sources": "4f85e422b5da3c73990e894f1ed4cac45358f34fb4b979687848301584eccb57"
611583
},
612-
"version": "3.9.1"
584+
"version": "3.21.2"
613585
},
614586
"org.dom4j:dom4j": {
615587
"shasums": {
@@ -725,10 +697,10 @@
725697
},
726698
"org.ow2.asm:asm": {
727699
"shasums": {
728-
"jar": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
729-
"sources": "829bc5eb0ccd705a7c8afbf7cdc4b7e9a9f733d3a1a954b9afffd99c8e063366"
700+
"jar": "adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d",
701+
"sources": "11dfd88129204be18c0f592f8e066d0c07d8a6bc001f6c7b2cce5ff0588d5d71"
730702
},
731-
"version": "9.0"
703+
"version": "9.7"
732704
},
733705
"org.ow2.asm:asm-analysis": {
734706
"shasums": {
@@ -881,22 +853,6 @@
881853
"com.google.j2objc:j2objc-annotations",
882854
"org.checkerframework:checker-qual"
883855
],
884-
"com.google.guava:guava-testlib": [
885-
"com.google.code.findbugs:jsr305",
886-
"com.google.errorprone:error_prone_annotations",
887-
"com.google.guava:guava",
888-
"com.google.j2objc:j2objc-annotations",
889-
"junit:junit",
890-
"org.checkerframework:checker-qual"
891-
],
892-
"com.google.truth:truth": [
893-
"com.google.auto.value:auto-value-annotations",
894-
"com.google.errorprone:error_prone_annotations",
895-
"com.google.guava:guava",
896-
"junit:junit",
897-
"org.checkerframework:checker-qual",
898-
"org.ow2.asm:asm"
899-
],
900856
"com.graphql-java:graphql-java": [
901857
"com.graphql-java:java-dataloader",
902858
"org.reactivestreams:reactive-streams"
@@ -1345,11 +1301,6 @@
13451301
"com.google.auto.service:auto-service-annotations": [
13461302
"com.google.auto.service"
13471303
],
1348-
"com.google.auto.value:auto-value-annotations": [
1349-
"com.google.auto.value",
1350-
"com.google.auto.value.extension.memoized",
1351-
"com.google.auto.value.extension.serializable"
1352-
],
13531304
"com.google.auto:auto-common": [
13541305
"com.google.auto.common"
13551306
],
@@ -1403,21 +1354,9 @@
14031354
"com.google.common.xml",
14041355
"com.google.thirdparty.publicsuffix"
14051356
],
1406-
"com.google.guava:guava-testlib": [
1407-
"com.google.common.collect.testing",
1408-
"com.google.common.collect.testing.features",
1409-
"com.google.common.collect.testing.google",
1410-
"com.google.common.collect.testing.testers",
1411-
"com.google.common.escape.testing",
1412-
"com.google.common.testing",
1413-
"com.google.common.util.concurrent.testing"
1414-
],
14151357
"com.google.j2objc:j2objc-annotations": [
14161358
"com.google.j2objc.annotations"
14171359
],
1418-
"com.google.truth:truth": [
1419-
"com.google.common.truth"
1420-
],
14211360
"com.graphql-java:graphql-java": [
14221361
"graphql",
14231362
"graphql.agent.result",
@@ -1865,40 +1804,6 @@
18651804
"org.jaxen.util",
18661805
"org.jaxen.xom"
18671806
],
1868-
"junit:junit": [
1869-
"junit.extensions",
1870-
"junit.framework",
1871-
"junit.runner",
1872-
"junit.textui",
1873-
"org.junit",
1874-
"org.junit.experimental",
1875-
"org.junit.experimental.categories",
1876-
"org.junit.experimental.max",
1877-
"org.junit.experimental.results",
1878-
"org.junit.experimental.runners",
1879-
"org.junit.experimental.theories",
1880-
"org.junit.experimental.theories.internal",
1881-
"org.junit.experimental.theories.suppliers",
1882-
"org.junit.function",
1883-
"org.junit.internal",
1884-
"org.junit.internal.builders",
1885-
"org.junit.internal.management",
1886-
"org.junit.internal.matchers",
1887-
"org.junit.internal.requests",
1888-
"org.junit.internal.runners",
1889-
"org.junit.internal.runners.model",
1890-
"org.junit.internal.runners.rules",
1891-
"org.junit.internal.runners.statements",
1892-
"org.junit.matchers",
1893-
"org.junit.rules",
1894-
"org.junit.runner",
1895-
"org.junit.runner.manipulation",
1896-
"org.junit.runner.notification",
1897-
"org.junit.runners",
1898-
"org.junit.runners.model",
1899-
"org.junit.runners.parameterized",
1900-
"org.junit.validator"
1901-
],
19021807
"net.bytebuddy:byte-buddy": [
19031808
"net.bytebuddy",
19041809
"net.bytebuddy.agent.builder",
@@ -2533,27 +2438,22 @@
25332438
"org.checkerframework.checker.calledmethods.qual",
25342439
"org.checkerframework.checker.compilermsgs.qual",
25352440
"org.checkerframework.checker.fenum.qual",
2536-
"org.checkerframework.checker.formatter",
25372441
"org.checkerframework.checker.formatter.qual",
25382442
"org.checkerframework.checker.guieffect.qual",
25392443
"org.checkerframework.checker.i18n.qual",
2540-
"org.checkerframework.checker.i18nformatter",
25412444
"org.checkerframework.checker.i18nformatter.qual",
25422445
"org.checkerframework.checker.index.qual",
25432446
"org.checkerframework.checker.initialization.qual",
25442447
"org.checkerframework.checker.interning.qual",
25452448
"org.checkerframework.checker.lock.qual",
2546-
"org.checkerframework.checker.nullness",
2449+
"org.checkerframework.checker.mustcall.qual",
25472450
"org.checkerframework.checker.nullness.qual",
25482451
"org.checkerframework.checker.optional.qual",
25492452
"org.checkerframework.checker.propkey.qual",
2550-
"org.checkerframework.checker.regex",
25512453
"org.checkerframework.checker.regex.qual",
25522454
"org.checkerframework.checker.signature.qual",
2553-
"org.checkerframework.checker.signedness",
25542455
"org.checkerframework.checker.signedness.qual",
25552456
"org.checkerframework.checker.tainting.qual",
2556-
"org.checkerframework.checker.units",
25572457
"org.checkerframework.checker.units.qual",
25582458
"org.checkerframework.common.aliasing.qual",
25592459
"org.checkerframework.common.initializedfields.qual",
@@ -2563,8 +2463,7 @@
25632463
"org.checkerframework.common.util.report.qual",
25642464
"org.checkerframework.common.value.qual",
25652465
"org.checkerframework.dataflow.qual",
2566-
"org.checkerframework.framework.qual",
2567-
"org.checkerframework.framework.util"
2466+
"org.checkerframework.framework.qual"
25682467
],
25692468
"org.dom4j:dom4j": [
25702469
"org.dom4j",
@@ -3013,8 +2912,6 @@
30132912
"com.google.auto.service:auto-service-annotations",
30142913
"com.google.auto.service:auto-service-annotations:jar:sources",
30152914
"com.google.auto.service:auto-service:jar:sources",
3016-
"com.google.auto.value:auto-value-annotations",
3017-
"com.google.auto.value:auto-value-annotations:jar:sources",
30182915
"com.google.auto:auto-common",
30192916
"com.google.auto:auto-common:jar:sources",
30202917
"com.google.code.findbugs:jsr305",
@@ -3028,14 +2925,10 @@
30282925
"com.google.guava:failureaccess",
30292926
"com.google.guava:failureaccess:jar:sources",
30302927
"com.google.guava:guava",
3031-
"com.google.guava:guava-testlib",
3032-
"com.google.guava:guava-testlib:jar:sources",
30332928
"com.google.guava:guava:jar:sources",
30342929
"com.google.guava:listenablefuture",
30352930
"com.google.j2objc:j2objc-annotations",
30362931
"com.google.j2objc:j2objc-annotations:jar:sources",
3037-
"com.google.truth:truth",
3038-
"com.google.truth:truth:jar:sources",
30392932
"com.graphql-java:graphql-java",
30402933
"com.graphql-java:graphql-java:jar:sources",
30412934
"com.graphql-java:java-dataloader",
@@ -3118,8 +3011,6 @@
31183011
"javax.cache:cache-api:jar:sources",
31193012
"jaxen:jaxen",
31203013
"jaxen:jaxen:jar:sources",
3121-
"junit:junit",
3122-
"junit:junit:jar:sources",
31233014
"net.bytebuddy:byte-buddy",
31243015
"net.bytebuddy:byte-buddy-agent",
31253016
"net.bytebuddy:byte-buddy-agent:jar:sources",

0 commit comments

Comments
 (0)