From ebce2af3f0de560b649dcf98ef732a56b80e829c Mon Sep 17 00:00:00 2001 From: Thomas Lam Date: Tue, 15 Oct 2024 07:37:05 -0700 Subject: [PATCH] Rename `@maven` to `@google_bazel_common_maven`. Closes #198. PiperOrigin-RevId: 686099552 --- MODULE.bazel | 3 ++- README.md | 2 +- maven_install.json | 24 +++++++------------ third_party/java/apache_bcel/BUILD | 2 +- third_party/java/asm/BUILD | 6 ++--- third_party/java/auto/BUILD | 20 ++++++++-------- third_party/java/byte_buddy/BUILD | 2 +- third_party/java/byte_buddy_agent/BUILD | 2 +- third_party/java/checker_framework/BUILD | 6 ++--- .../java/checker_framework_annotations/BUILD | 2 +- third_party/java/compile_testing/BUILD | 2 +- third_party/java/diffutils/BUILD | 2 +- third_party/java/error_prone/BUILD | 8 +++---- third_party/java/google_java_format/BUILD | 2 +- third_party/java/grpc/BUILD | 14 +++++------ third_party/java/guava/BUILD | 8 +++---- third_party/java/hamcrest/BUILD | 2 +- third_party/java/incap/BUILD | 6 ++--- third_party/java/inject_common/BUILD | 2 +- third_party/java/javapoet/BUILD | 2 +- third_party/java/jspecify_annotations/BUILD | 2 +- third_party/java/jsr250_annotations/BUILD | 2 +- third_party/java/jsr305_annotations/BUILD | 2 +- third_party/java/jsr330_inject/BUILD | 4 ++-- third_party/java/junit/BUILD | 2 +- third_party/java/log4j/BUILD | 2 +- third_party/java/log4j2/BUILD | 4 ++-- third_party/java/mockito/BUILD | 2 +- third_party/java/objenesis/BUILD | 2 +- third_party/java/protobuf/BUILD | 2 +- third_party/java/slf4j_api/BUILD | 2 +- third_party/java/truth/BUILD | 4 ++-- tools/jarjar/BUILD | 24 +++++++++---------- 33 files changed, 83 insertions(+), 88 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4bc72f0..d59f31d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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", @@ -120,4 +121,4 @@ maven.install( ], strict_visibility = True, ) -use_repo(maven, "maven") +use_repo(maven, "google_bazel_common_maven") diff --git a/README.md b/README.md index ae963d0..cfdebb8 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/maven_install.json b/maven_install.json index c4b14cf..c7cad66 100644 --- a/maven_install.json +++ b/maven_install.json @@ -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", @@ -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": { @@ -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": { @@ -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", @@ -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", @@ -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" diff --git a/third_party/java/apache_bcel/BUILD b/third_party/java/apache_bcel/BUILD index 7e03589..512b391 100644 --- a/third_party/java/apache_bcel/BUILD +++ b/third_party/java/apache_bcel/BUILD @@ -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"], ) diff --git a/third_party/java/asm/BUILD b/third_party/java/asm/BUILD index b25af53..b1f817c 100644 --- a/third_party/java/asm/BUILD +++ b/third_party/java/asm/BUILD @@ -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"], ) diff --git a/third_party/java/auto/BUILD b/third_party/java/auto/BUILD index b851d50..613f2ed 100644 --- a/third_party/java/auto/BUILD +++ b/third_party/java/auto/BUILD @@ -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( @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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( @@ -101,8 +101,8 @@ 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", ], ) @@ -110,5 +110,5 @@ 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"], ) diff --git a/third_party/java/byte_buddy/BUILD b/third_party/java/byte_buddy/BUILD index 4b9bdea..de85491 100644 --- a/third_party/java/byte_buddy/BUILD +++ b/third_party/java/byte_buddy/BUILD @@ -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"], ) diff --git a/third_party/java/byte_buddy_agent/BUILD b/third_party/java/byte_buddy_agent/BUILD index bd372d6..ce6c148 100644 --- a/third_party/java/byte_buddy_agent/BUILD +++ b/third_party/java/byte_buddy_agent/BUILD @@ -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"], ) diff --git a/third_party/java/checker_framework/BUILD b/third_party/java/checker_framework/BUILD index 586305c..a222c60 100644 --- a/third_party/java/checker_framework/BUILD +++ b/third_party/java/checker_framework/BUILD @@ -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", ], ) diff --git a/third_party/java/checker_framework_annotations/BUILD b/third_party/java/checker_framework_annotations/BUILD index 777db46..0d5957c 100644 --- a/third_party/java/checker_framework_annotations/BUILD +++ b/third_party/java/checker_framework_annotations/BUILD @@ -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"], ) diff --git a/third_party/java/compile_testing/BUILD b/third_party/java/compile_testing/BUILD index e1aea61..e4fedba 100644 --- a/third_party/java/compile_testing/BUILD +++ b/third_party/java/compile_testing/BUILD @@ -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", diff --git a/third_party/java/diffutils/BUILD b/third_party/java/diffutils/BUILD index e2624a6..37760d1 100644 --- a/third_party/java/diffutils/BUILD +++ b/third_party/java/diffutils/BUILD @@ -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"], ) diff --git a/third_party/java/error_prone/BUILD b/third_party/java/error_prone/BUILD index 60d06ed..6b4bf96 100644 --- a/third_party/java/error_prone/BUILD +++ b/third_party/java/error_prone/BUILD @@ -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", diff --git a/third_party/java/google_java_format/BUILD b/third_party/java/google_java_format/BUILD index 6f4d978..8662c1f 100644 --- a/third_party/java/google_java_format/BUILD +++ b/third_party/java/google_java_format/BUILD @@ -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", diff --git a/third_party/java/grpc/BUILD b/third_party/java/grpc/BUILD index aeb01ff..1e5c91f 100644 --- a/third_party/java/grpc/BUILD +++ b/third_party/java/grpc/BUILD @@ -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"], ) diff --git a/third_party/java/guava/BUILD b/third_party/java/guava/BUILD index a294218..c0ea1a5 100644 --- a/third_party/java/guava/BUILD +++ b/third_party/java/guava/BUILD @@ -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"], ) diff --git a/third_party/java/hamcrest/BUILD b/third_party/java/hamcrest/BUILD index ccc2f9c..a78fbd5 100644 --- a/third_party/java/hamcrest/BUILD +++ b/third_party/java/hamcrest/BUILD @@ -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"], ) diff --git a/third_party/java/incap/BUILD b/third_party/java/incap/BUILD index ccb4966..5dbf904 100644 --- a/third_party/java/incap/BUILD +++ b/third_party/java/incap/BUILD @@ -21,7 +21,7 @@ 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( @@ -29,7 +29,7 @@ java_plugin( 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", ], ) diff --git a/third_party/java/inject_common/BUILD b/third_party/java/inject_common/BUILD index 31e1857..7895dc7 100644 --- a/third_party/java/inject_common/BUILD +++ b/third_party/java/inject_common/BUILD @@ -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", diff --git a/third_party/java/javapoet/BUILD b/third_party/java/javapoet/BUILD index e6ae2ae..81402aa 100644 --- a/third_party/java/javapoet/BUILD +++ b/third_party/java/javapoet/BUILD @@ -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"], ) diff --git a/third_party/java/jspecify_annotations/BUILD b/third_party/java/jspecify_annotations/BUILD index efb6062..46d1331 100644 --- a/third_party/java/jspecify_annotations/BUILD +++ b/third_party/java/jspecify_annotations/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "jspecify_annotations", - exports = ["@maven//:org_jspecify_jspecify"], + exports = ["@google_bazel_common_maven//:org_jspecify_jspecify"], ) diff --git a/third_party/java/jsr250_annotations/BUILD b/third_party/java/jsr250_annotations/BUILD index f8e0ccd..cba5726 100644 --- a/third_party/java/jsr250_annotations/BUILD +++ b/third_party/java/jsr250_annotations/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "jsr250_annotations", - exports = ["@maven//:javax_annotation_jsr250_api"], + exports = ["@google_bazel_common_maven//:javax_annotation_jsr250_api"], ) diff --git a/third_party/java/jsr305_annotations/BUILD b/third_party/java/jsr305_annotations/BUILD index 5b8c6fa..53475ef 100644 --- a/third_party/java/jsr305_annotations/BUILD +++ b/third_party/java/jsr305_annotations/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "jsr305_annotations", - exports = ["@maven//:com_google_code_findbugs_jsr305"], + exports = ["@google_bazel_common_maven//:com_google_code_findbugs_jsr305"], ) diff --git a/third_party/java/jsr330_inject/BUILD b/third_party/java/jsr330_inject/BUILD index 9c4df82..66f752b 100644 --- a/third_party/java/jsr330_inject/BUILD +++ b/third_party/java/jsr330_inject/BUILD @@ -20,10 +20,10 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "jsr330_inject", - exports = ["@maven//:javax_inject_javax_inject"], + exports = ["@google_bazel_common_maven//:javax_inject_javax_inject"], ) java_library( name = "tck", - exports = ["@maven//:javax_inject_javax_inject_tck"], + exports = ["@google_bazel_common_maven//:javax_inject_javax_inject_tck"], ) diff --git a/third_party/java/junit/BUILD b/third_party/java/junit/BUILD index c1b3ec9..24a3340 100644 --- a/third_party/java/junit/BUILD +++ b/third_party/java/junit/BUILD @@ -21,6 +21,6 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "junit", testonly = True, - exports = ["@maven//:junit_junit"], + exports = ["@google_bazel_common_maven//:junit_junit"], runtime_deps = ["//third_party/java/hamcrest"], ) diff --git a/third_party/java/log4j/BUILD b/third_party/java/log4j/BUILD index 8a114ae..c108fe5 100644 --- a/third_party/java/log4j/BUILD +++ b/third_party/java/log4j/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "log4j", - exports = ["@maven//:log4j_log4j"], + exports = ["@google_bazel_common_maven//:log4j_log4j"], ) diff --git a/third_party/java/log4j2/BUILD b/third_party/java/log4j2/BUILD index 00b165a..163cef0 100644 --- a/third_party/java/log4j2/BUILD +++ b/third_party/java/log4j2/BUILD @@ -21,7 +21,7 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "log4j2", exports = [ - "@maven//:org_apache_logging_log4j_log4j_api", - "@maven//:org_apache_logging_log4j_log4j_core", + "@google_bazel_common_maven//:org_apache_logging_log4j_log4j_api", + "@google_bazel_common_maven//:org_apache_logging_log4j_log4j_core", ], ) diff --git a/third_party/java/mockito/BUILD b/third_party/java/mockito/BUILD index 86ea937..cf390cf 100644 --- a/third_party/java/mockito/BUILD +++ b/third_party/java/mockito/BUILD @@ -21,7 +21,7 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "mockito", testonly = True, - exports = ["@maven//:org_mockito_mockito_core"], + exports = ["@google_bazel_common_maven//:org_mockito_mockito_core"], runtime_deps = [ "//third_party/java/byte_buddy", "//third_party/java/byte_buddy_agent", diff --git a/third_party/java/objenesis/BUILD b/third_party/java/objenesis/BUILD index 679bcaa..400e58a 100644 --- a/third_party/java/objenesis/BUILD +++ b/third_party/java/objenesis/BUILD @@ -21,5 +21,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "objenesis", testonly = True, - exports = ["@maven//:org_objenesis_objenesis"], + exports = ["@google_bazel_common_maven//:org_objenesis_objenesis"], ) diff --git a/third_party/java/protobuf/BUILD b/third_party/java/protobuf/BUILD index 326e35d..b4195a7 100644 --- a/third_party/java/protobuf/BUILD +++ b/third_party/java/protobuf/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "protobuf", - exports = ["@maven//:com_google_protobuf_protobuf_java"], + exports = ["@google_bazel_common_maven//:com_google_protobuf_protobuf_java"], ) diff --git a/third_party/java/slf4j_api/BUILD b/third_party/java/slf4j_api/BUILD index 79b33d5..4f5af5a 100644 --- a/third_party/java/slf4j_api/BUILD +++ b/third_party/java/slf4j_api/BUILD @@ -20,5 +20,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "slf4j_api", - exports = ["@maven//:org_slf4j_slf4j_api"], + exports = ["@google_bazel_common_maven//:org_slf4j_slf4j_api"], ) diff --git a/third_party/java/truth/BUILD b/third_party/java/truth/BUILD index 6a8fcd1..803e1e8 100644 --- a/third_party/java/truth/BUILD +++ b/third_party/java/truth/BUILD @@ -22,8 +22,8 @@ java_library( name = "truth", testonly = True, exports = [ - "@maven//:com_google_truth_extensions_truth_java8_extension", - "@maven//:com_google_truth_truth", + "@google_bazel_common_maven//:com_google_truth_extensions_truth_java8_extension", + "@google_bazel_common_maven//:com_google_truth_truth", ], # TODO(cpovirk): This would make more sense in deps, but Bazel won't allow # that unless we add dummy srcs. diff --git a/tools/jarjar/BUILD b/tools/jarjar/BUILD index 18f2d46..e6a4be6 100644 --- a/tools/jarjar/BUILD +++ b/tools/jarjar/BUILD @@ -27,18 +27,18 @@ java_binary( "//third_party/java/asm:asm-tree", "//third_party/java/jsr250_annotations", "//third_party/java/jsr330_inject", - "@maven//:javax_enterprise_cdi_api", - "@maven//:org_apache_ant_ant", - "@maven//:org_apache_ant_ant_launcher", - "@maven//:org_apache_maven_maven_artifact", - "@maven//:org_apache_maven_maven_model", - "@maven//:org_apache_maven_maven_plugin_api", - "@maven//:org_codehaus_plexus_plexus_classworlds", - "@maven//:org_codehaus_plexus_plexus_component_annotations", - "@maven//:org_codehaus_plexus_plexus_utils", - "@maven//:org_eclipse_sisu_org_eclipse_sisu_inject", - "@maven//:org_eclipse_sisu_org_eclipse_sisu_plexus", - "@maven//:org_pantsbuild_jarjar", + "@google_bazel_common_maven//:javax_enterprise_cdi_api", + "@google_bazel_common_maven//:org_apache_ant_ant", + "@google_bazel_common_maven//:org_apache_ant_ant_launcher", + "@google_bazel_common_maven//:org_apache_maven_maven_artifact", + "@google_bazel_common_maven//:org_apache_maven_maven_model", + "@google_bazel_common_maven//:org_apache_maven_maven_plugin_api", + "@google_bazel_common_maven//:org_codehaus_plexus_plexus_classworlds", + "@google_bazel_common_maven//:org_codehaus_plexus_plexus_component_annotations", + "@google_bazel_common_maven//:org_codehaus_plexus_plexus_utils", + "@google_bazel_common_maven//:org_eclipse_sisu_org_eclipse_sisu_inject", + "@google_bazel_common_maven//:org_eclipse_sisu_org_eclipse_sisu_plexus", + "@google_bazel_common_maven//:org_pantsbuild_jarjar", ], )