diff --git a/versions.lock b/versions.lock
index db3e53ae38e..dda6829c863 100644
--- a/versions.lock
+++ b/versions.lock
@@ -35,15 +35,16 @@
       "com.google.auto.value:auto-value-annotations:1.9" : "6897bc09,refs=38",
       "com.google.auto:auto-common:1.2.2" : "6897bc09,refs=38",
       "com.google.code.findbugs:jsr305:3.0.2" : "6897bc09,refs=38",
-      "com.google.errorprone:error_prone_annotation:2.33.0" : "6897bc09,refs=38",
-      "com.google.errorprone:error_prone_annotations:2.33.0" : "6897bc09,refs=38",
-      "com.google.errorprone:error_prone_check_api:2.33.0" : "6897bc09,refs=38",
-      "com.google.errorprone:error_prone_core:2.33.0" : "6897bc09,refs=38",
-      "com.google.errorprone:error_prone_type_annotations:2.33.0" : "6897bc09,refs=38",
+      "com.google.errorprone:error_prone_annotation:2.36.0" : "6897bc09,refs=38",
+      "com.google.errorprone:error_prone_annotations:2.36.0" : "6897bc09,refs=38",
+      "com.google.errorprone:error_prone_check_api:2.36.0" : "6897bc09,refs=38",
+      "com.google.errorprone:error_prone_core:2.36.0" : "6897bc09,refs=38",
+      "com.google.errorprone:error_prone_type_annotations:2.36.0" : "6897bc09,refs=38",
+      "com.google.googlejavaformat:google-java-format:1.19.1" : "6897bc09,refs=38",
       "com.google.guava:failureaccess:1.0.1" : "6897bc09,refs=38",
-      "com.google.guava:guava:32.1.1-jre" : "6897bc09,refs=38",
-      "com.google.guava:guava-parent:32.1.1-jre" : "6897bc09,refs=38",
-      "com.google.protobuf:protobuf-java:4.28.2" : "6897bc09,refs=38",
+      "com.google.guava:guava:32.1.3-jre" : "6897bc09,refs=38",
+      "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" : "6897bc09,refs=38",
+      "com.google.protobuf:protobuf-java:3.25.5" : "6897bc09,refs=38",
       "com.ibm.icu:icu4j:74.2" : "ffa00415,refs=8",
       "commons-codec:commons-codec:1.17.2" : "733734f0,refs=6",
       "io.github.eisop:dataflow-errorprone:3.41.0-eisop1" : "6897bc09,refs=38",
@@ -61,7 +62,7 @@
       "org.carrot2:morfologik-fsa:2.1.9" : "e077a675,refs=8",
       "org.carrot2:morfologik-polish:2.1.9" : "cb00cecf,refs=5",
       "org.carrot2:morfologik-stemming:2.1.9" : "e077a675,refs=8",
-      "org.checkerframework:checker-qual:3.33.0" : "6897bc09,refs=38",
+      "org.checkerframework:checker-qual:3.37.0" : "6897bc09,refs=38",
       "org.hamcrest:hamcrest:2.2" : "b35e5d7a,refs=74",
       "org.jspecify:jspecify:1.0.0" : "6897bc09,refs=38",
       "org.locationtech.jts:jts-core:1.17.0" : "180518e6,refs=2",
diff --git a/versions.toml b/versions.toml
index f14585e573a..772d7d9ab52 100644
--- a/versions.toml
+++ b/versions.toml
@@ -5,7 +5,7 @@ assertj = "3.21.0"
 commons-codec = "1.17.2"
 commons-compress = "1.19"
 ecj = "3.36.0"
-errorprone = "2.33.0"
+errorprone = "2.36.0"
 flexmark = "0.61.24"
 # @keep This is GJF version for spotless/ tidy.
 googleJavaFormat = "1.23.0"
@@ -75,7 +75,7 @@ zstd = { module = "com.github.luben:zstd-jni", version.ref = "zstd" }
 [plugins]
 benmanes-versions = "com.github.ben-manes.versions:0.51.0"
 dependencychecks = "com.carrotsearch.gradle.dependencychecks:0.0.9"
-errorprone = "net.ltgt.errorprone:3.1.0"
+errorprone = "net.ltgt.errorprone:4.1.0"
 forbiddenapis = "de.thetaphi.forbiddenapis:3.8"
 jacocolog = "org.barfuin.gradle.jacocolog:3.1.0"
 owasp-dependencycheck = "org.owasp.dependencycheck:7.2.0"