Leftover bits from track 1 => track 2 SDK upgrade (#79)

jenkinsci · May 7, 2021 · 42d9117 · 42d9117
1 parent 66da3ee
commit 42d9117
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.17</version>
+    <version>4.18</version>
     <relativePath />
   </parent>
   <artifactId>azure-keyvault</artifactId>
@@ -15,7 +15,7 @@
   <properties>
     <changelist>9999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/azure-keyvault-plugin</gitHubRepo>
-    <jenkins.version>2.277.1</jenkins.version>
+    <jenkins.version>2.277.2</jenkins.version>
     <java.level>8</java.level>
     <hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
   </properties>
@@ -63,40 +63,10 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.277.x</artifactId>
-        <version>26</version>
+        <version>807.v6d348e44c987</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-annotations</artifactId>
-        <version>1.10.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.11</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.8.5</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>4.4.5</version>
-      </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>2.10.2</version>
-      </dependency>
-      <dependency>
-        <groupId>com.squareup.retrofit2</groupId>
-        <artifactId>retrofit</artifactId>
-        <version>2.6.2</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -107,7 +77,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>azure-credentials</artifactId>
-      <version>3.0.0</version>
+      <version>181.v00b0d97d2686</version>
     </dependency>
 
     <!-- optional deps -->
@@ -163,12 +133,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.1.2</version>
           <dependencies>
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>8.41</version>
+              <version>8.42</version>
             </dependency>
           </dependencies>
         </plugin>

diff --git a/...main/java/org/jenkinsci/plugins/azurekeyvaultplugin/AzureKeyVaultCredentialRetriever.java b/...main/java/org/jenkinsci/plugins/azurekeyvaultplugin/AzureKeyVaultCredentialRetriever.java
@@ -14,6 +14,7 @@
 import com.microsoft.azure.util.AzureCredentials;
 import com.microsoft.azure.util.AzureImdsCredentials;
 import hudson.model.Run;
+import io.jenkins.plugins.azuresdk.HttpClientRetriever;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -84,6 +85,7 @@ public static TokenCredential getCredentialById(String credentialID) {
             credential = new ClientSecretCredentialBuilder()
                     .clientId(azureCredential.getClientId())
                     .clientSecret(azureCredential.getPlainClientSecret())
+                    .httpClient(HttpClientRetriever.get())
                     .tenantId(azureCredential.getTenant())
                     .build();
         }