Adapt to removal of STS module (#96)

jenkinsci · Dec 18, 2024 · 3a5c7de · 3a5c7de
1 parent c08280b
commit 3a5c7de
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,19 +49,33 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.jenkins.plugins.aws-java-sdk2</groupId>
+        <artifactId>aws-java-sdk2-core</artifactId>
+        <version>2.29.34-9.v117ff2a_65538</version>
+      </dependency>
+      <!-- TODO until in BOM -->
+      <dependency>
+        <groupId>io.jenkins.plugins.aws-java-sdk2</groupId>
+        <artifactId>aws-java-sdk2-ec2</artifactId>
+        <version>2.29.34-9.v117ff2a_65538</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>aws-credentials</artifactId>
+        <version>239.v6681a_0ea_46ef</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
     <dependency>
       <groupId>io.jenkins.plugins.aws-java-sdk2</groupId>
-      <artifactId>aws-java-sdk2-sts</artifactId>
+      <artifactId>aws-java-sdk2-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>aws-credentials</artifactId>
-      <!-- TODO until in BOM -->
-      <version>238.v8fb_588a_2b_e67</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/...n/java/io/jenkins/plugins/aws/global_configuration/CredentialsAwsGlobalConfiguration.java b/...n/java/io/jenkins/plugins/aws/global_configuration/CredentialsAwsGlobalConfiguration.java
@@ -44,7 +44,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import jenkins.model.Jenkins;
-import jenkins.util.SetContextClassLoader;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
@@ -183,8 +182,7 @@ private Credentials getSessionCredentials(AwsCredentialsProvider credentialsProv
      *             in case of error.
      */
     private AwsSessionCredentials sessionCredentialsFromInstanceProfile() throws IOException {
-        try (SetContextClassLoader sccl = new SetContextClassLoader(CredentialsAwsGlobalConfiguration.class);
-                DefaultCredentialsProvider credentialsProvider = DefaultCredentialsProvider.create()) {
+        try (DefaultCredentialsProvider credentialsProvider = DefaultCredentialsProvider.create()) {
             AwsCredentials awsCredentials = credentialsProvider.resolveCredentials();
 
             // Assume we are using session credentials