Skip to content

Commit

Permalink
Rename @maven to @google_bazel_common_maven.
Browse files Browse the repository at this point in the history
Closes #198.

PiperOrigin-RevId: 686099552
  • Loading branch information
lamcw authored and Google Java Core Libraries committed Oct 15, 2024
1 parent 35d9567 commit ebce2af
Show file tree
Hide file tree
Showing 33 changed files with 83 additions and 88 deletions.
3 changes: 2 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ INCAP_VERSION = "0.2"

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
name = "google_bazel_common_maven",
artifacts = [
"javax.annotation:jsr250-api:1.0",
"com.google.code.findbugs:jsr305:3.0.1",
Expand Down Expand Up @@ -120,4 +121,4 @@ maven.install(
],
strict_visibility = True,
)
use_repo(maven, "maven")
use_repo(maven, "google_bazel_common_maven")
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ To update the version of Bazel Common, choose a new commit and update your
4. Update the `maven_install.json` file by running:

```shell
REPIN=1 bazelisk run @maven//:pin
REPIN=1 bazelisk run @google_bazel_common_maven//:pin
```

5. Send the change for review.
Expand Down
24 changes: 9 additions & 15 deletions maven_install.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -164737639,
"__RESOLVED_ARTIFACTS_HASH": 464889906,
"__INPUT_ARTIFACTS_HASH": -558447800,
"__RESOLVED_ARTIFACTS_HASH": -919793661,
"conflict_resolution": {
"com.google.auto.value:auto-value-annotations:1.10.4": "com.google.auto.value:auto-value-annotations:1.11.0",
"com.google.code.findbugs:jsr305:3.0.1": "com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
"com.google.errorprone:error_prone_annotations:2.22.0": "com.google.errorprone:error_prone_annotations:2.28.0",
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
"com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
"com.google.guava:guava-testlib:31.1-jre": "com.google.guava:guava-testlib:33.3.1-jre",
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.3.1-jre",
"com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
"com.google.protobuf:protobuf-java:3.24.4": "com.google.protobuf:protobuf-java:3.25.3",
"com.google.truth:truth:1.1.2": "com.google.truth:truth:1.4.4",
"org.apache.ant:ant-launcher:1.9.6": "org.apache.ant:ant-launcher:1.9.9",
"org.apache.ant:ant:1.9.6": "org.apache.ant:ant:1.9.9",
"org.apache.maven:maven-artifact:3.3.3": "org.apache.maven:maven-artifact:3.3.9",
Expand All @@ -23,8 +17,7 @@
"org.codehaus.plexus:plexus-utils:3.0.20": "org.codehaus.plexus:plexus-utils:3.0.22",
"org.eclipse.sisu:org.eclipse.sisu.inject:0.3.0": "org.eclipse.sisu:org.eclipse.sisu.inject:0.3.2",
"org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.0": "org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.2",
"org.mockito:mockito-core:2.28.2": "org.mockito:mockito-core:4.3.1",
"org.objenesis:objenesis:1.0": "org.objenesis:objenesis:3.2",
"org.objenesis:objenesis:1.0": "org.objenesis:objenesis:2.6",
"org.ow2.asm:asm:9.6": "org.ow2.asm:asm:9.7"
},
"artifacts": {
Expand Down Expand Up @@ -870,15 +863,15 @@
},
"org.mockito:mockito-core": {
"shasums": {
"jar": "148de2c6928365db29443ca12d35c930d9f481172b934fdd801d1cb1409ea83a"
"jar": "b0af36fed3a6c2147c0cd9028a1d814fd4f4e8196c539f2befddb61ca6ec9e27"
},
"version": "4.3.1"
"version": "2.28.2"
},
"org.objenesis:objenesis": {
"shasums": {
"jar": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3"
"jar": "5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d"
},
"version": "3.2"
"version": "2.6"
},
"org.ow2.asm:asm": {
"shasums": {
Expand Down Expand Up @@ -2805,7 +2798,6 @@
"org.mockito.internal.creation",
"org.mockito.internal.creation.bytebuddy",
"org.mockito.internal.creation.instance",
"org.mockito.internal.creation.proxy",
"org.mockito.internal.creation.settings",
"org.mockito.internal.creation.util",
"org.mockito.internal.debugging",
Expand All @@ -2819,6 +2811,7 @@
"org.mockito.internal.invocation.finder",
"org.mockito.internal.invocation.mockref",
"org.mockito.internal.junit",
"org.mockito.internal.junit.util",
"org.mockito.internal.listeners",
"org.mockito.internal.matchers",
"org.mockito.internal.matchers.apachecommons",
Expand Down Expand Up @@ -2846,6 +2839,7 @@
"org.mockito.mock",
"org.mockito.plugins",
"org.mockito.quality",
"org.mockito.runners",
"org.mockito.session",
"org.mockito.stubbing",
"org.mockito.verification"
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/apache_bcel/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "apache_bcel",
exports = ["@maven//:org_apache_bcel_bcel"],
exports = ["@google_bazel_common_maven//:org_apache_bcel_bcel"],
)
6 changes: 3 additions & 3 deletions third_party/java/asm/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "asm",
exports = ["@maven//:org_ow2_asm_asm"],
exports = ["@google_bazel_common_maven//:org_ow2_asm_asm"],
)

java_library(
name = "asm-tree",
exports = ["@maven//:org_ow2_asm_asm_tree"],
exports = ["@google_bazel_common_maven//:org_ow2_asm_asm_tree"],
)

java_library(
name = "asm-commons",
exports = ["@maven//:org_ow2_asm_asm_commons"],
exports = ["@google_bazel_common_maven//:org_ow2_asm_asm_commons"],
)
20 changes: 10 additions & 10 deletions third_party/java/auto/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "common",
exports = ["@maven//:com_google_auto_auto_common"],
exports = ["@google_bazel_common_maven//:com_google_auto_auto_common"],
)

java_plugin(
Expand All @@ -31,7 +31,7 @@ java_plugin(
":common",
":service",
"//third_party/java/guava",
"@maven//:com_google_auto_value_auto_value",
"@google_bazel_common_maven//:com_google_auto_value_auto_value",
],
)

Expand All @@ -43,7 +43,7 @@ java_plugin(
":common",
":service",
"//third_party/java/guava",
"@maven//:com_google_auto_value_auto_value",
"@google_bazel_common_maven//:com_google_auto_value_auto_value",
],
)

Expand All @@ -55,7 +55,7 @@ java_plugin(
":common",
":service",
"//third_party/java/guava",
"@maven//:com_google_auto_value_auto_value",
"@google_bazel_common_maven//:com_google_auto_value_auto_value",
],
)

Expand All @@ -69,7 +69,7 @@ java_library(
tags = ["maven:compile_only"],
exports = [
"//third_party/java/jsr250_annotations", # TODO(ronshapiro) Can this be removed?
"@maven//:com_google_auto_value_auto_value_annotations",
"@google_bazel_common_maven//:com_google_auto_value_auto_value_annotations",
],
)

Expand All @@ -84,14 +84,14 @@ java_plugin(
"//third_party/java/google_java_format",
"//third_party/java/guava",
"//third_party/java/javapoet",
"@maven//:com_google_auto_factory_auto_factory",
"@google_bazel_common_maven//:com_google_auto_factory_auto_factory",
],
)

java_library(
name = "factory",
exported_plugins = [":auto_factory_processor"],
exports = ["@maven//:com_google_auto_factory_auto_factory"],
exports = ["@google_bazel_common_maven//:com_google_auto_factory_auto_factory"],
)

java_plugin(
Expand All @@ -101,14 +101,14 @@ java_plugin(
deps = [
":common",
"//third_party/java/guava",
"@maven//:com_google_auto_service_auto_service",
"@maven//:com_google_auto_service_auto_service_annotations",
"@google_bazel_common_maven//:com_google_auto_service_auto_service",
"@google_bazel_common_maven//:com_google_auto_service_auto_service_annotations",
],
)

java_library(
name = "service",
exported_plugins = [":auto_service_processor"],
tags = ["maven:compile_only"],
exports = ["@maven//:com_google_auto_service_auto_service_annotations"],
exports = ["@google_bazel_common_maven//:com_google_auto_service_auto_service_annotations"],
)
2 changes: 1 addition & 1 deletion third_party/java/byte_buddy/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "byte_buddy",
testonly = True,
exports = ["@maven//:net_bytebuddy_byte_buddy"],
exports = ["@google_bazel_common_maven//:net_bytebuddy_byte_buddy"],
)
2 changes: 1 addition & 1 deletion third_party/java/byte_buddy_agent/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "byte_buddy_agent",
testonly = True,
exports = ["@maven//:net_bytebuddy_byte_buddy_agent"],
exports = ["@google_bazel_common_maven//:net_bytebuddy_byte_buddy_agent"],
)
6 changes: 3 additions & 3 deletions third_party/java/checker_framework/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "dataflow",
exports = ["@maven//:org_checkerframework_dataflow"],
exports = ["@google_bazel_common_maven//:org_checkerframework_dataflow"],
runtime_deps = [
"@maven//:org_checkerframework_checker_qual",
"@maven//:org_checkerframework_javacutil",
"@google_bazel_common_maven//:org_checkerframework_checker_qual",
"@google_bazel_common_maven//:org_checkerframework_javacutil",
],
)
2 changes: 1 addition & 1 deletion third_party/java/checker_framework_annotations/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "checker_framework_annotations",
exports = ["@maven//:org_checkerframework_checker_compat_qual"],
exports = ["@google_bazel_common_maven//:org_checkerframework_checker_compat_qual"],
)
2 changes: 1 addition & 1 deletion third_party/java/compile_testing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ java_library(
"jdk.compiler/com.sun.tools.javac.main",
"jdk.compiler/com.sun.tools.javac.util",
],
exports = ["@maven//:com_google_testing_compile_compile_testing"],
exports = ["@google_bazel_common_maven//:com_google_testing_compile_compile_testing"],
runtime_deps = [
"//third_party/java/auto:value",
"//third_party/java/error_prone:annotations",
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/diffutils/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "diffutils",
exports = ["@maven//:com_googlecode_java_diff_utils_diffutils"],
exports = ["@google_bazel_common_maven//:com_googlecode_java_diff_utils_diffutils"],
)
8 changes: 4 additions & 4 deletions third_party/java/error_prone/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "annotations",
tags = ["maven:compile_only"],
exports = ["@maven//:com_google_errorprone_error_prone_annotations"],
exports = ["@google_bazel_common_maven//:com_google_errorprone_error_prone_annotations"],
)

java_library(
name = "error_prone_javac",
exports = ["@maven//:com_google_errorprone_javac_shaded"],
exports = ["@google_bazel_common_maven//:com_google_errorprone_javac_shaded"],
)

java_library(
name = "check_api",
exports = [
"@maven//:com_google_errorprone_error_prone_annotation",
"@maven//:com_google_errorprone_error_prone_check_api",
"@google_bazel_common_maven//:com_google_errorprone_error_prone_annotation",
"@google_bazel_common_maven//:com_google_errorprone_error_prone_check_api",
],
runtime_deps = [
":annotations",
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/google_java_format/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "google_java_format",
exports = ["@maven//:com_google_googlejavaformat_google_java_format"],
exports = ["@google_bazel_common_maven//:com_google_googlejavaformat_google_java_format"],
runtime_deps = [
"//third_party/java/error_prone:error_prone_javac",
"//third_party/java/guava",
Expand Down
14 changes: 7 additions & 7 deletions third_party/java/grpc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,35 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "grpc",
exports = ["@maven//:io_grpc_grpc_all"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_all"],
)

java_library(
name = "api",
exports = ["@maven//:io_grpc_grpc_api"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_api"],
)

java_library(
name = "core",
exports = ["@maven//:io_grpc_grpc_core"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_core"],
)

java_library(
name = "netty",
exports = ["@maven//:io_grpc_grpc_netty"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_netty"],
)

java_library(
name = "context",
exports = [":api"], # why not @maven//:io_grpc_grpc_context?
exports = [":api"], # why not @google_bazel_common_maven//:io_grpc_grpc_context?
)

java_library(
name = "protobuf",
exports = ["@maven//:io_grpc_grpc_protobuf"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_protobuf"],
)

java_library(
name = "stub",
exports = ["@maven//:io_grpc_grpc_stub"],
exports = ["@google_bazel_common_maven//:io_grpc_grpc_stub"],
)
8 changes: 4 additions & 4 deletions third_party/java/guava/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ java_library(
name = "guava",
exported_plugins = [":beta-checker"],
exports = [
"@maven//:com_google_guava_failureaccess",
"@maven//:com_google_guava_guava",
"@google_bazel_common_maven//:com_google_guava_failureaccess",
"@google_bazel_common_maven//:com_google_guava_guava",
],
)

java_library(
name = "testlib",
testonly = True,
exports = ["@maven//:com_google_guava_guava_testlib"],
exports = ["@google_bazel_common_maven//:com_google_guava_guava_testlib"],
runtime_deps = [":guava"],
)

java_plugin(
name = "beta-checker",
visibility = ["//visibility:private"],
deps = ["@maven//:com_google_guava_guava_beta_checker"],
deps = ["@google_bazel_common_maven//:com_google_guava_guava_beta_checker"],
)
2 changes: 1 addition & 1 deletion third_party/java/hamcrest/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "hamcrest",
testonly = True,
exports = ["@maven//:org_hamcrest_hamcrest_core"],
exports = ["@google_bazel_common_maven//:org_hamcrest_hamcrest_core"],
)
6 changes: 3 additions & 3 deletions third_party/java/incap/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "incap",
exported_plugins = [":processor"],
exports = ["@maven//:net_ltgt_gradle_incap_incap"],
exports = ["@google_bazel_common_maven//:net_ltgt_gradle_incap_incap"],
)

java_plugin(
name = "processor",
processor_class = "net.ltgt.gradle.incap.processor.IncrementalAnnotationProcessorProcessor",
visibility = ["//visibility:private"],
deps = [
"@maven//:net_ltgt_gradle_incap_incap",
"@maven//:net_ltgt_gradle_incap_incap_processor",
"@google_bazel_common_maven//:net_ltgt_gradle_incap_incap",
"@google_bazel_common_maven//:net_ltgt_gradle_incap_incap_processor",
],
)
2 changes: 1 addition & 1 deletion third_party/java/inject_common/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "inject_common",
exports = ["@maven//:com_google_common_inject_inject_common"],
exports = ["@google_bazel_common_maven//:com_google_common_inject_inject_common"],
runtime_deps = [
"//third_party/java/jsr305_annotations",
"//third_party/java/jsr330_inject",
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/javapoet/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "javapoet",
exports = ["@maven//:com_squareup_javapoet"],
exports = ["@google_bazel_common_maven//:com_squareup_javapoet"],
)
Loading

0 comments on commit ebce2af

Please sign in to comment.