From dc069471188bc36220fab790233c31c5b5f19ffe Mon Sep 17 00:00:00 2001 From: Sara Adams <4410333+saraadams@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:55:38 +0100 Subject: [PATCH] Remove transitive Maven deps (#161) `rules_jvm_external` takes care of transitive deps, so we do not need to / should state them explicitly. Signed-off-by: Sara Adams --- MODULE.bazel | 6 - MODULE.bazel.lock | 240 ++++++++++++++++---------------------- maven_install.json | 57 +++------ third_party/guava/BUILD | 5 - third_party/junit/BUILD | 1 - third_party/mockito/BUILD | 3 - 6 files changed, 116 insertions(+), 196 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f5c9510..3713153 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -22,10 +22,8 @@ maven.install( artifacts = [ "com.google.code.findbugs:jsr305:3.0.2", "com.google.code.gson:gson:2.10.1", - "com.google.errorprone:error_prone_annotations:2.23.0", "com.google.guava:failureaccess:1.0.2", "com.google.guava:guava:32.1.3-jre", - "com.google.j2objc:j2objc-annotations:2.8", "commons-cli:commons-cli:1.6.0", # For Tests @@ -33,11 +31,7 @@ maven.install( "com.google.truth:truth:1.1.5", "com.google.truth.extensions:truth-java8-extension:1.1.5", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.14.10", - "net.bytebuddy:byte-buddy:1.14.10", - "org.hamcrest:hamcrest-core:2.2", "org.mockito:mockito-core:5.7.0", - "org.objenesis:objenesis:3.3", ], # When updating versions, run `REPIN=1 bazel run @unpinned_maven//:pin` fail_if_repin_required = True, diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 2e59fba..21e5cb9 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "6d4778a56445bc125aa0080d729e663f8b30fb5cfad5173fdeb09f2961384276", + "moduleFileHash": "95269b4d2bd030b7378f9b71aa96155f5790f87843a00c2c29f003eb50cfdf5b", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -45,20 +45,14 @@ "artifacts": [ "com.google.code.findbugs:jsr305:3.0.2", "com.google.code.gson:gson:2.10.1", - "com.google.errorprone:error_prone_annotations:2.23.0", "com.google.guava:failureaccess:1.0.2", "com.google.guava:guava:32.1.3-jre", - "com.google.j2objc:j2objc-annotations:2.8", "commons-cli:commons-cli:1.6.0", "com.google.googlejavaformat:google-java-format:1.18.1", "com.google.truth:truth:1.1.5", "com.google.truth.extensions:truth-java8-extension:1.1.5", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.14.10", - "net.bytebuddy:byte-buddy:1.14.10", - "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:5.7.0", - "org.objenesis:objenesis:3.3" + "org.mockito:mockito-core:5.7.0" ], "fail_if_repin_required": true, "lock_file": "//:maven_install.json", @@ -1634,7 +1628,7 @@ "general": { "bzlTransitiveDigest": "sFLB4h0EYwq5r+zPf3smCrNkZbu/ZZQn3CXcRM/lHRw=", "accumulatedFileDigests": { - "@@//:maven_install.json": "b53fb02dec0ca835ba48753b125c9481c59162be431192336fd7ba4b6c3a5a89", + "@@//:maven_install.json": "dbc42a0711464ea2ad808fad926c6a4e5e3abdc1e5f90780acec0393464e551a", "@@rules_jvm_external~5.3//:rules_jvm_external_deps_install.json": "741ab2ef3843a43eaacb45d1448835c9deb99c95162279f513096eface8acd44" }, "envVariables": {}, @@ -1703,18 +1697,6 @@ "downloaded_file_path": "io/perfmark/perfmark-api/0.26.0/perfmark-api-0.26.0.jar" } }, - "net_bytebuddy_byte_buddy_agent_jar_sources_1_14_10": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_agent_jar_sources_1_14_10", - "sha256": "aebd1ea7ef0cf57d7ce3dfcf7ab73479c5a8158144a4d2bece6dd2587674b3ea", - "urls": [ - "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10-sources.jar" - ], - "downloaded_file_path": "net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10-sources.jar" - } - }, "io_netty_netty_codec_http2_4_1_86_Final": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1893,18 +1875,6 @@ "downloaded_file_path": "org/codehaus/mojo/animal-sniffer-annotations/1.23/animal-sniffer-annotations-1.23.jar" } }, - "com_google_errorprone_error_prone_annotations_2_23_0": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~com_google_errorprone_error_prone_annotations_2_23_0", - "sha256": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054", - "urls": [ - "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" - ], - "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" - } - }, "software_amazon_eventstream_eventstream_1_0_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1931,30 +1901,6 @@ "downloaded_file_path": "io/grpc/grpc-core/1.55.1/grpc-core-1.55.1.jar" } }, - "net_bytebuddy_byte_buddy_agent_1_14_10": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_agent_1_14_10", - "sha256": "67993a89d47ca58ff868802a4448ddd150e5fe4e5a5645ded990d7b4d557a6b9", - "urls": [ - "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.jar" - ], - "downloaded_file_path": "net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.jar" - } - }, - "org_hamcrest_hamcrest_jar_sources_2_2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_jar_sources_2_2", - "sha256": "f49e697dbc70591f91a90dd7f741f5780f53f63f34a416d6a9879499d4d666af", - "urls": [ - "https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar" - ], - "downloaded_file_path": "org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar" - } - }, "com_google_code_gson_gson_2_10_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1980,18 +1926,6 @@ "downloaded_file_path": "com/google/api/grpc/grpc-google-cloud-storage-v2/2.22.3-alpha/grpc-google-cloud-storage-v2-2.22.3-alpha.jar" } }, - "org_hamcrest_hamcrest_2_2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_2_2", - "sha256": "5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1", - "urls": [ - "https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" - ], - "downloaded_file_path": "org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" - } - }, "com_google_truth_extensions_truth_java8_extension_jar_sources_1_1_5": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -2129,20 +2063,14 @@ "artifacts": [ "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.10.1\" }", - "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.23.0\" }", "{ \"group\": \"com.google.guava\", \"artifact\": \"failureaccess\", \"version\": \"1.0.2\" }", "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"32.1.3-jre\" }", - "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"2.8\" }", "{ \"group\": \"commons-cli\", \"artifact\": \"commons-cli\", \"version\": \"1.6.0\" }", "{ \"group\": \"com.google.googlejavaformat\", \"artifact\": \"google-java-format\", \"version\": \"1.18.1\" }", "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.5\" }", "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-java8-extension\", \"version\": \"1.1.5\" }", "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", - "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.10\" }", - "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.10\" }", - "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"2.2\" }", "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"5.7.0\" }", - "{ \"group\": \"org.objenesis\", \"artifact\": \"objenesis\", \"version\": \"3.3\" }", "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }", "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }", @@ -2340,6 +2268,18 @@ "downloaded_file_path": "org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar" } }, + "com_google_errorprone_error_prone_annotations_jar_sources_2_21_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~com_google_errorprone_error_prone_annotations_jar_sources_2_21_1", + "sha256": "29012a51bb8d7d7bdd7db882f46dec8cccb36b40f34b6e5de2ec7dd647b372ca", + "urls": [ + "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1-sources.jar" + ], + "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1-sources.jar" + } + }, "io_grpc_grpc_auth_1_55_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -2392,18 +2332,6 @@ "downloaded_file_path": "com/google/cloud/google-cloud-storage/2.22.3/google-cloud-storage-2.22.3.jar" } }, - "org_hamcrest_hamcrest_core_jar_sources_2_2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_core_jar_sources_2_2", - "sha256": "35e1bf1710a410384209b4448073747454e3320afac1cc1de73e5d30b0136c7a", - "urls": [ - "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2-sources.jar" - ], - "downloaded_file_path": "org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2-sources.jar" - } - }, "org_codehaus_plexus_plexus_utils_3_5_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -2816,6 +2744,18 @@ "downloaded_file_path": "software/amazon/awssdk/aws-xml-protocol/2.20.78/aws-xml-protocol-2.20.78.jar" } }, + "com_google_errorprone_error_prone_annotations_2_21_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~com_google_errorprone_error_prone_annotations_2_21_1", + "sha256": "d1f3c66aa91ac52549e00ae3b208ba4b9af7d72d68f230643553beb38e6118ac", + "urls": [ + "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1.jar" + ], + "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1.jar" + } + }, "com_google_http_client_google_http_client_appengine_1_43_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -2829,6 +2769,18 @@ "downloaded_file_path": "com/google/http-client/google-http-client-appengine/1.43.1/google-http-client-appengine-1.43.1.jar" } }, + "net_bytebuddy_byte_buddy_jar_sources_1_14_9": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_jar_sources_1_14_9", + "sha256": "4039b20d06895bf0449161dd5f1cbbc2e81004af196d5b42c5536b91db8e0315", + "urls": [ + "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9-sources.jar" + ], + "downloaded_file_path": "net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9-sources.jar" + } + }, "maven": { "bzlFile": "@@rules_jvm_external~5.3//:coursier.bzl", "ruleClassName": "pinned_coursier_fetch", @@ -2840,20 +2792,14 @@ "artifacts": [ "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.10.1\" }", - "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.23.0\" }", "{ \"group\": \"com.google.guava\", \"artifact\": \"failureaccess\", \"version\": \"1.0.2\" }", "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"32.1.3-jre\" }", - "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"2.8\" }", "{ \"group\": \"commons-cli\", \"artifact\": \"commons-cli\", \"version\": \"1.6.0\" }", "{ \"group\": \"com.google.googlejavaformat\", \"artifact\": \"google-java-format\", \"version\": \"1.18.1\" }", "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.5\" }", "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-java8-extension\", \"version\": \"1.1.5\" }", "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", - "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.10\" }", - "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.10\" }", - "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"2.2\" }", "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"5.7.0\" }", - "{ \"group\": \"org.objenesis\", \"artifact\": \"objenesis\", \"version\": \"3.3\" }", "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }", "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }", @@ -2948,6 +2894,18 @@ "downloaded_file_path": "junit/junit/4.13.2/junit-4.13.2.jar" } }, + "org_hamcrest_hamcrest_core_jar_sources_1_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_core_jar_sources_1_3", + "sha256": "e223d2d8fbafd66057a8848cc94222d63c3cedd652cc48eddc0ab5c39c0f84df", + "urls": [ + "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar" + ], + "downloaded_file_path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar" + } + }, "com_google_truth_extensions_truth_java8_extension_1_1_5": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3049,6 +3007,18 @@ "downloaded_file_path": "com/google/googlejavaformat/google-java-format/1.18.1/google-java-format-1.18.1.jar" } }, + "org_hamcrest_hamcrest_core_1_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_core_1_3", + "sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "urls": [ + "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + ], + "downloaded_file_path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + } + }, "org_mockito_mockito_core_5_7_0": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3099,6 +3069,18 @@ "downloaded_file_path": "software/amazon/awssdk/http-client-spi/2.20.78/http-client-spi-2.20.78.jar" } }, + "net_bytebuddy_byte_buddy_agent_1_14_9": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_agent_1_14_9", + "sha256": "11ed107d4b78e55f8c3d34250494375081a29bc125a1f5c56db582ccdd48835f", + "urls": [ + "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.9/byte-buddy-agent-1.14.9.jar" + ], + "downloaded_file_path": "net/bytebuddy/byte-buddy-agent/1.14.9/byte-buddy-agent-1.14.9.jar" + } + }, "unpinned_rules_jvm_external_deps": { "bzlFile": "@@rules_jvm_external~5.3//:coursier.bzl", "ruleClassName": "coursier_fetch", @@ -3140,6 +3122,18 @@ "duplicate_version_warning": "warn" } }, + "net_bytebuddy_byte_buddy_agent_jar_sources_1_14_9": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_agent_jar_sources_1_14_9", + "sha256": "01ba24ea9e0c83e6e8a6d96d5476bd2860a26bc98994af747a6cbd7b015ca85f", + "urls": [ + "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.9/byte-buddy-agent-1.14.9-sources.jar" + ], + "downloaded_file_path": "net/bytebuddy/byte-buddy-agent/1.14.9/byte-buddy-agent-1.14.9-sources.jar" + } + }, "software_amazon_awssdk_endpoints_spi_2_20_78": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3205,6 +3199,18 @@ "downloaded_file_path": "io/netty/netty-codec/4.1.86.Final/netty-codec-4.1.86.Final.jar" } }, + "net_bytebuddy_byte_buddy_1_14_9": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_1_14_9", + "sha256": "377352e253282bf86f731ac90ed88348e8f40a63ce033c00a85982de7e790e6f", + "urls": [ + "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9.jar" + ], + "downloaded_file_path": "net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9.jar" + } + }, "com_google_truth_truth_1_1_5": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3255,18 +3261,6 @@ "downloaded_file_path": "com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre-sources.jar" } }, - "net_bytebuddy_byte_buddy_jar_sources_1_14_10": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_jar_sources_1_14_10", - "sha256": "b932ec3a175b8c01647fc6f93c3b406e3d7af118ff6496ea8c5903e66458265e", - "urls": [ - "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10-sources.jar" - ], - "downloaded_file_path": "net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10-sources.jar" - } - }, "com_google_j2objc_j2objc_annotations_2_8": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3305,30 +3299,6 @@ "downloaded_file_path": "software/amazon/awssdk/utils/2.20.78/utils-2.20.78.jar" } }, - "com_google_errorprone_error_prone_annotations_jar_sources_2_23_0": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~com_google_errorprone_error_prone_annotations_jar_sources_2_23_0", - "sha256": "5b4504609bb93d3c24b87cd839cf0bb7d878135d0a917a05081d0dc9b2a9973f", - "urls": [ - "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0-sources.jar" - ], - "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0-sources.jar" - } - }, - "net_bytebuddy_byte_buddy_1_14_10": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~net_bytebuddy_byte_buddy_1_14_10", - "sha256": "30e6e0446437a67db37e2b7f7d33f50787ddfd970359319dfd05469daa2dcbce", - "urls": [ - "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.jar" - ], - "downloaded_file_path": "net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.jar" - } - }, "com_google_api_grpc_proto_google_common_protos_2_19_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -3531,18 +3501,6 @@ "downloaded_file_path": "com/google/auto/value/auto-value-annotations/1.10.1/auto-value-annotations-1.10.1-sources.jar" } }, - "org_hamcrest_hamcrest_core_2_2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.3~maven~org_hamcrest_hamcrest_core_2_2", - "sha256": "094f5d92b4b7d9c8a2bf53cc69d356243ae89c3499457bcb4b92f7ed3bf95879", - "urls": [ - "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" - ], - "downloaded_file_path": "org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" - } - }, "com_google_api_grpc_proto_google_cloud_storage_v2_2_22_3_alpha": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", diff --git a/maven_install.json b/maven_install.json index d9c3172..b10402c 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,10 +1,10 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1840015293, - "__RESOLVED_ARTIFACTS_HASH": -605269951, + "__INPUT_ARTIFACTS_HASH": 67033011, + "__RESOLVED_ARTIFACTS_HASH": 1156281527, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1", - "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.23.0", + "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.21.1", "com.google.guava:guava:31.1-jre": "com.google.guava:guava:32.1.3-jre", "com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:2.8", "com.google.truth:truth:1.1.2": "com.google.truth:truth:1.1.5", @@ -34,10 +34,10 @@ }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054", - "sources": "5b4504609bb93d3c24b87cd839cf0bb7d878135d0a917a05081d0dc9b2a9973f" + "jar": "d1f3c66aa91ac52549e00ae3b208ba4b9af7d72d68f230643553beb38e6118ac", + "sources": "29012a51bb8d7d7bdd7db882f46dec8cccb36b40f34b6e5de2ec7dd647b372ca" }, - "version": "2.23.0" + "version": "2.21.1" }, "com.google.googlejavaformat:google-java-format": { "shasums": { @@ -111,17 +111,17 @@ }, "net.bytebuddy:byte-buddy": { "shasums": { - "jar": "30e6e0446437a67db37e2b7f7d33f50787ddfd970359319dfd05469daa2dcbce", - "sources": "b932ec3a175b8c01647fc6f93c3b406e3d7af118ff6496ea8c5903e66458265e" + "jar": "377352e253282bf86f731ac90ed88348e8f40a63ce033c00a85982de7e790e6f", + "sources": "4039b20d06895bf0449161dd5f1cbbc2e81004af196d5b42c5536b91db8e0315" }, - "version": "1.14.10" + "version": "1.14.9" }, "net.bytebuddy:byte-buddy-agent": { "shasums": { - "jar": "67993a89d47ca58ff868802a4448ddd150e5fe4e5a5645ded990d7b4d557a6b9", - "sources": "aebd1ea7ef0cf57d7ce3dfcf7ab73479c5a8158144a4d2bece6dd2587674b3ea" + "jar": "11ed107d4b78e55f8c3d34250494375081a29bc125a1f5c56db582ccdd48835f", + "sources": "01ba24ea9e0c83e6e8a6d96d5476bd2860a26bc98994af747a6cbd7b015ca85f" }, - "version": "1.14.10" + "version": "1.14.9" }, "org.checkerframework:checker-qual": { "shasums": { @@ -130,19 +130,12 @@ }, "version": "3.37.0" }, - "org.hamcrest:hamcrest": { - "shasums": { - "jar": "5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1", - "sources": "f49e697dbc70591f91a90dd7f741f5780f53f63f34a416d6a9879499d4d666af" - }, - "version": "2.2" - }, "org.hamcrest:hamcrest-core": { "shasums": { - "jar": "094f5d92b4b7d9c8a2bf53cc69d356243ae89c3499457bcb4b92f7ed3bf95879", - "sources": "35e1bf1710a410384209b4448073747454e3320afac1cc1de73e5d30b0136c7a" + "jar": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "sources": "e223d2d8fbafd66057a8848cc94222d63c3cedd652cc48eddc0ab5c39c0f84df" }, - "version": "2.2" + "version": "1.3" }, "org.mockito:mockito-core": { "shasums": { @@ -201,9 +194,6 @@ "junit:junit": [ "org.hamcrest:hamcrest-core" ], - "org.hamcrest:hamcrest-core": [ - "org.hamcrest:hamcrest" - ], "org.mockito:mockito-core": [ "net.bytebuddy:byte-buddy", "net.bytebuddy:byte-buddy-agent", @@ -404,21 +394,10 @@ "org.checkerframework.dataflow.qual", "org.checkerframework.framework.qual" ], - "org.hamcrest:hamcrest": [ + "org.hamcrest:hamcrest-core": [ "org.hamcrest", - "org.hamcrest.beans", - "org.hamcrest.collection", - "org.hamcrest.comparator", "org.hamcrest.core", - "org.hamcrest.internal", - "org.hamcrest.io", - "org.hamcrest.number", - "org.hamcrest.object", - "org.hamcrest.text", - "org.hamcrest.xml" - ], - "org.hamcrest:hamcrest-core": [ - "org.hamcrest.core.deprecated" + "org.hamcrest.internal" ], "org.mockito:mockito-core": [ "org.mockito", @@ -538,10 +517,8 @@ "net.bytebuddy:byte-buddy:jar:sources", "org.checkerframework:checker-qual", "org.checkerframework:checker-qual:jar:sources", - "org.hamcrest:hamcrest", "org.hamcrest:hamcrest-core", "org.hamcrest:hamcrest-core:jar:sources", - "org.hamcrest:hamcrest:jar:sources", "org.mockito:mockito-core", "org.mockito:mockito-core:jar:sources", "org.objenesis:objenesis", diff --git a/third_party/guava/BUILD b/third_party/guava/BUILD index 9a7ca14..d0cae28 100644 --- a/third_party/guava/BUILD +++ b/third_party/guava/BUILD @@ -2,12 +2,7 @@ java_library( name = "guava", visibility = ["//visibility:public"], exports = [ - "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_failureaccess", "@maven//:com_google_guava_guava", - "@maven//:com_google_j2objc_j2objc_annotations", - ], - runtime_deps = [ - "//third_party/jsr305", ], ) diff --git a/third_party/junit/BUILD b/third_party/junit/BUILD index e934516..eb63e32 100644 --- a/third_party/junit/BUILD +++ b/third_party/junit/BUILD @@ -4,6 +4,5 @@ java_library( visibility = ["//visibility:public"], exports = [ "@maven//:junit_junit", - "@maven//:org_hamcrest_hamcrest_core", ], ) diff --git a/third_party/mockito/BUILD b/third_party/mockito/BUILD index 612936e..44df90f 100644 --- a/third_party/mockito/BUILD +++ b/third_party/mockito/BUILD @@ -3,9 +3,6 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@maven//:net_bytebuddy_byte_buddy", - "@maven//:net_bytebuddy_byte_buddy_agent", "@maven//:org_mockito_mockito_core", - "@maven//:org_objenesis_objenesis", ], )