From fd716d0fe914ebd2456a9f8ce2ec2dd578116676 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:26:11 +0100 Subject: [PATCH 1/8] bump to 6.8.1 and add snakeyaml dependency --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e19587ad..ff3e314d 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ org.jenkins-ci.plugins kubernetes-client-api - 6.3.1-206.v76d3b_6b_14db_b + 6.8.1-220.v1f66736f9a_42 org.jenkins-ci.plugins @@ -234,7 +234,11 @@ - + + io.jenkins.plugins + snakeyaml-api + 2.0-999999-SNAPSHOT + com.github.spotbugs From 52d71259dcc4ea218604526af414524aaf2c6428 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:57:01 +0100 Subject: [PATCH 2/8] 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 ff3e314d..f1d70d0f 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ io.jenkins.plugins snakeyaml-api - 2.0-999999-SNAPSHOT + 2.1-110.v4960f4074978 From 78392193a488ad3662604422ca8632c89f68416c Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:07:33 +0100 Subject: [PATCH 3/8] Remove snakeyaml-api dependency --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index f1d70d0f..cf5438b4 100644 --- a/pom.xml +++ b/pom.xml @@ -234,11 +234,6 @@ - - io.jenkins.plugins - snakeyaml-api - 2.1-110.v4960f4074978 - com.github.spotbugs From f1ea817dc47bc34517411ef8553931b8d95d99c2 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:29:08 +0100 Subject: [PATCH 4/8] Updated to proper version of kubernetes-client-api-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf5438b4..865397cd 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ org.jenkins-ci.plugins kubernetes-client-api - 6.8.1-220.v1f66736f9a_42 + 6.8.1-224.vd388fca_4db_3b_ org.jenkins-ci.plugins From 3e5417e89147bd1ef0843d0601ab07398fbf4740 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:54:52 +0100 Subject: [PATCH 5/8] bump the jenkins version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 865397cd..2417bbe7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 4.65 + 4.72 @@ -45,8 +45,8 @@ 1 999999-SNAPSHOT - 2.361.4 - 2.361.x + 2.401.1 + 2.401.x 5.7.2 From 7e8f7bef83c8f7004822052faa1ccd4e4df71529 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:27:34 +0100 Subject: [PATCH 6/8] fix dependencies --- pom.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2417bbe7..1e300245 100644 --- a/pom.xml +++ b/pom.xml @@ -88,14 +88,14 @@ com.squareup.okhttp3 okhttp-bom - 4.10.0 + 4.11.0 import pom org.jetbrains.kotlin kotlin-bom - 1.8.21 + 1.9.10 import pom @@ -241,6 +241,22 @@ provided true + + + org.jenkins-ci.plugins + bouncycastle-api + 2.29 + + + org.jenkins-ci.plugins + jackson2-api + 2.15.2-350.v0c2f3f8fc595 + + + io.jenkins.plugins + okhttp-api + 4.11.0-157.v6852a_a_fa_ec11 + From 81824dbab0054f5a9db604b1f88e1d32fec26119 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:21:02 +0100 Subject: [PATCH 7/8] move temp dependencies and update to plugins 4.73 --- pom.xml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 1e300245..a4e280f6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 4.72 + 4.73 @@ -134,6 +134,21 @@ jquery-detached 1.2.1 + + org.jenkins-ci.plugins + bouncycastle-api + 2.29 + + + org.jenkins-ci.plugins + jackson2-api + 2.15.2-350.v0c2f3f8fc595 + + + io.jenkins.plugins + okhttp-api + 4.11.0-157.v6852a_a_fa_ec11 + @@ -241,22 +256,6 @@ provided true - - - org.jenkins-ci.plugins - bouncycastle-api - 2.29 - - - org.jenkins-ci.plugins - jackson2-api - 2.15.2-350.v0c2f3f8fc595 - - - io.jenkins.plugins - okhttp-api - 4.11.0-157.v6852a_a_fa_ec11 - From bc297c819047c9f104eacd801cf3484bda5c60d5 Mon Sep 17 00:00:00 2001 From: Julie Heard <55280278+julieheard@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:30:03 +0100 Subject: [PATCH 8/8] upgrade to 2.414 and remove additional dependencies --- pom.xml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index a4e280f6..4ad40faa 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,8 @@ 1 999999-SNAPSHOT - 2.401.1 - 2.401.x + 2.414.1 + 2.414.x 5.7.2 @@ -80,7 +80,7 @@ io.jenkins.tools.bom bom-${bom} - 2102.v854b_fec19c92 + 2401.v7a_d68f8d0b_09 import pom @@ -134,21 +134,6 @@ jquery-detached 1.2.1 - - org.jenkins-ci.plugins - bouncycastle-api - 2.29 - - - org.jenkins-ci.plugins - jackson2-api - 2.15.2-350.v0c2f3f8fc595 - - - io.jenkins.plugins - okhttp-api - 4.11.0-157.v6852a_a_fa_ec11 -