From 96fe396104bc0a2e44081fbec565677fa997058e Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 30 Oct 2024 21:10:07 -0600 Subject: [PATCH 1/4] Use standard dependabot configuration and format --- .github/dependabot.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7ee7ec7..03b4d66 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,12 +1,12 @@ -# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file ---- +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + version: 2 updates: - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "monthly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "monthly" +- package-ecosystem: maven + directory: / + schedule: + interval: monthly +- package-ecosystem: github-actions + directory: / + schedule: + interval: monthly From 3029c6b13bc299b64b082d42f5d146773fa5e6c0 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 30 Oct 2024 21:13:04 -0600 Subject: [PATCH 2/4] Require Jenkins 2.452.4 or newer Jenkins 2.452.4 includes a critical security fix that make it a good minimum Jenkins version. It is also one of the versions recommended: https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ As of June 2024, 60% of installations of the most recent release were using Jenkins 2.440 or newer. With advisories and typical uprade patterns, the percentage is certainly even higher now. --- pom.xml | 7 ++++--- .../plugins/gitparameter/GitParameterDefinitionTest.java | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 00517f3..117bf00 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,8 @@ 0.9.20 -SNAPSHOT - 2.387.3 + 2.452 + ${jenkins.baseline}.4 jenkinsci/${project.artifactId}-plugin false @@ -60,8 +61,8 @@ io.jenkins.tools.bom - bom-2.387.x - 2543.vfb_1a_5fb_9496d + bom-${jenkins.baseline}.x + 3559.vb_5b_81183b_d23 pom import diff --git a/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java b/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java index 74da014..70c77c3 100644 --- a/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java +++ b/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java @@ -36,7 +36,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.concurrent.ExecutionException; import net.sf.json.JSONObject; import net.uaznia.lukanus.hudson.plugins.gitparameter.GitParameterDefinition.DescriptorImpl; import net.uaznia.lukanus.hudson.plugins.gitparameter.jobs.JobWrapper; @@ -701,7 +700,7 @@ public void testWorkflowJobWithCpsScmFlowDefinition() throws IOException { } @Test - public void testWorkflowJobWithCpsFlowDefinition() throws IOException, InterruptedException, ExecutionException { + public void testWorkflowJobWithCpsFlowDefinition() throws Exception { WorkflowJob p = jenkins.createProject(WorkflowJob.class, "wfj"); String script = "node {\n" + " git url: '" + GIT_PARAMETER_REPOSITORY_URL + "' \n" + " echo 'Some message'\n" + "}"; From be4ce87df0c727286503589eeaee8fb28c397968 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 30 Oct 2024 21:15:16 -0600 Subject: [PATCH 3/4] Use 0.10.0 as next release Upgrading minimum Jenkins version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 117bf00..280dfce 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ - 0.9.20 + 0.10.0 -SNAPSHOT 2.452 From 37aab8804bf8160be67d10117e12947fd9f96b52 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 30 Oct 2024 21:19:49 -0600 Subject: [PATCH 4/4] Remove description attribute from pom No longer used by Jenkins tooling, see index.jelly --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 280dfce..3f3aea0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jenkins-ci.plugins plugin @@ -13,7 +14,6 @@ ${revision}${changelist} hpi Git Parameter Plug-In - Adds ability to choose branches, tags or revisions from git repositories configured in project. https://github.com/jenkinsci/${project.artifactId}-plugin