From b2d416905b35cd2862b3edf2ed5011953937515b Mon Sep 17 00:00:00 2001
From: Kris Stern <krisstern@outlook.com>
Date: Wed, 2 Oct 2024 22:46:34 +0800
Subject: [PATCH] [JENKINS-69916] Un-inline
`WorkflowJob/configure-entries.jelly` (#411)
Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Co-authored-by: Basil Crow <me@basilcrow.com>
---
pom.xml | 15 ++++++++++++---
.../job/WorkflowJob/configure-entries.jelly | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4522b93d..157ac22f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,21 +63,30 @@
</pluginRepositories>
<properties>
<changelist>999999-SNAPSHOT</changelist>
- <jenkins.version>2.454</jenkins.version>
+ <jenkins.version>2.477</jenkins.version>
<no-test-jar>false</no-test-jar>
<useBeta>true</useBeta>
<hpi.compatibleSinceVersion>2.26</hpi.compatibleSinceVersion>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+ <!-- TODO JENKINS-73339 until in parent POM -->
+ <jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
+ <maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
- <artifactId>bom-2.452.x</artifactId>
- <version>3023.v02a_987a_b_3ff9</version>
+ <artifactId>bom-2.462.x</artifactId>
+ <version>3221.ve8f7b_fdd149d</version>
<scope>import</scope>
<type>pom</type>
</dependency>
+ <!-- TODO JENKINS-73339 until in parent POM, work around https://github.com/jenkinsci/plugin-pom/issues/936 -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
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 @@
<f:section title="${%Advanced Project Options}" icon="symbol-build-outline plugin-ionicons-api">
<f:advanced>
<f:entry title="${%Display Name}" field="displayNameOrNull">
- <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
+ <f:textbox />
</f:entry>
</f:advanced>
</f:section>