From 25d039d5fc97cecd656ebee00cb6cbcd2c8683a8 Mon Sep 17 00:00:00 2001
From: Valentin Delaye <jonesbusy@gmail.com>
Date: Tue, 26 Sep 2023 06:19:52 +0200
Subject: [PATCH] Use minimal SDK

---
 pom.xml                                                     | 6 ++----
 .../jenkins/plugins/itemstorage/s3/NonAWSS3ItemStorage.java | 4 ++--
 .../java/jenkins/plugins/itemstorage/s3/S3ItemStorage.java  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3006807..0cdd99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
 
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
 
-        <aws-java-sdk.version>1.12.586-413.v6a_6c3a_420126</aws-java-sdk.version>
         <testcontainers.version>1.19.3</testcontainers.version>
         <zstd-jni.version>1.5.5-10</zstd-jni.version>
     </properties>
@@ -59,9 +58,8 @@
             <artifactId>variant</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>aws-java-sdk</artifactId>
-            <version>${aws-java-sdk.version}</version>
+            <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
+            <artifactId>aws-java-sdk-minimal</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/src/main/java/jenkins/plugins/itemstorage/s3/NonAWSS3ItemStorage.java b/src/main/java/jenkins/plugins/itemstorage/s3/NonAWSS3ItemStorage.java
index b88d2c6..9f7b772 100644
--- a/src/main/java/jenkins/plugins/itemstorage/s3/NonAWSS3ItemStorage.java
+++ b/src/main/java/jenkins/plugins/itemstorage/s3/NonAWSS3ItemStorage.java
@@ -145,7 +145,7 @@ private S3Profile createS3Profile() {
         return new S3Profile(lookupCredentials(), endpoint, region, signerVersion, pathStyleAccess, parallelDownloads);
     }
 
-    @OptionalExtension(requirePlugins = {"aws-java-sdk", "aws-credentials", "jackson2-api"})
+    @OptionalExtension(requirePlugins = {"aws-java-sdk-minimal", "aws-credentials", "jackson2-api"})
     public static final class DescriptorImpl extends ItemStorageDescriptor<S3ObjectPath> {
 
         @NonNull
@@ -175,7 +175,7 @@ public ListBoxModel doFillSignerVersionItems() {
         }
     }
 
-    @OptionalExtension(requirePlugins = {"aws-java-sdk", "aws-credentials", "jackson2-api"})
+    @OptionalExtension(requirePlugins = {"aws-java-sdk-minimal", "aws-credentials", "jackson2-api"})
     public static final class S3ItemListener extends ItemListener {
 
         @Override
diff --git a/src/main/java/jenkins/plugins/itemstorage/s3/S3ItemStorage.java b/src/main/java/jenkins/plugins/itemstorage/s3/S3ItemStorage.java
index 1154fac..2a20600 100644
--- a/src/main/java/jenkins/plugins/itemstorage/s3/S3ItemStorage.java
+++ b/src/main/java/jenkins/plugins/itemstorage/s3/S3ItemStorage.java
@@ -107,7 +107,7 @@ private S3Profile createS3Profile() {
         return new S3Profile(lookupCredentials(), null, region, null, false, true);
     }
 
-    @OptionalExtension(requirePlugins = {"aws-java-sdk", "aws-credentials", "jackson2-api"})
+    @OptionalExtension(requirePlugins = {"aws-java-sdk-minimal", "aws-credentials", "jackson2-api"})
     public static final class DescriptorImpl extends ItemStorageDescriptor<S3ObjectPath> {
 
         @NonNull
@@ -136,7 +136,7 @@ public ListBoxModel doFillRegionItems() {
         }
     }
 
-    @OptionalExtension(requirePlugins = {"aws-java-sdk", "aws-credentials", "jackson2-api"})
+    @OptionalExtension(requirePlugins = {"aws-java-sdk-minimal", "aws-credentials", "jackson2-api"})
     public static final class S3ItemListener extends ItemListener {
 
         @Override