From 965692501122d58df12bd01459a02ec9602758ff Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Sun, 12 Jan 2025 22:15:46 +0000 Subject: [PATCH 01/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fc25291b98..78290aee69 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 5.5 + 5.6-SNAPSHOT pom Jenkins Plugin Parent POM @@ -37,7 +37,7 @@ scm:git:https://github.com/jenkinsci/plugin-pom.git scm:git:git@github.com:jenkinsci/plugin-pom.git - plugin-5.5 + HEAD https://github.com/jenkinsci/plugin-pom From 550ab95336b631e48256c223a13607e035f3ce1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:16:48 +0000 Subject: [PATCH 02/13] Bump com.diffplug.spotless:spotless-maven-plugin from 2.44.1 to 2.44.2 (#1078) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78290aee69..b3af0653d6 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 3.4.0 5.15.2 4.8.3.1 - 2.44.1 + 2.44.2 233.v9579d1a_8ea_28 From 9895ffbbc8c609b1dd6a72bc61501dff830d261a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 18:31:53 +0000 Subject: [PATCH 03/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1079) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3af0653d6..047f9d252a 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2378.v58ce1c9466c7 + 2380.vc51ea_a_cf2711 5.11.4 165.v7e11f4e4a_325 1.0.0 From fb1a312636948bb997e294be518c66a6276089d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:44:09 +0000 Subject: [PATCH 04/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1080) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 047f9d252a..d830338aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2380.vc51ea_a_cf2711 + 2382.v446201c06cb_8 5.11.4 165.v7e11f4e4a_325 1.0.0 From f8ea303072ada5e0627a0ebbe95ae889c813ce15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 01:22:09 +0000 Subject: [PATCH 05/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1081) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d830338aa4..d0713376b4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2382.v446201c06cb_8 + 2385.vfe86233d0d36 5.11.4 165.v7e11f4e4a_325 1.0.0 From c17a5936206ca9f8f58d7c6af00684b997ea5eab Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Thu, 23 Jan 2025 15:56:01 +0100 Subject: [PATCH 06/13] Define an enforcer rule execution mandating override of jth version via property (#1082) --- pom.xml | 7 ++++ src/it/override-jth-fail/invoker.properties | 4 +++ src/it/override-jth-fail/pom.xml | 39 +++++++++++++++++++++ src/it/override-jth-pass/invoker.properties | 3 ++ src/it/override-jth-pass/pom.xml | 31 ++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 src/it/override-jth-fail/invoker.properties create mode 100644 src/it/override-jth-fail/pom.xml create mode 100644 src/it/override-jth-pass/invoker.properties create mode 100644 src/it/override-jth-pass/pom.xml diff --git a/pom.xml b/pom.xml index d0713376b4..be7dfbe40a 100644 --- a/pom.xml +++ b/pom.xml @@ -588,6 +588,13 @@ org.testng:testng + + jenkins-test-harness version must be defined using jenkins-test-harness.version property + + + org.jenkins-ci.main:jenkins-test-harness:(,${jenkins-test-harness.version}),(${jenkins-test-harness.version},):jar + + com.google.code.findbugs:jsr305 diff --git a/src/it/override-jth-fail/invoker.properties b/src/it/override-jth-fail/invoker.properties new file mode 100644 index 0000000000..c9b0824523 --- /dev/null +++ b/src/it/override-jth-fail/invoker.properties @@ -0,0 +1,4 @@ +# install, not verify, because we want to check the artifact as we would be about to deploy it +# release.skipTests normally set in jenkins-release profile since release:perform would do the tests +invoker.goals=-Dstyle.color=always -ntp validate +invoker.buildResult=failure diff --git a/src/it/override-jth-fail/pom.xml b/src/it/override-jth-fail/pom.xml new file mode 100644 index 0000000000..059749b834 --- /dev/null +++ b/src/it/override-jth-fail/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + org.jenkins-ci.plugins + plugin + @project.version@ + + + org.jenkins-ci.plugins.its + override-jth-fail + 1.0-SNAPSHOT + hpi + + 2.479.1 + + + + + org.jenkins-ci.main + jenkins-test-harness + + 2384.va_d3a_58a_4b_df5 + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + diff --git a/src/it/override-jth-pass/invoker.properties b/src/it/override-jth-pass/invoker.properties new file mode 100644 index 0000000000..f945d8acda --- /dev/null +++ b/src/it/override-jth-pass/invoker.properties @@ -0,0 +1,3 @@ +# install, not verify, because we want to check the artifact as we would be about to deploy it +# release.skipTests normally set in jenkins-release profile since release:perform would do the tests +invoker.goals=-Dstyle.color=always -ntp validate diff --git a/src/it/override-jth-pass/pom.xml b/src/it/override-jth-pass/pom.xml new file mode 100644 index 0000000000..251c81fe78 --- /dev/null +++ b/src/it/override-jth-pass/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + org.jenkins-ci.plugins + plugin + @project.version@ + + + org.jenkins-ci.plugins.its + override-jth-pass + 1.0-SNAPSHOT + hpi + + 2.479.1 + + 2384.va_d3a_58a_4b_df5 + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + From 2f9bf99922bdc55dbf24122a61f255306544617d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:01:49 +0000 Subject: [PATCH 07/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1083) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be7dfbe40a..34450540be 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2385.vfe86233d0d36 + 2386.v82359624ea_05 5.11.4 165.v7e11f4e4a_325 1.0.0 From 65e9571a27490761eada2b052dde5bcb9e297f7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:47:24 +0000 Subject: [PATCH 08/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1084) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34450540be..ce7fd998ef 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2386.v82359624ea_05 + 2389.va_b_3a_21a_c00ed 5.11.4 165.v7e11f4e4a_325 1.0.0 From d90aee3240b1a96e18336fc07a47441503316b57 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Mon, 27 Jan 2025 15:18:10 +0100 Subject: [PATCH 09/13] [maven-release-plugin] prepare release plugin-5.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ce7fd998ef..fa23be90e9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 5.6-SNAPSHOT + 5.6 pom Jenkins Plugin Parent POM @@ -37,7 +37,7 @@ scm:git:https://github.com/jenkinsci/plugin-pom.git scm:git:git@github.com:jenkinsci/plugin-pom.git - HEAD + plugin-5.6 https://github.com/jenkinsci/plugin-pom From 5044f5e685659ad770e71b3d46ba300e006be42e Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Mon, 27 Jan 2025 15:18:54 +0100 Subject: [PATCH 10/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa23be90e9..641f78d39d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 5.6 + 5.7-SNAPSHOT pom Jenkins Plugin Parent POM From c63ac19c605eafeaa9b7f4b006baaad82d8f4d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:16:58 +0000 Subject: [PATCH 11/13] Bump org.jenkins-ci.main:jenkins-test-harness (#1086) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 641f78d39d..b8fe315f09 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 0.8.12 2.479 ${jenkins.version} - 2389.va_b_3a_21a_c00ed + 2391.v9b_3e2d3351a_2 5.11.4 165.v7e11f4e4a_325 1.0.0 From a72443c94ab0e78052a4d0b783dabd411a42a72e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:16:13 +0000 Subject: [PATCH 12/13] Bump org.jenkins-ci.tools:maven-hpi-plugin from 3.60 to 3.61 (#1087) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8fe315f09..c196b92adc 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.15.1 4.1.1 3.0 - 3.60 + 3.61 1.0-beta-4 1.8 0.8.12 From f76b74e243dddf6ed116c349ec7cc8a6c01571ba Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Tue, 4 Feb 2025 10:24:34 +0100 Subject: [PATCH 13/13] [maven-release-plugin] prepare release plugin-5.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c196b92adc..ca2cd63a92 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.jenkins-ci.plugins plugin - 5.7-SNAPSHOT + 5.7 pom Jenkins Plugin Parent POM @@ -37,7 +37,7 @@ scm:git:https://github.com/jenkinsci/plugin-pom.git scm:git:git@github.com:jenkinsci/plugin-pom.git - plugin-5.6 + plugin-5.7 https://github.com/jenkinsci/plugin-pom