From 1d84575343af9fde797da93f51dd496d1cc5f81b Mon Sep 17 00:00:00 2001
From: Picnic-DevPla-Bot <devpla+bot@teampicnic.com>
Date: Wed, 2 Oct 2024 01:07:31 +0000
Subject: [PATCH 1/4] Upgrade Error Prone 2.32.0 -> 2.33.0

See:
- https://github.com/google/error-prone/releases/tag/v2.33.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b4dc5b9dd..cdaeebb9ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,7 +208,7 @@
         <version.auto-value>1.11.0</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
         <version.error-prone-fork>v${version.error-prone-orig}-picnic-1</version.error-prone-fork>
-        <version.error-prone-orig>2.32.0</version.error-prone-orig>
+        <version.error-prone-orig>2.33.0</version.error-prone-orig>
         <version.error-prone-slf4j>0.1.28</version.error-prone-slf4j>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>
         <version.jdk>17</version.jdk>

From 832ba72623eb935b7f4061bf2c46d624082c2897 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Tue, 1 Oct 2024 07:55:00 +0200
Subject: [PATCH 2/4] Disable `MemberName` check

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index cdaeebb9ee..2dd9bb1232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1938,6 +1938,11 @@
                                     -Xep:Java7ApiChecker:OFF
                                     <!-- We don't target JDK 8. -->
                                     -Xep:Java8ApiChecker:OFF
+                                    <!-- This check also flags perfectly fine
+                                    type names. -->
+                                    <!-- XXX: File issue upstream, suggesting
+                                    that the check be split in two. -->
+                                    -Xep:MemberName:OFF
                                     <!-- We don't target Android. -->
                                     -Xep:StaticOrDefaultInterfaceMethod:OFF
                                     <!-- We generally discourage `var` use. -->

From 4ced804f515ca0939e6f974d28bacfbe6bc59498 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sun, 13 Oct 2024 13:07:44 +0200
Subject: [PATCH 3/4] Bump

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

diff --git a/pom.xml b/pom.xml
index 2dd9bb1232..23208c04d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
         <version.auto-service>1.1.1</version.auto-service>
         <version.auto-value>1.11.0</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
-        <version.error-prone-fork>v${version.error-prone-orig}-picnic-1</version.error-prone-fork>
+        <version.error-prone-fork>v${version.error-prone-orig}-picnic-2</version.error-prone-fork>
         <version.error-prone-orig>2.33.0</version.error-prone-orig>
         <version.error-prone-slf4j>0.1.28</version.error-prone-slf4j>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>

From ba24e62aebbe44e23d7e48bd50628b411455bd34 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sun, 13 Oct 2024 13:23:10 +0200
Subject: [PATCH 4/4] Reference filed ticket

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23208c04d6..2121948242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1939,9 +1939,8 @@
                                     <!-- We don't target JDK 8. -->
                                     -Xep:Java8ApiChecker:OFF
                                     <!-- This check also flags perfectly fine
-                                    type names. -->
-                                    <!-- XXX: File issue upstream, suggesting
-                                    that the check be split in two. -->
+                                    type names. See
+                                    https://github.com/google/error-prone/issues/4616. -->
                                     -Xep:MemberName:OFF
                                     <!-- We don't target Android. -->
                                     -Xep:StaticOrDefaultInterfaceMethod:OFF