Merge pull request #228 from jonesbusy/feature/use-minimal-sdk

Use minimal SDK
jenkinsci · Nov 25, 2023 · c3fde9f · c3fde9f
2 parents cf12aee + 25d039d
commit c3fde9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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