From 435685e02f4eb3ec45dd02fc45ffdaced0b94b6c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@engflow.com>
Date: Tue, 7 Jan 2025 17:07:47 -0800
Subject: [PATCH] Upgrade errorprone to 2.36.0.

Closes #20797.

PiperOrigin-RevId: 713089762
Change-Id: I933545dcfd98499e0d1daa1b3467dd7b956be362
---
 MODULE.bazel       | 10 ++++-----
 maven_install.json | 56 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 057a76b5224ffb..35a21bbadcaca1 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -108,11 +108,11 @@ maven.install(
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.10.1",
         "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
-        "com.google.errorprone:error_prone_annotation:2.32.0",
-        "com.google.errorprone:error_prone_annotations:2.32.0",
-        "com.google.errorprone:error_prone_check_api:2.32.0",
-        "com.google.errorprone:error_prone_core:2.32.0",
-        "com.google.errorprone:error_prone_type_annotations:2.32.0",
+        "com.google.errorprone:error_prone_annotation:2.36.0",
+        "com.google.errorprone:error_prone_annotations:2.36.0",
+        "com.google.errorprone:error_prone_check_api:2.36.0",
+        "com.google.errorprone:error_prone_core:2.36.0",
+        "com.google.errorprone:error_prone_type_annotations:2.36.0",
         "com.google.flogger:flogger:0.5.1",
         "com.google.flogger:flogger-system-backend:0.5.1",
         "com.google.flogger:google-extensions:0.5.1",
diff --git a/maven_install.json b/maven_install.json
index 8cbf84df1a7a1e..beb455ddd0f2a0 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -1894968954,
-  "__RESOLVED_ARTIFACTS_HASH": 1572252411,
+  "__INPUT_ARTIFACTS_HASH": -44489190,
+  "__RESOLVED_ARTIFACTS_HASH": 1526283480,
   "conflict_resolution": {
     "com.google.api.grpc:proto-google-common-protos:2.29.0": "com.google.api.grpc:proto-google-common-protos:2.41.0",
     "com.google.auth:google-auth-library-credentials:1.6.0": "com.google.auth:google-auth-library-credentials:1.23.0",
@@ -9,9 +9,8 @@
     "com.google.auto:auto-common:1.2.1": "com.google.auto:auto-common:1.2.2",
     "com.google.code.gson:gson:2.10.1": "com.google.code.gson:gson:2.11.0",
     "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
-    "com.google.errorprone:error_prone_annotations:2.28.0": "com.google.errorprone:error_prone_annotations:2.34.0",
-    "com.google.errorprone:error_prone_annotations:2.32.0": "com.google.errorprone:error_prone_annotations:2.34.0",
-    "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.34.0",
+    "com.google.errorprone:error_prone_annotations:2.28.0": "com.google.errorprone:error_prone_annotations:2.36.0",
+    "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.36.0",
     "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
     "com.google.guava:guava-testlib:32.0.1-jre": "com.google.guava:guava-testlib:33.2.1-jre",
     "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.2.1-jre",
@@ -208,33 +207,33 @@
     },
     "com.google.errorprone:error_prone_annotation": {
       "shasums": {
-        "jar": "500bb016357244c29a827ca23fb100aef24fadd8f1a1ea9ea5514cb59b333a33"
+        "jar": "3702887ce0fa4d0b4cd7c5545138919b101002a883be861f2c6f30ca5562635f"
       },
-      "version": "2.32.0"
+      "version": "2.36.0"
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "2a799487cfdcd248cb65f40c5ae5183389e1a3876735ed84c6ca3f2080de49e5"
+        "jar": "77440e270b0bc9a249903c5a076c36a722c4886ca4f42675f2903a1c53ed61a5"
       },
-      "version": "2.34.0"
+      "version": "2.36.0"
     },
     "com.google.errorprone:error_prone_check_api": {
       "shasums": {
-        "jar": "62062fc689db3bea677d7b49f022b553e243f5549db3f5a836326df2d3b28458"
+        "jar": "80dc394440aed46854120ba42be0ab505b940d9f32b77baa8fc5790636f8f8f6"
       },
-      "version": "2.32.0"
+      "version": "2.36.0"
     },
     "com.google.errorprone:error_prone_core": {
       "shasums": {
-        "jar": "c11a3ae19c3ddfb74d4525ff77c2a30a3e1c615ee39aff044b89f38f7d4eba8c"
+        "jar": "8cc1b8c5ca4ab484e828a2a763a0bd8e7a43a29fd4f0233edd15bc4cfd07ae39"
       },
-      "version": "2.32.0"
+      "version": "2.36.0"
     },
     "com.google.errorprone:error_prone_type_annotations": {
       "shasums": {
-        "jar": "452125d4881a01400ba4a33b45c3d80fac0577afae2f6a474675b62d46958326"
+        "jar": "dc15687f4afebb73ed263771ed42b15cd9cf4f9aee15f9c997afc2e8e009087d"
       },
-      "version": "2.32.0"
+      "version": "2.36.0"
     },
     "com.google.flogger:flogger": {
       "shasums": {
@@ -254,6 +253,12 @@
       },
       "version": "0.5.1"
     },
+    "com.google.googlejavaformat:google-java-format": {
+      "shasums": {
+        "jar": "ff15abac529f6ecb97878aa2ae271a4d3b15f526c1f823757dd8781c0b11c73b"
+      },
+      "version": "1.19.1"
+    },
     "com.google.guava:failureaccess": {
       "shasums": {
         "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
@@ -1163,6 +1168,7 @@
       "com.google.errorprone:error_prone_annotations",
       "com.google.errorprone:error_prone_check_api",
       "com.google.errorprone:error_prone_type_annotations",
+      "com.google.googlejavaformat:google-java-format",
       "com.google.guava:guava",
       "com.google.protobuf:protobuf-java",
       "io.github.eisop:dataflow-errorprone",
@@ -1180,6 +1186,9 @@
     "com.google.flogger:google-extensions": [
       "com.google.flogger:flogger"
     ],
+    "com.google.googlejavaformat:google-java-format": [
+      "com.google.guava:guava"
+    ],
     "com.google.guava:guava": [
       "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
@@ -2072,6 +2081,14 @@
     "com.google.flogger:google-extensions": [
       "com.google.common.flogger"
     ],
+    "com.google.googlejavaformat:google-java-format": [
+      "com.google.googlejavaformat",
+      "com.google.googlejavaformat.java",
+      "com.google.googlejavaformat.java.filer",
+      "com.google.googlejavaformat.java.java17",
+      "com.google.googlejavaformat.java.java21",
+      "com.google.googlejavaformat.java.javadoc"
+    ],
     "com.google.guava:failureaccess": [
       "com.google.common.util.concurrent.internal"
     ],
@@ -3462,6 +3479,7 @@
       "com.google.flogger:flogger",
       "com.google.flogger:flogger-system-backend",
       "com.google.flogger:google-extensions",
+      "com.google.googlejavaformat:google-java-format",
       "com.google.guava:failureaccess",
       "com.google.guava:guava",
       "com.google.guava:guava-testlib",
@@ -3632,6 +3650,14 @@
         "com.google.errorprone.ErrorProneJavacPlugin"
       ]
     },
+    "com.google.googlejavaformat:google-java-format": {
+      "java.util.spi.ToolProvider": [
+        "com.google.googlejavaformat.java.GoogleJavaFormatToolProvider"
+      ],
+      "javax.tools.Tool": [
+        "com.google.googlejavaformat.java.GoogleJavaFormatTool"
+      ]
+    },
     "com.google.jimfs:jimfs": {
       "java.nio.file.spi.FileSystemProvider": [
         "com.google.common.jimfs.SystemJimfsFileSystemProvider"