Skip to content

Commit a67bd7e

Browse files
authored
[ci] Fix bzlmod failures caused by protobuf update (#1408)
1 parent a88c56e commit a67bd7e

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

examples/bzlmod/.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ../../.bazelrc
33
common --enable_bzlmod
44
common --incompatible_use_plus_in_repo_names
55

6+
common --check_direct_dependencies=error
7+
68
build --java_language_version=11
79
build --tool_java_language_version=11
810

examples/bzlmod/.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0
1+
8.3.1

examples/bzlmod/MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ module(
33
version = "6.0",
44
)
55

6+
# Required because `protobuf` contributes to the default namespace
7+
bazel_dep(name = "protobuf", version = "29.0", repo_name = None)
8+
bazel_dep(name = "rules_java", version = "8.12.0")
69
bazel_dep(name = "rules_jvm_external", version = "0.0")
710
local_path_override(
811
module_name = "rules_jvm_external", # matches the name of the `bazel_dep`
@@ -21,6 +24,10 @@ maven.install(
2124
"org.seleniumhq.selenium:selenium-java:4.4.0",
2225
],
2326
fetch_sources = True,
27+
known_contributing_modules = [
28+
"protobuf",
29+
"rules_jvm_external_examples_bzlmod",
30+
],
2431
lock_file = "//:maven_install.json",
2532
)
2633

examples/bzlmod/maven_install.json

Lines changed: 2 additions & 3 deletions
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",
33
"__INPUT_ARTIFACTS_HASH": -1307306091,
4-
"__RESOLVED_ARTIFACTS_HASH": -1723710779,
4+
"__RESOLVED_ARTIFACTS_HASH": -1663972293,
55
"conflict_resolution": {
66
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0",
77
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:32.0.1-jre"
@@ -170,8 +170,7 @@
170170
},
171171
"com.google.guava:listenablefuture": {
172172
"shasums": {
173-
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
174-
"sources": null
173+
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
175174
},
176175
"version": "9999.0-empty-to-avoid-conflict-with-guava"
177176
},

0 commit comments

Comments
 (0)