From 86073839e827f10a0356448e9cef643940661638 Mon Sep 17 00:00:00 2001 From: Kris Stern Date: Sat, 3 Feb 2024 09:37:07 +0800 Subject: [PATCH 1/5] Feat: Un-inlining WorkflowJob/configure-entries.jelly --- pom.xml | 2 +- .../plugins/workflow/job/WorkflowJob/configure-entries.jelly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index aad3f369..7d817f58 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 999999-SNAPSHOT - 2.440 + 2.443 false true 2.26 diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly index 05551d18..d5907503 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly @@ -33,7 +33,7 @@ - + From 9306f26cd93f384de51033fa4f6694823c83295f Mon Sep 17 00:00:00 2001 From: Kris Stern Date: Sat, 3 Feb 2024 19:49:29 +0800 Subject: [PATCH 2/5] Revert previous Jenkins version change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d817f58..aad3f369 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 999999-SNAPSHOT - 2.443 + 2.440 false true 2.26 From df57bc3ecca2a899f58f3f1c734f66efae52a8fd Mon Sep 17 00:00:00 2001 From: Kris Stern Date: Sun, 4 Feb 2024 16:14:39 +0800 Subject: [PATCH 3/5] Apply suggestions from code review --- .../workflow/job/AbstractItemDescriptor.java | 15 +++++++++++++++ .../plugins/workflow/job/WorkflowJob.java | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java b/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java new file mode 100644 index 00000000..10113e98 --- /dev/null +++ b/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java @@ -0,0 +1,15 @@ +package org.jenkinsci.plugins.workflow.job; + +import hudson.util.FormValidation; +import jenkins.model.Jenkins; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.AncestorInPath; +import org.kohsuke.stapler.QueryParameter; + +public interface AbstractItemDescriptor { + @Restricted(NoExternalUse.class) + public default FormValidation doCheckDisplayNameOrNull(@AncestorInPath WorkflowJob job, @QueryParameter String value) { + return Jenkins.get().doCheckDisplayName(value, job.getName()); + } +} diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java index 409ef336..fbb8bd02 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java @@ -69,6 +69,7 @@ import hudson.triggers.TriggerDescriptor; import hudson.util.AlternativeUiTextProvider; import hudson.util.DescribableList; +import hudson.util.FormValidation; import hudson.widgets.HistoryWidget; import java.io.File; import java.io.IOException; @@ -98,12 +99,14 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.AncestorInPath; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; @SuppressWarnings({"unchecked", "rawtypes"}) -public final class WorkflowJob extends Job implements LazyBuildMixIn.LazyLoadingJob, ParameterizedJobMixIn.ParameterizedJob, TopLevelItem, Queue.FlyweightTask, SCMTriggerItem, BlockableResume { +public final class WorkflowJob extends Job implements LazyBuildMixIn.LazyLoadingJob, ParameterizedJobMixIn.ParameterizedJob, TopLevelItem, Queue.FlyweightTask, SCMTriggerItem, BlockableResume, AbstractItemDescriptor { private static final Logger LOGGER = Logger.getLogger(WorkflowJob.class.getName()); @@ -193,7 +196,6 @@ public void setDefinition(FlowDefinition definition) { getTriggersJobProperty().startTriggers(Items.currentlyUpdatingByXml()); } - @Override public void addProperty(JobProperty jobProp) throws IOException { super.addProperty(jobProp); if (jobProp instanceof PipelineTriggersJobProperty) { From 617df122a0bd18e26f044c8384863c4f4e5a750f Mon Sep 17 00:00:00 2001 From: Kris Stern Date: Thu, 2 May 2024 22:08:06 +0800 Subject: [PATCH 4/5] fix: apply suggestions from code review --- .../workflow/job/AbstractItemDescriptor.java | 15 --------------- .../plugins/workflow/job/WorkflowJob.java | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java b/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java deleted file mode 100644 index 10113e98..00000000 --- a/src/main/java/org/jenkinsci/plugins/workflow/job/AbstractItemDescriptor.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.jenkinsci.plugins.workflow.job; - -import hudson.util.FormValidation; -import jenkins.model.Jenkins; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.AncestorInPath; -import org.kohsuke.stapler.QueryParameter; - -public interface AbstractItemDescriptor { - @Restricted(NoExternalUse.class) - public default FormValidation doCheckDisplayNameOrNull(@AncestorInPath WorkflowJob job, @QueryParameter String value) { - return Jenkins.get().doCheckDisplayName(value, job.getName()); - } -} diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java index f245af60..38554182 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java @@ -69,7 +69,6 @@ import hudson.triggers.TriggerDescriptor; import hudson.util.AlternativeUiTextProvider; import hudson.util.DescribableList; -import hudson.util.FormValidation; import hudson.widgets.HistoryWidget; import java.io.File; import java.io.IOException; @@ -99,14 +98,12 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.AncestorInPath; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; @SuppressWarnings({"unchecked", "rawtypes"}) -public final class WorkflowJob extends Job implements LazyBuildMixIn.LazyLoadingJob, ParameterizedJobMixIn.ParameterizedJob, TopLevelItem, Queue.FlyweightTask, SCMTriggerItem, BlockableResume, AbstractItemDescriptor { +public final class WorkflowJob extends Job implements LazyBuildMixIn.LazyLoadingJob, ParameterizedJobMixIn.ParameterizedJob, TopLevelItem, Queue.FlyweightTask, SCMTriggerItem, BlockableResume { private static final Logger LOGGER = Logger.getLogger(WorkflowJob.class.getName()); @@ -196,6 +193,7 @@ public void setDefinition(FlowDefinition definition) { getTriggersJobProperty().startTriggers(Items.currentlyUpdatingByXml()); } + @Override public void addProperty(JobProperty jobProp) throws IOException { super.addProperty(jobProp); if (jobProp instanceof PipelineTriggersJobProperty) { From 45b3892f86c1065714f52c3e97d16ac274e85c07 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 1 Oct 2024 15:55:03 -0700 Subject: [PATCH 5/5] Update baseline --- pom.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4522b93d..157ac22f 100644 --- a/pom.xml +++ b/pom.xml @@ -63,21 +63,30 @@ 999999-SNAPSHOT - 2.454 + 2.477 false true 2.26 jenkinsci/${project.artifactId}-plugin + + 2254.vcff7a_d4969e5 + 17 io.jenkins.tools.bom - bom-2.452.x - 3023.v02a_987a_b_3ff9 + bom-2.462.x + 3221.ve8f7b_fdd149d import pom + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 +