From f9e70116fa721d175da68795bd57b607d05f5977 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:09:10 +0100 Subject: [PATCH 1/7] Update for kubernetes-client-api.version v6.8.1 --- pom.xml | 16 +++++++++++----- .../auth/impl/KubernetesAuthKubeconfig.java | 8 ++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index ce681f2..abc095a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.50 + 4.66 org.jenkinsci.plugins @@ -40,15 +40,15 @@ -SNAPSHOT - 2.332.4 - bom-2.332.x - 1763.v092b_8980a_f5e + 2.401.1 + bom-2.401.x + 2244.vd60654536b_96 1.3 1.15 0.8 - 6.3.1-206.v76d3b_6b_14db_b + 6.8.1-220.v1f66736f9a_42 4.3.0 @@ -66,6 +66,11 @@ org.jenkins-ci.plugins jackson2-api + + io.jenkins.plugins + snakeyaml-api + 2.0-999999-SNAPSHOT + org.jenkins-ci.plugins @@ -105,6 +110,7 @@ io.jenkins configuration-as-code + 1670.v564dc8b_982d0 test diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java index ceabbb9..5b5d404 100644 --- a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java +++ b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java @@ -29,12 +29,8 @@ public ConfigBuilder decorate(ConfigBuilder builder, KubernetesAuthConfig config } public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(KubernetesAuthConfig config, String context, String clusterName, String username) throws KubernetesAuthException { - try { - io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig()); - return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig); - } catch (IOException e) { - throw new KubernetesAuthException(e.getMessage(), e); - } + io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig()); + return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig); } public String getKubeconfig() { From ae7becdfd0d59229089cd090725a756f60078b62 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:20:57 +0100 Subject: [PATCH 2/7] revert try-catch removal and replace with generic exception --- .../kubernetes/auth/impl/KubernetesAuthKubeconfig.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java index 5b5d404..d100392 100644 --- a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java +++ b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java @@ -29,8 +29,12 @@ public ConfigBuilder decorate(ConfigBuilder builder, KubernetesAuthConfig config } public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(KubernetesAuthConfig config, String context, String clusterName, String username) throws KubernetesAuthException { - io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig()); - return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig); + try { + io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig()); + return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig); + } catch (Exception e) { + throw new KubernetesAuthException(e.getMessage(), e); + } } public String getKubeconfig() { From ccba2aea1a06b576cb684084728251ec48e2d835 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:57:42 +0100 Subject: [PATCH 3/7] update snakeyaml to incremental version Co-authored-by: Robert Sandell --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abc095a..f7c77d7 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ io.jenkins.plugins snakeyaml-api - 2.0-999999-SNAPSHOT + 2.1-110.v4960f4074978 From 209b32a95ff545da3442e4b85b874c94fe5a6c83 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:15:01 +0100 Subject: [PATCH 4/7] Remove snakeyaml-api dependency --- pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 75236e7..a93a0b1 100644 --- a/pom.xml +++ b/pom.xml @@ -66,12 +66,7 @@ org.jenkins-ci.plugins jackson2-api - - io.jenkins.plugins - snakeyaml-api - 2.1-110.v4960f4074978 - - + org.jenkins-ci.plugins apache-httpcomponents-client-4-api From 837cce3529e6f8d6fb0e4ae9b27eb6666cf0d3ca Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:21:06 +0100 Subject: [PATCH 5/7] Change spacing and remove bump to configuration as code --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a93a0b1..be07fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ org.jenkins-ci.plugins jackson2-api - + org.jenkins-ci.plugins apache-httpcomponents-client-4-api @@ -105,7 +105,6 @@ io.jenkins configuration-as-code - 1670.v564dc8b_982d0 test From 3bdb882aa974fe25d02dbdc3b8879c992dfe3f09 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Tue, 29 Aug 2023 15:28:09 +0200 Subject: [PATCH 6/7] Apply suggestions from code review --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be07fd2..28a1198 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.3 1.15 0.8 - 6.8.1-220.v1f66736f9a_42 + 6.8.1-224.vd388fca_4db_3b_ 4.3.0 From 37cb4b2c1aee29579a5b51c60267c4002194e72c Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Tue, 29 Aug 2023 15:38:06 +0200 Subject: [PATCH 7/7] Add okhttp-api to dependencyManagement to fix enforcer rule --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 0aaae4d..dfee075 100644 --- a/pom.xml +++ b/pom.xml @@ -127,6 +127,11 @@ import pom + + io.jenkins.plugins + okhttp-api + 4.11.0-157.v6852a_a_fa_ec11 +