Merge pull request #1458 from Vlatombe/jep-227

jep-227 downstream usage
jenkinsci · Nov 1, 2023 · 7df85e7 · 7df85e7
2 parents 1b49bd6 + 618d9bb
commit 7df85e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -266,6 +266,11 @@
         <artifactId>mockwebserver</artifactId>
         <version>4.9.3</version><!-- should be aligned with the version provided by okhttp-api-plugin -->
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>credentials</artifactId>
+        <version>1307.v3757c78f17c3</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java
@@ -212,10 +212,10 @@ private static StandardCredentials resolveCredentials(@CheckForNull String crede
             return null;
         }
         StandardCredentials c = CredentialsMatchers.firstOrNull(
-                CredentialsProvider.lookupCredentials(
+                CredentialsProvider.lookupCredentialsInItemGroup(
                         StandardCredentials.class,
                         Jenkins.get(),
-                        ACL.SYSTEM,
+                        ACL.SYSTEM2,
                         Collections.emptyList()
                 ),
                 CredentialsMatchers.allOf(