Skip to content

Commit f4b0a79

Browse files
zhangskzzhangskz
authored
Restore custom protobuf maven namespaces to avoid polluting main maven namespace for non-dev dependencies as well. (#20739)
Fixes #20674 PiperOrigin-RevId: 738081837
1 parent 2dc9f35 commit f4b0a79

File tree

10 files changed

+92
-90
lines changed

10 files changed

+92
-90
lines changed

‎MODULE.bazel

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,15 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen
8585

8686
use_repo(pip, "protobuf_pip_deps")
8787

88-
protobuf_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
88+
protobuf_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
8989
protobuf_maven.install(
9090
name = "protobuf_maven",
9191
artifacts = [
92-
"com.google.caliper:caliper:1.0-beta-3",
93-
"com.google.guava:guava-testlib:32.0.1-jre",
94-
"com.google.testparameterinjector:test-parameter-injector:1.18",
95-
"com.google.truth:truth:1.1.2",
96-
"junit:junit:4.13.2",
97-
"org.mockito:mockito-core:4.3.1",
98-
"biz.aQute.bnd:biz.aQute.bndlib:6.4.0",
99-
"info.picocli:picocli:4.6.3",
92+
"com.google.code.findbugs:jsr305:3.0.2",
93+
"com.google.code.gson:gson:2.8.9",
94+
"com.google.errorprone:error_prone_annotations:2.5.1",
95+
"com.google.j2objc:j2objc-annotations:2.8",
96+
"com.google.guava:guava:32.0.1-jre",
10097
],
10198
repositories = [
10299
"https://repo1.maven.org/maven2",
@@ -105,22 +102,26 @@ protobuf_maven.install(
105102
)
106103
use_repo(protobuf_maven, "protobuf_maven")
107104

108-
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
109-
maven.install(
110-
name = "maven",
105+
# Development dependencies
106+
protobuf_maven_dev = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
107+
protobuf_maven_dev.install(
108+
name = "protobuf_maven_dev",
111109
artifacts = [
112-
"com.google.code.findbugs:jsr305:3.0.2",
113-
"com.google.code.gson:gson:2.8.9",
114-
"com.google.errorprone:error_prone_annotations:2.5.1",
115-
"com.google.j2objc:j2objc-annotations:2.8",
116-
"com.google.guava:guava:32.0.1-jre",
110+
"com.google.caliper:caliper:1.0-beta-3",
111+
"com.google.guava:guava-testlib:32.0.1-jre",
112+
"com.google.testparameterinjector:test-parameter-injector:1.18",
113+
"com.google.truth:truth:1.1.2",
114+
"junit:junit:4.13.2",
115+
"org.mockito:mockito-core:4.3.1",
116+
"biz.aQute.bnd:biz.aQute.bndlib:6.4.0",
117+
"info.picocli:picocli:4.6.3",
117118
],
118119
repositories = [
119120
"https://repo1.maven.org/maven2",
120121
"https://repo.maven.apache.org/maven2",
121122
],
122123
)
123-
use_repo(maven, "maven")
124+
use_repo(protobuf_maven_dev, "protobuf_maven_dev")
124125

125126
# Development dependencies
126127
bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)

‎WORKSPACE

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ rules_jvm_external_setup()
6565
load("@rules_jvm_external//:defs.bzl", "maven_install")
6666

6767
maven_install(
68-
name = "maven",
68+
name = "protobuf_maven",
6969
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
7070
# For updating instructions, see:
7171
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
@@ -76,11 +76,12 @@ maven_install(
7676
],
7777
)
7878

79-
load("@maven//:defs.bzl", "pinned_maven_install")
79+
load("@protobuf_maven//:defs.bzl", "pinned_maven_install")
80+
8081
pinned_maven_install()
8182

8283
maven_install(
83-
name = "protobuf_maven",
84+
name = "protobuf_maven_dev",
8485
artifacts = [
8586
"com.google.caliper:caliper:1.0-beta-3",
8687
"com.google.guava:guava-testlib:32.0.1-jre",
@@ -100,9 +101,9 @@ maven_install(
100101
],
101102
)
102103

103-
load("@protobuf_maven//:defs.bzl", pinned_protobuf_maven_install = "pinned_maven_install")
104-
pinned_protobuf_maven_install()
104+
load("@protobuf_maven_dev//:defs.bzl", pinned_protobuf_maven_install = "pinned_maven_install")
105105

106+
pinned_protobuf_maven_install()
106107

107108
# For `cc_proto_blacklist_test` and `build_test`.
108109
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

‎examples/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ rules_jvm_external_setup()
7676
load("@rules_jvm_external//:defs.bzl", "maven_install")
7777

7878
maven_install(
79-
name = "maven",
79+
name = "protobuf_maven",
8080
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
8181
repositories = [
8282
"https://repo1.maven.org/maven2",

‎java/core/BUILD.bazel

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ protobuf_java_library(
393393
":generic_test_protos_java_proto",
394394
":java_test_protos_java_proto",
395395
":lite_test_protos_java_proto",
396-
"@protobuf_maven//:com_google_guava_guava",
397-
"@protobuf_maven//:junit_junit",
396+
"@protobuf_maven_dev//:com_google_guava_guava",
397+
"@protobuf_maven_dev//:junit_junit",
398398
],
399399
)
400400

@@ -444,11 +444,11 @@ junit_tests(
444444
":java_test_protos_java_proto",
445445
":lite_test_protos_java_proto",
446446
":test_util",
447-
"@protobuf_maven//:com_google_guava_guava",
448-
"@protobuf_maven//:com_google_testparameterinjector_test_parameter_injector",
449-
"@protobuf_maven//:com_google_truth_truth",
450-
"@protobuf_maven//:junit_junit",
451-
"@protobuf_maven//:org_mockito_mockito_core",
447+
"@protobuf_maven_dev//:com_google_guava_guava",
448+
"@protobuf_maven_dev//:com_google_testparameterinjector_test_parameter_injector",
449+
"@protobuf_maven_dev//:com_google_truth_truth",
450+
"@protobuf_maven_dev//:junit_junit",
451+
"@protobuf_maven_dev//:org_mockito_mockito_core",
452452
],
453453
)
454454

@@ -464,9 +464,9 @@ junit_tests(
464464
],
465465
deps = [
466466
":core",
467-
"@protobuf_maven//:com_google_guava_guava",
468-
"@protobuf_maven//:com_google_truth_truth",
469-
"@protobuf_maven//:junit_junit",
467+
"@protobuf_maven_dev//:com_google_guava_guava",
468+
"@protobuf_maven_dev//:com_google_truth_truth",
469+
"@protobuf_maven_dev//:junit_junit",
470470
],
471471
)
472472

@@ -521,8 +521,8 @@ protobuf_java_library(
521521
":java_test_protos_java_proto_lite",
522522
":lite_runtime_only",
523523
":lite_test_protos_java_proto_lite",
524-
"@protobuf_maven//:com_google_guava_guava",
525-
"@protobuf_maven//:junit_junit",
524+
"@protobuf_maven_dev//:com_google_guava_guava",
525+
"@protobuf_maven_dev//:junit_junit",
526526
],
527527
)
528528

@@ -591,9 +591,9 @@ junit_tests(
591591
":lite",
592592
":lite_test_protos_java_proto_lite",
593593
":test_util_lite",
594-
"@protobuf_maven//:com_google_truth_truth",
595-
"@protobuf_maven//:junit_junit",
596-
"@protobuf_maven//:org_mockito_mockito_core",
594+
"@protobuf_maven_dev//:com_google_truth_truth",
595+
"@protobuf_maven_dev//:junit_junit",
596+
"@protobuf_maven_dev//:org_mockito_mockito_core",
597597
],
598598
)
599599

@@ -607,8 +607,8 @@ protobuf_java_library(
607607
deps = [
608608
":core",
609609
"//compatibility:v25_test_protos_srcjar",
610-
"@protobuf_maven//:com_google_guava_guava",
611-
"@protobuf_maven//:junit_junit",
610+
"@protobuf_maven_dev//:com_google_guava_guava",
611+
"@protobuf_maven_dev//:junit_junit",
612612
],
613613
)
614614

@@ -641,10 +641,10 @@ junit_tests(
641641
":core",
642642
":v25_test_util_srcjar",
643643
"//compatibility:v25_test_protos_srcjar",
644-
"@protobuf_maven//:com_google_guava_guava",
645-
"@protobuf_maven//:com_google_truth_truth",
646-
"@protobuf_maven//:junit_junit",
647-
"@protobuf_maven//:org_mockito_mockito_core",
644+
"@protobuf_maven_dev//:com_google_guava_guava",
645+
"@protobuf_maven_dev//:com_google_truth_truth",
646+
"@protobuf_maven_dev//:junit_junit",
647+
"@protobuf_maven_dev//:org_mockito_mockito_core",
648648
],
649649
)
650650

@@ -658,8 +658,8 @@ protobuf_java_library(
658658
deps = [
659659
":core",
660660
"//compatibility:v25_test_protos_jar",
661-
"@protobuf_maven//:com_google_guava_guava",
662-
"@protobuf_maven//:junit_junit",
661+
"@protobuf_maven_dev//:com_google_guava_guava",
662+
"@protobuf_maven_dev//:junit_junit",
663663
],
664664
)
665665

@@ -691,10 +691,10 @@ junit_tests(
691691
":core",
692692
":v25_test_util_jar",
693693
"//compatibility:v25_test_protos_jar",
694-
"@protobuf_maven//:com_google_guava_guava",
695-
"@protobuf_maven//:com_google_truth_truth",
696-
"@protobuf_maven//:junit_junit",
697-
"@protobuf_maven//:org_mockito_mockito_core",
694+
"@protobuf_maven_dev//:com_google_guava_guava",
695+
"@protobuf_maven_dev//:com_google_truth_truth",
696+
"@protobuf_maven_dev//:junit_junit",
697+
"@protobuf_maven_dev//:org_mockito_mockito_core",
698698
],
699699
)
700700

‎java/internal/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ java_test(
1919
srcs = ["JavaVersionTest.java"],
2020
test_class = "JavaVersionTest",
2121
deps = [
22-
"@protobuf_maven//:com_google_truth_truth",
23-
"@protobuf_maven//:junit_junit",
22+
"@protobuf_maven_dev//:com_google_truth_truth",
23+
"@protobuf_maven_dev//:junit_junit",
2424
],
2525
)

‎java/kotlin-lite/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ kt_jvm_library(
115115
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
116116
"//java/kotlin:shared_runtime",
117117
"//java/lite",
118-
"@protobuf_maven//:com_google_truth_truth",
119-
"@protobuf_maven//:junit_junit",
118+
"@protobuf_maven_dev//:com_google_truth_truth",
119+
"@protobuf_maven_dev//:junit_junit",
120120
"@rules_kotlin//kotlin/compiler:kotlin-test",
121121
],
122122
)
@@ -211,8 +211,8 @@ kt_jvm_library(
211211
deps = [
212212
":kotlin_unittest_lite",
213213
"//java/core:test_util_lite",
214-
"@protobuf_maven//:com_google_truth_truth",
215-
"@protobuf_maven//:junit_junit",
214+
"@protobuf_maven_dev//:com_google_truth_truth",
215+
"@protobuf_maven_dev//:junit_junit",
216216
],
217217
)
218218

@@ -228,8 +228,8 @@ kt_jvm_library(
228228
deps = [
229229
":kotlin_proto3_unittest_lite",
230230
"//java/core:test_util_lite",
231-
"@protobuf_maven//:com_google_truth_truth",
232-
"@protobuf_maven//:junit_junit",
231+
"@protobuf_maven_dev//:com_google_truth_truth",
232+
"@protobuf_maven_dev//:junit_junit",
233233
],
234234
)
235235

‎java/kotlin/BUILD.bazel

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ kt_jvm_library(
117117
deps = [
118118
":bytestring_lib",
119119
"//java/core:lite_runtime_only",
120-
"@protobuf_maven//:com_google_truth_truth",
121-
"@protobuf_maven//:junit_junit",
120+
"@protobuf_maven_dev//:com_google_truth_truth",
121+
"@protobuf_maven_dev//:junit_junit",
122122
"@rules_kotlin//kotlin/compiler:kotlin-test",
123123
],
124124
)
@@ -152,9 +152,9 @@ kt_jvm_library(
152152
":example_extensible_message_java_proto",
153153
":only_for_use_in_proto_generated_code_its_generator_and_tests",
154154
":shared_runtime",
155-
"@protobuf_maven//:com_google_guava_guava_testlib",
156-
"@protobuf_maven//:com_google_truth_truth",
157-
"@protobuf_maven//:junit_junit",
155+
"@protobuf_maven_dev//:com_google_guava_guava_testlib",
156+
"@protobuf_maven_dev//:com_google_truth_truth",
157+
"@protobuf_maven_dev//:junit_junit",
158158
"@rules_kotlin//kotlin/compiler:kotlin-test",
159159
],
160160
)
@@ -178,8 +178,8 @@ kt_jvm_library(
178178
":only_for_use_in_proto_generated_code_its_generator_and_tests",
179179
":shared_runtime",
180180
"//java/core",
181-
"@protobuf_maven//:com_google_truth_truth",
182-
"@protobuf_maven//:junit_junit",
181+
"@protobuf_maven_dev//:com_google_truth_truth",
182+
"@protobuf_maven_dev//:junit_junit",
183183
"@rules_kotlin//kotlin/compiler:kotlin-test",
184184
],
185185
)
@@ -290,8 +290,8 @@ kt_jvm_library(
290290
deps = [
291291
":kotlin_unittest",
292292
"//java/core:test_util",
293-
"@protobuf_maven//:com_google_truth_truth",
294-
"@protobuf_maven//:junit_junit",
293+
"@protobuf_maven_dev//:com_google_truth_truth",
294+
"@protobuf_maven_dev//:junit_junit",
295295
"@rules_kotlin//kotlin/compiler:kotlin-reflect",
296296
],
297297
)
@@ -308,8 +308,8 @@ kt_jvm_library(
308308
deps = [
309309
":kotlin_proto3_unittest",
310310
"//java/core:test_util",
311-
"@protobuf_maven//:com_google_truth_truth",
312-
"@protobuf_maven//:junit_junit",
311+
"@protobuf_maven_dev//:com_google_truth_truth",
312+
"@protobuf_maven_dev//:junit_junit",
313313
],
314314
)
315315

‎java/lite/BUILD.bazel

Lines changed: 2 additions & 2 deletions
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-
"@protobuf_maven//:com_google_truth_truth",
80-
"@protobuf_maven//:junit_junit",
79+
"@protobuf_maven_dev//:com_google_truth_truth",
80+
"@protobuf_maven_dev//:junit_junit",
8181
],
8282
)
8383

‎java/osgi/BUILD.bazel

Lines changed: 3 additions & 3 deletions
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-
"@protobuf_maven//:biz_aQute_bnd_biz_aQute_bndlib",
13-
"@protobuf_maven//:com_google_guava_guava",
14-
"@protobuf_maven//:info_picocli_picocli",
12+
"@protobuf_maven_dev//:biz_aQute_bnd_biz_aQute_bndlib",
13+
"@protobuf_maven_dev//:com_google_guava_guava",
14+
"@protobuf_maven_dev//:info_picocli_picocli",
1515
],
1616
)

‎java/util/BUILD.bazel

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ java_library(
1414
visibility = ["//visibility:public"],
1515
deps = [
1616
"//java/core",
17-
"@maven//:com_google_code_findbugs_jsr305",
18-
"@maven//:com_google_code_gson_gson",
19-
"@maven//:com_google_errorprone_error_prone_annotations",
20-
"@maven//:com_google_guava_guava",
21-
"@maven//:com_google_j2objc_j2objc_annotations",
17+
"@protobuf_maven//:com_google_code_findbugs_jsr305",
18+
"@protobuf_maven//:com_google_code_gson_gson",
19+
"@protobuf_maven//:com_google_errorprone_error_prone_annotations",
20+
"@protobuf_maven//:com_google_guava_guava",
21+
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
2222
],
2323
)
2424

@@ -34,11 +34,11 @@ protobuf_versioned_java_library(
3434
visibility = ["//visibility:public"],
3535
deps = [
3636
"//java/core",
37-
"@protobuf_maven//:com_google_code_findbugs_jsr305",
38-
"@protobuf_maven//:com_google_code_gson_gson",
39-
"@protobuf_maven//:com_google_errorprone_error_prone_annotations",
40-
"@protobuf_maven//:com_google_guava_guava",
41-
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
37+
"@protobuf_maven_dev//:com_google_code_findbugs_jsr305",
38+
"@protobuf_maven_dev//:com_google_code_gson_gson",
39+
"@protobuf_maven_dev//:com_google_errorprone_error_prone_annotations",
40+
"@protobuf_maven_dev//:com_google_guava_guava",
41+
"@protobuf_maven_dev//:com_google_j2objc_j2objc_annotations",
4242
],
4343
)
4444

@@ -91,11 +91,11 @@ junit_tests(
9191
":util",
9292
"//java/core",
9393
"//java/core:generic_test_protos_java_proto",
94-
"@protobuf_maven//:com_google_code_gson_gson",
95-
"@protobuf_maven//:com_google_guava_guava",
96-
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
97-
"@protobuf_maven//:com_google_truth_truth",
98-
"@protobuf_maven//:junit_junit",
94+
"@protobuf_maven_dev//:com_google_code_gson_gson",
95+
"@protobuf_maven_dev//:com_google_guava_guava",
96+
"@protobuf_maven_dev//:com_google_j2objc_j2objc_annotations",
97+
"@protobuf_maven_dev//:com_google_truth_truth",
98+
"@protobuf_maven_dev//:junit_junit",
9999
],
100100
)
101101

0 commit comments

Comments
 (0)