From f82ac9cbbd9df664673b2d8ee02a7cc028d4237b Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Mon, 13 Jan 2025 18:36:42 -0800
Subject: [PATCH] Upgrade to modernizer-maven-plugin 3.1.0

This improves local variable suppressions.
---
 pom.xml                                  | 11 +++++++----
 src/main/java/org/gaul/s3proxy/Main.java |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9bb0cfe..768af950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,7 +333,7 @@
       <plugin>
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${modernizer.version}</version>
         <executions>
           <execution>
             <id>modernizer</id>
@@ -345,9 +345,6 @@
         </executions>
         <configuration>
           <javaVersion>${java.version}</javaVersion>
-          <exclusions>
-            <exclusion>com/google/common/base/Supplier</exclusion>
-          </exclusions>
         </configuration>
       </plugin>
       <plugin>
@@ -369,6 +366,7 @@
     <java.version>11</java.version>
     <jclouds.version>2.6.0</jclouds.version>
     <jetty.version>11.0.24</jetty.version>
+    <modernizer.version>3.1.0</modernizer.version>
     <slf4j.version>2.0.16</slf4j.version>
     <shade.prefix>${project.groupId}.shaded</shade.prefix>
     <surefire.version>3.2.5</surefire.version>
@@ -509,6 +507,11 @@
       <artifactId>jetty-servlet</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.gaul</groupId>
+      <artifactId>modernizer-maven-annotations</artifactId>
+      <version>${modernizer.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java
index e6eb3ac4..5396e231 100644
--- a/src/main/java/org/gaul/s3proxy/Main.java
+++ b/src/main/java/org/gaul/s3proxy/Main.java
@@ -46,6 +46,7 @@
 import com.google.common.io.MoreFiles;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.jclouds.Constants;
 import org.jclouds.ContextBuilder;
 import org.jclouds.JcloudsVersion;
@@ -392,7 +393,8 @@ private static BlobStore createBlobStore(Properties properties,
         }
 
         if ((identity.isEmpty() || credential.isEmpty()) && provider.equals("aws-s3")) {
-            var credentialsSupplier = new Supplier<Credentials>() {
+            @SuppressModernizer
+            Supplier<Credentials> credentialsSupplier = new Supplier<Credentials>() {
                 @Override
                 public Credentials get() {
                     AWSCredentialsProvider authChain = DefaultAWSCredentialsProviderChain.getInstance();