From 283748050d8b4da4790eec30ba6dce366a2a226d Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Sat, 2 Nov 2024 15:35:00 +0100 Subject: [PATCH] Bump minimum Jenkins version --- pom.xml | 6 +++--- .../jenkins/plugins/scmskip/SCMSkipTools.java | 13 +++++++------ .../scmskip/SCMSkipBuildWrapper/global.jelly | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 51d2bdb..954decc 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 999999-SNAPSHOT - 2.414.3 + 2.479.1 jenkinsci/${project.artifactId}-plugin false @@ -50,8 +50,8 @@ io.jenkins.tools.bom - bom-2.414.x - 2982.vdce2153031a_0 + bom-2.479.x + 3482.vc10d4f6da_28a_ pom import diff --git a/src/main/java/net/plavcak/jenkins/plugins/scmskip/SCMSkipTools.java b/src/main/java/net/plavcak/jenkins/plugins/scmskip/SCMSkipTools.java index 4705179..dedb705 100644 --- a/src/main/java/net/plavcak/jenkins/plugins/scmskip/SCMSkipTools.java +++ b/src/main/java/net/plavcak/jenkins/plugins/scmskip/SCMSkipTools.java @@ -9,6 +9,13 @@ import hudson.model.Run; import hudson.model.TaskListener; import hudson.scm.ChangeLogSet; +import jakarta.servlet.ServletException; +import jenkins.model.CauseOfInterruption; +import jenkins.model.Jenkins; +import jenkins.scm.RunWithSCM; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; + import java.io.IOException; import java.io.PrintStream; import java.util.List; @@ -16,12 +23,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.servlet.ServletException; -import jenkins.model.CauseOfInterruption; -import jenkins.model.Jenkins; -import jenkins.scm.RunWithSCM; -import org.jenkinsci.plugins.workflow.job.WorkflowRun; -import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; public class SCMSkipTools { diff --git a/src/main/resources/net/plavcak/jenkins/plugins/scmskip/SCMSkipBuildWrapper/global.jelly b/src/main/resources/net/plavcak/jenkins/plugins/scmskip/SCMSkipBuildWrapper/global.jelly index 9ac3aa7..1ba51d5 100644 --- a/src/main/resources/net/plavcak/jenkins/plugins/scmskip/SCMSkipBuildWrapper/global.jelly +++ b/src/main/resources/net/plavcak/jenkins/plugins/scmskip/SCMSkipBuildWrapper/global.jelly @@ -2,7 +2,7 @@ - +