From 454f0cccaa22e3c4958e25b76cbd25a677294cc1 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 12 Oct 2021 15:37:40 -0700
Subject: [PATCH] Add jsr305 dependency for Bazel

---
 WORKSPACE          |  9 ++++++++-
 java/util/BUILD    |  1 +
 maven_install.json | 22 +++-------------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 2174cabf8c..cc2120ec93 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,13 +38,15 @@ bind(
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 maven_install(
     artifacts = [
+        "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.8.6",
         "com.google.errorprone:error_prone_annotations:2.3.2",
-        "com.google.j2objc:j2obj_annotations:1.3",
+        "com.google.j2objc:j2objc-annotations:1.3",
         "com.google.guava:guava:30.1.1-jre",
         "com.google.truth:truth:1.1.2",
         "junit:junit:4.12",
         "org.easymock:easymock:3.2",
+
     ],
     repositories = [
         "https://repo1.maven.org/maven2",
@@ -78,6 +80,11 @@ bind(
     actual = "@maven//:com_google_j2objc_j2objc_annotations",
 )
 
+bind(
+    name = "jsr305",
+    actual = "@maven//:com_google_code_findbugs_jsr305",
+)
+
 bind(
     name = "junit",
     actual = "@maven//:junit_junit",
diff --git a/java/util/BUILD b/java/util/BUILD
index 02e5549689..3855da96f0 100644
--- a/java/util/BUILD
+++ b/java/util/BUILD
@@ -14,6 +14,7 @@ java_library(
         "//external:error_prone_annotations",
         "//external:j2objc_annotations",
         "//external:gson",
+        "//external:jsr305",
         "//external:guava",
         "//java/core",
         "//java/lite",
diff --git a/maven_install.json b/maven_install.json
index f9342185c4..6168aa4af2 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,6 +1,8 @@
 {
     "dependency_tree": {
-        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1033791982,
+        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
+        "__INPUT_ARTIFACTS_HASH": 1907885757,
+        "__RESOLVED_ARTIFACTS_HASH": 375457873,
         "conflict_resolution": {
             "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.5.1",
             "junit:junit:4.12": "junit:junit:4.13.1"
@@ -201,24 +203,6 @@
                 "sha256": "b3dd1cf5019f942d8cc2afad0aa6aef4b21532446fe90a6b68d567e3389763dd",
                 "url": "https://repo1.maven.org/maven2/org/easymock/easymock/3.2/easymock-3.2.jar"
             },
-            {
-                "coord": "org.easymock:easymockclassextension:3.2",
-                "dependencies": [
-                    "org.easymock:easymock:3.2",
-                    "cglib:cglib-nodep:2.2.2",
-                    "org.objenesis:objenesis:1.3"
-                ],
-                "directDependencies": [
-                    "org.easymock:easymock:3.2"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar",
-                    "https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar"
-                ],
-                "sha256": "e2aeb3ecec87d859b2f3072985d4b15873558bcf6410f422db0c0c5194c76c87",
-                "url": "https://repo1.maven.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar"
-            },
             {
                 "coord": "org.hamcrest:hamcrest-core:1.3",
                 "dependencies": [],