From 4f33aa8515244aeddff3e7df22aeaea28932ca31 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 14 Jan 2023 14:39:23 -0500
Subject: [PATCH] Upgrade to errorprone 2.18 (#12086)

---
 gradle/validation/error-prone.gradle | 5 ++++-
 versions.props                       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index 6eb852114f7..4c9a68f9924 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -318,7 +318,7 @@ allprojects { prj ->
             // '-Xep:ExtendingJUnitAssert:OFF', // noisy
             // '-Xep:ExtendsObject:OFF', // TODO: there are problems
             // '-Xep:FallThrough:OFF', // TODO: there are problems
-            // '-Xep:Finalize:OFF', // we use forbidden-apis for this (jdk-deprecated method)
+            '-Xep:Finalize:WARN', // catches actual finalizers that don't call super
             // '-Xep:Finally:OFF', // TODO: there are problems
             '-Xep:FloatCast:WARN',
             '-Xep:FloatingPointAssertionWithinEpsilon:WARN',
@@ -339,6 +339,7 @@ allprojects { prj ->
             '-Xep:IncorrectMainMethod:WARN',
             '-Xep:IncrementInForLoopAndHeader:WARN',
             '-Xep:InheritDoc:WARN',
+            // '-Xep:InjectOnBugCheckers:OFF', // we don't use this annotation
             // '-Xep:InjectInvalidTargetingOnScopingAnnotation:OFF', // we don't use this annotation
             // '-Xep:InjectOnConstructorOfAbstractClass:OFF', // we don't use this annotation
             // '-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass:OFF', // we don't use this annotation
@@ -379,6 +380,7 @@ allprojects { prj ->
             // '-Xep:JodaPlusMinusLong:OFF', // we don't use joda-time
             // '-Xep:JodaTimeConverterManager:OFF', // we don't use joda-time
             // '-Xep:JodaWithDurationAddedLong:OFF', // we don't use joda-time
+            // '-Xep:LabelledBreakTarget:OFF', // stylistic
             // '-Xep:LiteEnumValueOf:OFF', // we don't use protobuf
             // '-Xep:LiteProtoToString:OFF', // we don't use protobuf
             // '-Xep:LockNotBeforeTry:OFF', // TODO: there are problems
@@ -481,6 +483,7 @@ allprojects { prj ->
             // '-Xep:UnsafeFinalization:OFF', // we don't use finalizers, deprecated for removal, fails build
             '-Xep:UnsafeReflectiveConstructionCast:WARN',
             // '-Xep:UnsynchronizedOverridesSynchronized:OFF', // TODO: there are problems
+            // '-Xep:UnusedLabel:OFF', // TODO: there are problems
             // '-Xep:UnusedMethod:OFF', // TODO: there are problems
             '-Xep:UnusedNestedClass:WARN',
             // '-Xep:UnusedTypeParameter:OFF', // TODO: there are problems
diff --git a/versions.props b/versions.props
index 86597c6e192..50d19169931 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
 com.carrotsearch.randomizedtesting:*=2.8.1
 com.carrotsearch:hppc=0.9.1
 com.carrotsearch:procfork=1.0.6
-com.google.errorprone:*=2.17.0
+com.google.errorprone:*=2.18.0
 com.ibm.icu:icu4j=70.1
 commons-codec:commons-codec=1.13
 io.sgr:s2-geometry-library-java=1.0.0