From 9f383e02226555b4ab7641e6feb604d2c1d5a0f1 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:29:56 +0100
Subject: [PATCH 1/5] Init

---
 .../workflow/job/WorkflowJob/configure-entries.jelly  | 10 +++++-----
 .../PipelineTriggersJobProperty/config.jelly          | 11 +----------
 2 files changed, 6 insertions(+), 15 deletions(-)

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..0fcbf072 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
@@ -25,10 +25,14 @@
   -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
+    <f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
+        <f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
+    </f:section>
+
     <p:config-quietPeriod/>
 
     <!-- pseudo-trigger to configure URL to trigger builds remotely. -->
-    <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />
+<!--    <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />-->
 
     <f:section title="${%Advanced Project Options}" icon="symbol-build-outline plugin-ionicons-api">
         <f:advanced>
@@ -37,8 +41,4 @@
             </f:entry>
         </f:advanced>
     </f:section>
-
-    <f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
-        <f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
-    </f:section>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
index ff770f8d..d777ef17 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
@@ -27,14 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <!-- build triggers config pane -->
-    <j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_">
-        <j:arg value="${it}" type="hudson.model.Item" />
-    </j:invokeStatic>
-    <f:descriptorList field="triggers"
-                      title="${%Build Triggers}"
-                      descriptors="${triggers}"
-                      instances="${it.triggers}">
-        <d:invokeBody />
-    </f:descriptorList>
+    <st:include page="/hudson/project/config-trigger.jelly" />
 </j:jelly>
\ No newline at end of file

From 52e7e54a7fb98697d5d57c635a4a7f797be6527b Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:43:27 +0100
Subject: [PATCH 2/5] Update config.jelly

---
 .../job/properties/PipelineTriggersJobProperty/config.jelly  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
index d777ef17..6721a29f 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
   Configure build triggers for WorkflowJob
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <st:include page="/hudson/project/config-trigger.jelly" />
+<j:jelly xmlns:j="jelly:core" xmlns:p="/lib/hudson/project">
+    <!-- https://issues.jenkins.io/browse/JENKINS-69057?jql=status%20%3D%20Open%20AND%20text%20~%20%22pipeline%20triggers%20sidebar%22 -->
+    <p:config-trigger/>
 </j:jelly>
\ No newline at end of file

From 39ddb311a10a9fd1d1e8e06add0f0ed1905c2d9d Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:07:25 +0100
Subject: [PATCH 3/5] Push

---
 pom.xml                                             |  3 ++-
 .../job/WorkflowJob/configure-entries.jelly         | 13 ++++++-------
 .../job/WorkflowJob/configure-entries.properties    |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties

diff --git a/pom.xml b/pom.xml
index fa9c7063..1f9fe27a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,8 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- TODO: Waiting for JENKINS-73824 and JENKINS-73835 to make it into an LTS line -->
-        <jenkins.version>2.481</jenkins.version>
+        <!-- <jenkins.version>2.481</jenkins.version> -->
+        <jenkins.version>2.481-rc35491.56cb_9df6e9cd</jenkins.version>
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
         <hpi.compatibleSinceVersion>2.26</hpi.compatibleSinceVersion>
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 1eee6074..c14edc44 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
@@ -26,15 +26,14 @@
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
     <f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
+        <div class="jenkins-section__description">
+            ${%pipeline.description}
+        </div>
         <f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
     </f:section>
-
-    <p:config-quietPeriod/>
-
-    <!-- pseudo-trigger to configure URL to trigger builds remotely. -->
-<!--    <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />-->
-
-    <f:section title="${%Advanced Project Options}" icon="symbol-build-outline plugin-ionicons-api">
+    <f:section title="${%Advanced}"
+               icon="symbol-build-outline plugin-ionicons-api">
+        <p:config-quietPeriod/>
         <f:advanced>
             <f:entry title="${%Display Name}" field="displayNameOrNull">
                 <f:textbox />
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties
new file mode 100644
index 00000000..987e4237
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties
@@ -0,0 +1 @@
+pipeline.description=Define your Pipeline using Groovy directly or pull it from source control. For help, refer to the <a target="_blank" href="./pipeline-syntax">Pipeline Syntax</a> page.

From 06f74e6034b197f2c44f747f05ae7130209e7930 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 19 Oct 2024 14:32:30 +0100
Subject: [PATCH 4/5] Update config.jelly

---
 .../PipelineTriggersJobProperty/config.jelly       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
index 6721a29f..ff770f8d 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
@@ -26,7 +26,15 @@ THE SOFTWARE.
   Configure build triggers for WorkflowJob
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:p="/lib/hudson/project">
-    <!-- https://issues.jenkins.io/browse/JENKINS-69057?jql=status%20%3D%20Open%20AND%20text%20~%20%22pipeline%20triggers%20sidebar%22 -->
-    <p:config-trigger/>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+    <!-- build triggers config pane -->
+    <j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_">
+        <j:arg value="${it}" type="hudson.model.Item" />
+    </j:invokeStatic>
+    <f:descriptorList field="triggers"
+                      title="${%Build Triggers}"
+                      descriptors="${triggers}"
+                      instances="${it.triggers}">
+        <d:invokeBody />
+    </f:descriptorList>
 </j:jelly>
\ No newline at end of file

From e5b1dc746575860c360f6308c035d74cf5c518b8 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 19 Oct 2024 14:42:29 +0100
Subject: [PATCH 5/5] Update content

---
 .../job/WorkflowJob/configure-entries.jelly   | 10 +++++---
 .../WorkflowJob/configure-entries.properties  |  2 +-
 .../PipelineTriggersJobProperty/config.jelly  |  4 +++-
 .../config.properties                         |  1 +
 .../config_ja.properties                      | 23 -------------------
 5 files changed, 12 insertions(+), 28 deletions(-)
 create mode 100644 src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.properties
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config_ja.properties

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 c14edc44..b5b57bf4 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
@@ -25,16 +25,20 @@
   -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
+    <!-- pseudo-trigger to configure URL to trigger builds remotely. -->
+    <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />
+
     <f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
         <div class="jenkins-section__description">
             ${%pipeline.description}
         </div>
         <f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
     </f:section>
-    <f:section title="${%Advanced}"
-               icon="symbol-build-outline plugin-ionicons-api">
-        <p:config-quietPeriod/>
+
+    <f:section title="${%Advanced}" icon="symbol-build-outline plugin-ionicons-api">
         <f:advanced>
+            <p:config-quietPeriod/>
+
             <f:entry title="${%Display Name}" field="displayNameOrNull">
                 <f:textbox />
             </f:entry>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties
index 987e4237..28009e15 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.properties
@@ -1 +1 @@
-pipeline.description=Define your Pipeline using Groovy directly or pull it from source control. For help, refer to the <a target="_blank" href="./pipeline-syntax">Pipeline Syntax</a> page.
+pipeline.description=Define your Pipeline using Groovy directly or pull it from source control. Check the <a target="_blank" href="./pipeline-syntax">Pipeline Syntax</a> page for guidance on writing pipelines.
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
index ff770f8d..e4b076b7 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.jelly
@@ -32,8 +32,10 @@ THE SOFTWARE.
         <j:arg value="${it}" type="hudson.model.Item" />
     </j:invokeStatic>
     <f:descriptorList field="triggers"
-                      title="${%Build Triggers}"
+                      title="${%Triggers}"
+                      description="${%description}"
                       descriptors="${triggers}"
+                      icon="symbol-trigger"
                       instances="${it.triggers}">
         <d:invokeBody />
     </f:descriptorList>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.properties b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.properties
new file mode 100644
index 00000000..dc25d121
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config.properties
@@ -0,0 +1 @@
+description=Set up automated actions that start your build based on specific events, like code changes or scheduled times.
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config_ja.properties b/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config_ja.properties
deleted file mode 100644
index cdb90c8d..00000000
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty/config_ja.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2017-, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Build\ Triggers=\u30D3\u30EB\u30C9\u30C8\u30EA\u30AC