Skip to content

Commit ba6da44

Browse files
zhangskzjschaf
andauthored
Rename maven to protobuf_maven in MODULE.bazel (#18641) (#19477)
The default name for the rules_jvm_external.maven rule is "maven". When not set, it defaults to "maven". For root modules also using rules_jvm_external, the name clash causes a warning: ``` DEBUG: $TMP/external/rules_jvm_external~/private/extensions/maven.bzl:154:14: The maven repository 'maven' is used in two different bazel modules, originally in '<my_workspace>' and now in 'protobuf' ``` Summarizing @shs96c in [1]: > The common maven repo name allows rulesets to contribute to the user's JARs. > However, this implies that maven is for the end user, not for transitive > dependencies. If a ruleset needs private dependencies, it should use a custom > namespace rather than the maven namespace. Since protobuf is not contributing to user's JARs, we'll use a custom namespace. There's precedent for using a custom namespace for library modules: - rules_jvm_external uses `rules_jvm_external_deps` instead of `maven`. - rules_kotlin uses `kotlin_rules_maven` instead of `maven`. [1]: bazel-contrib/rules_jvm_external#916 (comment) Fixes #16839. Closes #18641 COPYBARA_INTEGRATE_REVIEW=#18641 from jschaf:joe/protobuf-maven bd2c62f PiperOrigin-RevId: 684625084 Co-authored-by: Joe Schafer <[email protected]>
1 parent 5864b50 commit ba6da44

File tree

9 files changed

+68
-66
lines changed

9 files changed

+68
-66
lines changed

MODULE.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ use_repo(pip, "pip_deps")
131131
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
132132

133133
maven.install(
134+
name = "protobuf_maven",
134135
artifacts = [
135136
"com.google.caliper:caliper:1.0-beta-3",
136137
"com.google.code.findbugs:jsr305:3.0.2",
@@ -151,7 +152,7 @@ maven.install(
151152
],
152153
)
153154

154-
use_repo(maven, "maven")
155+
use_repo(maven, "protobuf_maven")
155156

156157
# Development dependencies
157158
bazel_dep(

WORKSPACE

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ rules_jvm_external_setup()
5959
load("@rules_jvm_external//:defs.bzl", "maven_install")
6060

6161
maven_install(
62+
name = "protobuf_maven",
6263
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
6364
# For updating instructions, see:
6465
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
@@ -69,7 +70,7 @@ maven_install(
6970
],
7071
)
7172

72-
load("@maven//:defs.bzl", "pinned_maven_install")
73+
load("@protobuf_maven//:defs.bzl", "pinned_maven_install")
7374

7475
pinned_maven_install()
7576

java/core/BUILD.bazel

+26-26
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ protobuf_java_library(
391391
":generic_test_protos_java_proto",
392392
":java_test_protos_java_proto",
393393
":lite_test_protos_java_proto",
394-
"@maven//:com_google_guava_guava",
395-
"@maven//:junit_junit",
394+
"@protobuf_maven//:com_google_guava_guava",
395+
"@protobuf_maven//:junit_junit",
396396
],
397397
)
398398

@@ -442,10 +442,10 @@ junit_tests(
442442
":java_test_protos_java_proto",
443443
":lite_test_protos_java_proto",
444444
":test_util",
445-
"@maven//:com_google_guava_guava",
446-
"@maven//:com_google_truth_truth",
447-
"@maven//:junit_junit",
448-
"@maven//:org_mockito_mockito_core",
445+
"@protobuf_maven//:com_google_guava_guava",
446+
"@protobuf_maven//:com_google_truth_truth",
447+
"@protobuf_maven//:junit_junit",
448+
"@protobuf_maven//:org_mockito_mockito_core",
449449
],
450450
)
451451

@@ -461,9 +461,9 @@ junit_tests(
461461
],
462462
deps = [
463463
":core",
464-
"@maven//:com_google_guava_guava",
465-
"@maven//:com_google_truth_truth",
466-
"@maven//:junit_junit",
464+
"@protobuf_maven//:com_google_guava_guava",
465+
"@protobuf_maven//:com_google_truth_truth",
466+
"@protobuf_maven//:junit_junit",
467467
],
468468
)
469469

@@ -518,8 +518,8 @@ protobuf_java_library(
518518
":java_test_protos_java_proto_lite",
519519
":lite_runtime_only",
520520
":lite_test_protos_java_proto_lite",
521-
"@maven//:com_google_guava_guava",
522-
"@maven//:junit_junit",
521+
"@protobuf_maven//:com_google_guava_guava",
522+
"@protobuf_maven//:junit_junit",
523523
],
524524
)
525525

@@ -586,9 +586,9 @@ junit_tests(
586586
":lite",
587587
":lite_test_protos_java_proto_lite",
588588
":test_util_lite",
589-
"@maven//:com_google_truth_truth",
590-
"@maven//:junit_junit",
591-
"@maven//:org_mockito_mockito_core",
589+
"@protobuf_maven//:com_google_truth_truth",
590+
"@protobuf_maven//:junit_junit",
591+
"@protobuf_maven//:org_mockito_mockito_core",
592592
],
593593
)
594594

@@ -602,8 +602,8 @@ protobuf_java_library(
602602
deps = [
603603
":core",
604604
"//compatibility:v25_test_protos_srcjar",
605-
"@maven//:com_google_guava_guava",
606-
"@maven//:junit_junit",
605+
"@protobuf_maven//:com_google_guava_guava",
606+
"@protobuf_maven//:junit_junit",
607607
],
608608
)
609609

@@ -634,10 +634,10 @@ junit_tests(
634634
":core",
635635
":v25_test_util_srcjar",
636636
"//compatibility:v25_test_protos_srcjar",
637-
"@maven//:com_google_guava_guava",
638-
"@maven//:com_google_truth_truth",
639-
"@maven//:junit_junit",
640-
"@maven//:org_mockito_mockito_core",
637+
"@protobuf_maven//:com_google_guava_guava",
638+
"@protobuf_maven//:com_google_truth_truth",
639+
"@protobuf_maven//:junit_junit",
640+
"@protobuf_maven//:org_mockito_mockito_core",
641641
],
642642
)
643643

@@ -651,8 +651,8 @@ protobuf_java_library(
651651
deps = [
652652
":core",
653653
"//compatibility:v25_test_protos_jar",
654-
"@maven//:com_google_guava_guava",
655-
"@maven//:junit_junit",
654+
"@protobuf_maven//:com_google_guava_guava",
655+
"@protobuf_maven//:junit_junit",
656656
],
657657
)
658658

@@ -683,10 +683,10 @@ junit_tests(
683683
":core",
684684
":v25_test_util_jar",
685685
"//compatibility:v25_test_protos_jar",
686-
"@maven//:com_google_guava_guava",
687-
"@maven//:com_google_truth_truth",
688-
"@maven//:junit_junit",
689-
"@maven//:org_mockito_mockito_core",
686+
"@protobuf_maven//:com_google_guava_guava",
687+
"@protobuf_maven//:com_google_truth_truth",
688+
"@protobuf_maven//:junit_junit",
689+
"@protobuf_maven//:org_mockito_mockito_core",
690690
],
691691
)
692692

java/internal/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ java_test(
1818
srcs = ["JavaVersionTest.java"],
1919
test_class = "JavaVersionTest",
2020
deps = [
21-
"@maven//:com_google_truth_truth",
22-
"@maven//:junit_junit",
21+
"@protobuf_maven//:com_google_truth_truth",
22+
"@protobuf_maven//:junit_junit",
2323
],
2424
)

java/kotlin-lite/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ kt_jvm_library(
114114
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
115115
"//java/kotlin:shared_runtime",
116116
"//java/lite",
117-
"@maven//:com_google_truth_truth",
118-
"@maven//:junit_junit",
117+
"@protobuf_maven//:com_google_truth_truth",
118+
"@protobuf_maven//:junit_junit",
119119
"@rules_kotlin//kotlin/compiler:kotlin-test",
120120
],
121121
)
@@ -210,8 +210,8 @@ kt_jvm_library(
210210
deps = [
211211
":kotlin_unittest_lite",
212212
"//java/core:test_util_lite",
213-
"@maven//:com_google_truth_truth",
214-
"@maven//:junit_junit",
213+
"@protobuf_maven//:com_google_truth_truth",
214+
"@protobuf_maven//:junit_junit",
215215
],
216216
)
217217

@@ -227,8 +227,8 @@ kt_jvm_library(
227227
deps = [
228228
":kotlin_proto3_unittest_lite",
229229
"//java/core:test_util_lite",
230-
"@maven//:com_google_truth_truth",
231-
"@maven//:junit_junit",
230+
"@protobuf_maven//:com_google_truth_truth",
231+
"@protobuf_maven//:junit_junit",
232232
],
233233
)
234234

java/kotlin/BUILD.bazel

+11-11
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ kt_jvm_library(
116116
deps = [
117117
":bytestring_lib",
118118
"//java/lite",
119-
"@maven//:com_google_truth_truth",
120-
"@maven//:junit_junit",
119+
"@protobuf_maven//:com_google_truth_truth",
120+
"@protobuf_maven//:junit_junit",
121121
"@rules_kotlin//kotlin/compiler:kotlin-test",
122122
],
123123
)
@@ -151,9 +151,9 @@ kt_jvm_library(
151151
":example_extensible_message_java_proto",
152152
":only_for_use_in_proto_generated_code_its_generator_and_tests",
153153
":shared_runtime",
154-
"@maven//:com_google_guava_guava_testlib",
155-
"@maven//:com_google_truth_truth",
156-
"@maven//:junit_junit",
154+
"@protobuf_maven//:com_google_guava_guava_testlib",
155+
"@protobuf_maven//:com_google_truth_truth",
156+
"@protobuf_maven//:junit_junit",
157157
"@rules_kotlin//kotlin/compiler:kotlin-test",
158158
],
159159
)
@@ -177,8 +177,8 @@ kt_jvm_library(
177177
":only_for_use_in_proto_generated_code_its_generator_and_tests",
178178
":shared_runtime",
179179
"//java/core",
180-
"@maven//:com_google_truth_truth",
181-
"@maven//:junit_junit",
180+
"@protobuf_maven//:com_google_truth_truth",
181+
"@protobuf_maven//:junit_junit",
182182
"@rules_kotlin//kotlin/compiler:kotlin-test",
183183
],
184184
)
@@ -289,8 +289,8 @@ kt_jvm_library(
289289
deps = [
290290
":kotlin_unittest",
291291
"//java/core:test_util",
292-
"@maven//:com_google_truth_truth",
293-
"@maven//:junit_junit",
292+
"@protobuf_maven//:com_google_truth_truth",
293+
"@protobuf_maven//:junit_junit",
294294
"@rules_kotlin//kotlin/compiler:kotlin-reflect",
295295
],
296296
)
@@ -307,8 +307,8 @@ kt_jvm_library(
307307
deps = [
308308
":kotlin_proto3_unittest",
309309
"//java/core:test_util",
310-
"@maven//:com_google_truth_truth",
311-
"@maven//:junit_junit",
310+
"@protobuf_maven//:com_google_truth_truth",
311+
"@protobuf_maven//:junit_junit",
312312
],
313313
)
314314

java/lite/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ junit_tests(
7676
"//java/core:java_test_protos_java_proto_lite",
7777
"//java/core:lite_test_protos_java_proto_lite",
7878
"//java/core:test_util_lite",
79-
"@maven//:com_google_truth_truth",
80-
"@maven//:junit_junit",
79+
"@protobuf_maven//:com_google_truth_truth",
80+
"@protobuf_maven//:junit_junit",
8181
],
8282
)
8383

java/osgi/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ java_binary(
99
srcs = ["OsgiWrapper.java"],
1010
main_class = "com.google.protobuf.osgi.OsgiWrapper",
1111
deps = [
12-
"@maven//:biz_aQute_bnd_biz_aQute_bndlib",
13-
"@maven//:com_google_guava_guava",
14-
"@maven//:info_picocli_picocli",
12+
"@protobuf_maven//:biz_aQute_bnd_biz_aQute_bndlib",
13+
"@protobuf_maven//:com_google_guava_guava",
14+
"@protobuf_maven//:info_picocli_picocli",
1515
],
1616
)

java/util/BUILD.bazel

+14-14
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ java_library(
1313
visibility = ["//visibility:public"],
1414
deps = [
1515
"//java/core",
16-
"@maven//:com_google_code_findbugs_jsr305",
17-
"@maven//:com_google_code_gson_gson",
18-
"@maven//:com_google_errorprone_error_prone_annotations",
19-
"@maven//:com_google_guava_guava",
20-
"@maven//:com_google_j2objc_j2objc_annotations",
16+
"@protobuf_maven//:com_google_code_findbugs_jsr305",
17+
"@protobuf_maven//:com_google_code_gson_gson",
18+
"@protobuf_maven//:com_google_errorprone_error_prone_annotations",
19+
"@protobuf_maven//:com_google_guava_guava",
20+
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
2121
],
2222
)
2323

@@ -33,11 +33,11 @@ protobuf_versioned_java_library(
3333
visibility = ["//visibility:public"],
3434
deps = [
3535
"//java/core",
36-
"@maven//:com_google_code_findbugs_jsr305",
37-
"@maven//:com_google_code_gson_gson",
38-
"@maven//:com_google_errorprone_error_prone_annotations",
39-
"@maven//:com_google_guava_guava",
40-
"@maven//:com_google_j2objc_j2objc_annotations",
36+
"@protobuf_maven//:com_google_code_findbugs_jsr305",
37+
"@protobuf_maven//:com_google_code_gson_gson",
38+
"@protobuf_maven//:com_google_errorprone_error_prone_annotations",
39+
"@protobuf_maven//:com_google_guava_guava",
40+
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
4141
],
4242
)
4343

@@ -90,10 +90,10 @@ junit_tests(
9090
":util",
9191
"//java/core",
9292
"//java/core:generic_test_protos_java_proto",
93-
"@maven//:com_google_code_gson_gson",
94-
"@maven//:com_google_guava_guava",
95-
"@maven//:com_google_truth_truth",
96-
"@maven//:junit_junit",
93+
"@protobuf_maven//:com_google_code_gson_gson",
94+
"@protobuf_maven//:com_google_guava_guava",
95+
"@protobuf_maven//:com_google_truth_truth",
96+
"@protobuf_maven//:junit_junit",
9797
],
9898
)
9999

0 commit comments

Comments
 (0)