From 4311a73dd0c88ba58c009a56566ab9b869b2c49b Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Thu, 26 Oct 2023 08:51:32 +0200 Subject: [PATCH 1/2] jep-227 downstream usage --- pom.xml | 5 +++++ .../jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dd4f069a73..2b698f9be3 100644 --- a/pom.xml +++ b/pom.xml @@ -266,6 +266,11 @@ mockwebserver 4.9.3 + + org.jenkins-ci.plugins + credentials + 1305.v5886374f499b_ + diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java index f36c498097..018a8cbb99 100644 --- 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( From 3994085e63015a67b984b3b65d49f2f9cb1da68d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 1 Nov 2023 17:20:57 -0400 Subject: [PATCH 2/2] Pick up release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b698f9be3..333d4842d3 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ org.jenkins-ci.plugins credentials - 1305.v5886374f499b_ + 1307.v3757c78f17c3