From 18c9d91c4fa32cddc86df18fc289e940c8dc90fd Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <krzysztof.sobolewski@starburstdata.com>
Date: Fri, 14 Jan 2022 12:11:34 +0100
Subject: [PATCH 1/2] Remove commented out Error Prone checks

These were indeed failing in IDEA at some point, but this is no longer
true (either because newer release fixed it, or because this was a
spurious effect).
---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e39787ef27d..74244e28e56d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1813,8 +1813,6 @@
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>
                                     -Xplugin:ErrorProne \
-                                    <!-- -Xep:ReferenceEquality:OFF fails in IDEA --> \
-                                    <!-- -Xep:BoxedPrimitiveEquality:OFF fails in IDEA --> \
                                     -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
                                     -Xep:BadInstanceof:ERROR \
                                     -Xep:BoxedPrimitiveConstructor:ERROR \

From f30067db0653ff2cf1bb1572c157fad393faaf1b Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <krzysztof.sobolewski@starburstdata.com>
Date: Fri, 14 Jan 2022 12:12:46 +0100
Subject: [PATCH 2/2] Move GuardedBy to an appropriate sorted position

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74244e28e56d..7db03f566d99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1813,13 +1813,13 @@
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>
                                     -Xplugin:ErrorProne \
-                                    -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
                                     -Xep:BadInstanceof:ERROR \
                                     -Xep:BoxedPrimitiveConstructor:ERROR \
                                     -Xep:ClassCanBeStatic:ERROR \
                                     -Xep:CompareToZero:ERROR \
                                     -Xep:EqualsIncompatibleType:ERROR \
                                     -Xep:FallThrough:ERROR \
+                                    -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
                                     -Xep:ImmutableSetForContains:ERROR \
                                     -Xep:InconsistentHashCode:ERROR \
                                     -Xep:InjectOnConstructorOfAbstractClass:ERROR \