From 6f646ce07df6c33a393a92d2c225170f6ff8068f Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Wed, 13 Jan 2021 14:10:23 -0800
Subject: [PATCH 1/8] Handle tables-to-divs conversion

---
 .../workflow/cps/Snippetizer/index.jelly      | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index a519a77d2..0ea948500 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -42,6 +42,34 @@ THE SOFTWARE.
                 <!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
                 <j:set var="item" value="${it.getItem(request)}"/>
                 <d:taglib uri="local">
+                    <d:tag name="row">
+                        <j:choose>
+                          <j:when test="${divBasedFormLayout}">
+                                <div class="tr">
+                                    <d:invokeBody/>
+                                </div>
+                            </j:when>
+                            <j:otherwise>
+                                <tr>
+                                    <d:invokeBody/>
+                                </tr>
+                            </j:otherwise>
+                        </j:choose>
+                    </d:tag>
+                      <d:tag name="td">
+                        <j:choose>
+                          <j:when test="${divBasedFormLayout}">
+                            <div>
+                              <d:invokeBody/>
+                            </div>
+                          </j:when>
+                          <j:otherwise>
+                            <td colspan="3">
+                              <d:invokeBody/>
+                            </td>
+                          </j:otherwise>
+                        </j:choose> 
+                      </d:tag>
                     <d:tag name="listSteps">
                         <j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
                             <j:set var="descriptor" value="${quasiDescriptor.real}"/>
@@ -50,11 +78,12 @@ THE SOFTWARE.
                                     <j:set var="it" value="${item}"/>
                                     <j:set var="instance" value="${null}"/>
                                     <j:set var="help" value="${descriptor.helpFile}"/>
+                                    
                                     <j:if test="${help != null}">
-                                        <tr>
-                                            <td colspan="3"/>
+                                        <local:row>
+                                            <local:td />
                                             <f:helpLink url="${help}"/>
-                                        </tr>
+                                        </local:row>
                                         <f:helpArea/>
                                     </j:if>
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">

From abc17a75496c417e661e222f26d268de9f99baa8 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Sun, 14 Feb 2021 22:42:35 -0800
Subject: [PATCH 2/8] Attempt to implement review feedback fixes

---
 .../workflow/cps/Snippetizer/index.jelly      | 45 ++++++-------------
 .../workflow/cps/Snippetizer/workflow.css     |  4 ++
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 0ea948500..25350a17b 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -42,34 +42,6 @@ THE SOFTWARE.
                 <!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
                 <j:set var="item" value="${it.getItem(request)}"/>
                 <d:taglib uri="local">
-                    <d:tag name="row">
-                        <j:choose>
-                          <j:when test="${divBasedFormLayout}">
-                                <div class="tr">
-                                    <d:invokeBody/>
-                                </div>
-                            </j:when>
-                            <j:otherwise>
-                                <tr>
-                                    <d:invokeBody/>
-                                </tr>
-                            </j:otherwise>
-                        </j:choose>
-                    </d:tag>
-                      <d:tag name="td">
-                        <j:choose>
-                          <j:when test="${divBasedFormLayout}">
-                            <div>
-                              <d:invokeBody/>
-                            </div>
-                          </j:when>
-                          <j:otherwise>
-                            <td colspan="3">
-                              <d:invokeBody/>
-                            </td>
-                          </j:otherwise>
-                        </j:choose> 
-                      </d:tag>
                     <d:tag name="listSteps">
                         <j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
                             <j:set var="descriptor" value="${quasiDescriptor.real}"/>
@@ -80,10 +52,19 @@ THE SOFTWARE.
                                     <j:set var="help" value="${descriptor.helpFile}"/>
                                     
                                     <j:if test="${help != null}">
-                                        <local:row>
-                                            <local:td />
-                                            <f:helpLink url="${help}"/>
-                                        </local:row>
+                                        <j:choose>
+                                            <j:when test="${divBasedFormLayout}">
+                                                <div class="setting-name help-sibling snippetizer-help">
+                                                    <f:helpLink url="${help}"/>
+                                                </div>
+                                            </j:when>
+                                            <j:otherwise>
+                                                <tr>
+                                                    <td colspan="3"/>
+                                                    <f:helpLink url="${help}"/>
+                                                </tr>
+                                            </j:otherwise>
+                                        </j:choose>
                                         <f:helpArea/>
                                     </j:if>
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
index 87e04a295..ee051a2c4 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
@@ -99,6 +99,10 @@ z.root>dt {
   padding-bottom: 0
 }
 
+.snippetizer-help {
+  height: 20px;
+}
+
 .array-title {
   border-left: 1px solid #eee;
   padding-left: 10px;

From cc8f190dd22a0a0d90983a319e711f43cff38ed4 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Mon, 15 Feb 2021 00:59:39 -0800
Subject: [PATCH 3/8] Update to newer minimum Jenkins version - v2.222.4

---
 Jenkinsfile | 2 +-
 pom.xml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 092fa5d0f..509d344a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
 buildPlugin(useAci: false, configurations: [
   [ platform: "linux", jdk: "8", jenkins: null ],
   [ platform: "windows", jdk: "8", jenkins: null ],
-  [ platform: "linux", jdk: "11", jenkins: "2.222.3", javaLevel: 8 ]
+  [ platform: "linux", jdk: "11", jenkins: "2.276", javaLevel: 8 ]
 ])
diff --git a/pom.xml b/pom.xml
index 1049dac2c..c5a16e00e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <revision>2.88</revision>
         <changelist>-SNAPSHOT</changelist>
         <gitHubRepo>${project.artifactId}-plugin</gitHubRepo>
-        <jenkins.version>2.176.4</jenkins.version>
+        <jenkins.version>2.222.4</jenkins.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <groovy-cps.version>1.32</groovy-cps.version>
@@ -78,8 +78,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.176.x</artifactId>
-                <version>16</version>
+                <artifactId>bom-2.222.x</artifactId>
+                <version>23</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

From 8a9a07f82521862f41a7e8ba484a618f3260b71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Queiruga?= <fqueiruga@cloudbees.com>
Date: Mon, 15 Feb 2021 17:50:15 +0100
Subject: [PATCH 4/8] Fix help icon placement for the Snippetizer

---
 .../workflow/cps/Snippetizer/index.jelly      | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 25350a17b..3bed58d11 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -42,6 +42,36 @@ THE SOFTWARE.
                 <!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
                 <j:set var="item" value="${it.getItem(request)}"/>
                 <d:taglib uri="local">
+                    <!-- this tag wraps the dropdown list in a div but only in div-based forms
+                        using a div in table-based forms will crash the layout generation -->
+                    <d:tag name="snippetizerOptionsWrapper">
+                       <j:choose>
+                           <j:when test="${divBasedFormLayout}">
+                               <style>
+                                   .snippetizer-options-wrapper .setting-input.dropdownList {
+                                       max-width: calc(100% - 2rem);
+                                   }
+
+                                   .snippetizer-help {
+                                       position: relative;
+                                   }
+
+                                   .snippetizer-help a.help-button {
+                                       position: absolute;
+                                       top: -2rem;
+                                   }
+                               </style>
+
+                               <div class="snippetizer-options-wrapper">
+                                   <d:invokeBody />
+                               </div>
+                           </j:when>
+                           <j:otherwise>
+                               <d:invokeBody />
+                           </j:otherwise>
+                       </j:choose>
+                    </d:tag>
+
                     <d:tag name="listSteps">
                         <j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
                             <j:set var="descriptor" value="${quasiDescriptor.real}"/>
@@ -54,8 +84,8 @@ THE SOFTWARE.
                                     <j:if test="${help != null}">
                                         <j:choose>
                                             <j:when test="${divBasedFormLayout}">
-                                                <div class="setting-name help-sibling snippetizer-help">
-                                                    <f:helpLink url="${help}"/>
+                                                <div class="snippetizer-help">
+                                                    <f:entry help="${help}" />
                                                 </div>
                                             </j:when>
                                             <j:otherwise>
@@ -77,11 +107,15 @@ THE SOFTWARE.
                         </j:forEach>
                     </d:tag>
                 </d:taglib>
-                <f:dropdownList name="prototype" title="${%Sample Step}">
-                    <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
-                    <f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
-                    <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
-                </f:dropdownList>
+
+                <local:snippetizerOptionsWrapper>
+                    <f:dropdownList name="prototype" title="${%Sample Step}">
+                        <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
+                        <f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
+                        <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
+                    </f:dropdownList>
+                </local:snippetizerOptionsWrapper>
+
                 <j:set var="id" value="${h.generateId()}"/>
                 <f:block>
                     <input type="button" value="${%Generate Pipeline Script}" onclick="handlePrototype_${id}(); return false" class="submit-button primary"/>

From eabdba1b4b8f4bd657d940afd3588d8c6e8400ce Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Tue, 16 Feb 2021 09:03:05 -0800
Subject: [PATCH 5/8] Use an entry to anchor step help

---
 .../workflow/cps/Snippetizer/index.jelly      | 59 ++-----------------
 .../workflow/cps/Snippetizer/workflow.css     |  4 --
 2 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 3bed58d11..04ec91432 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -42,35 +42,6 @@ THE SOFTWARE.
                 <!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
                 <j:set var="item" value="${it.getItem(request)}"/>
                 <d:taglib uri="local">
-                    <!-- this tag wraps the dropdown list in a div but only in div-based forms
-                        using a div in table-based forms will crash the layout generation -->
-                    <d:tag name="snippetizerOptionsWrapper">
-                       <j:choose>
-                           <j:when test="${divBasedFormLayout}">
-                               <style>
-                                   .snippetizer-options-wrapper .setting-input.dropdownList {
-                                       max-width: calc(100% - 2rem);
-                                   }
-
-                                   .snippetizer-help {
-                                       position: relative;
-                                   }
-
-                                   .snippetizer-help a.help-button {
-                                       position: absolute;
-                                       top: -2rem;
-                                   }
-                               </style>
-
-                               <div class="snippetizer-options-wrapper">
-                                   <d:invokeBody />
-                               </div>
-                           </j:when>
-                           <j:otherwise>
-                               <d:invokeBody />
-                           </j:otherwise>
-                       </j:choose>
-                    </d:tag>
 
                     <d:tag name="listSteps">
                         <j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
@@ -80,23 +51,7 @@ THE SOFTWARE.
                                     <j:set var="it" value="${item}"/>
                                     <j:set var="instance" value="${null}"/>
                                     <j:set var="help" value="${descriptor.helpFile}"/>
-                                    
-                                    <j:if test="${help != null}">
-                                        <j:choose>
-                                            <j:when test="${divBasedFormLayout}">
-                                                <div class="snippetizer-help">
-                                                    <f:entry help="${help}" />
-                                                </div>
-                                            </j:when>
-                                            <j:otherwise>
-                                                <tr>
-                                                    <td colspan="3"/>
-                                                    <f:helpLink url="${help}"/>
-                                                </tr>
-                                            </j:otherwise>
-                                        </j:choose>
-                                        <f:helpArea/>
-                                    </j:if>
+                                    <f:entry title="STEP: &lt;code&gt;${quasiDescriptor.symbol}&lt;code&gt;" help="${help}" />
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
                                         <f:block>
                                             ${%This step has not yet defined any visual configuration.}
@@ -108,13 +63,11 @@ THE SOFTWARE.
                     </d:tag>
                 </d:taglib>
 
-                <local:snippetizerOptionsWrapper>
-                    <f:dropdownList name="prototype" title="${%Sample Step}">
-                        <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
-                        <f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
-                        <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
-                    </f:dropdownList>
-                </local:snippetizerOptionsWrapper>
+                <f:dropdownList name="prototype" title="${%Sample Step}">
+                    <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
+                    <f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
+                    <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
+                </f:dropdownList>
 
                 <j:set var="id" value="${h.generateId()}"/>
                 <f:block>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
index ee051a2c4..87e04a295 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css
@@ -99,10 +99,6 @@ z.root>dt {
   padding-bottom: 0
 }
 
-.snippetizer-help {
-  height: 20px;
-}
-
 .array-title {
   border-left: 1px solid #eee;
   padding-left: 10px;

From e6519b470814c54f66d67eb5be8c422747fd39c2 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Tue, 16 Feb 2021 09:26:16 -0800
Subject: [PATCH 6/8] Fix symbol generation for steps

---
 .../plugins/workflow/cps/Snippetizer/index.jelly          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 04ec91432..901fed9c7 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -42,16 +42,16 @@ THE SOFTWARE.
                 <!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
                 <j:set var="item" value="${it.getItem(request)}"/>
                 <d:taglib uri="local">
-
                     <d:tag name="listSteps">
                         <j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
                             <j:set var="descriptor" value="${quasiDescriptor.real}"/>
-                            <f:dropdownListBlock title="${quasiDescriptor.symbol}: ${descriptor.displayName}" staplerClass="${descriptor.clazz.name}" lazy="descriptor,item">
+                            <j:set var="symbol" value="${quasiDescriptor.symbol}"/>
+                            <f:dropdownListBlock title="${symbol}: ${descriptor.displayName}" staplerClass="${descriptor.clazz.name}" lazy="descriptor,item,symbol">
                                 <l:ajax>
                                     <j:set var="it" value="${item}"/>
                                     <j:set var="instance" value="${null}"/>
                                     <j:set var="help" value="${descriptor.helpFile}"/>
-                                    <f:entry title="STEP: &lt;code&gt;${quasiDescriptor.symbol}&lt;code&gt;" help="${help}" />
+                                    <f:entry title="&lt;strong&gt;&lt;code&gt;${symbol}&lt;code&gt;&lt;/strong&gt;" help="${help}" />
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
                                         <f:block>
                                             ${%This step has not yet defined any visual configuration.}
@@ -62,13 +62,11 @@ THE SOFTWARE.
                         </j:forEach>
                     </d:tag>
                 </d:taglib>
-
                 <f:dropdownList name="prototype" title="${%Sample Step}">
                     <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
                     <f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
                     <local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
                 </f:dropdownList>
-
                 <j:set var="id" value="${h.generateId()}"/>
                 <f:block>
                     <input type="button" value="${%Generate Pipeline Script}" onclick="handlePrototype_${id}(); return false" class="submit-button primary"/>

From 73fd7b116cbe49b85682b071e576db40bbe8e6eb Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Tue, 16 Feb 2021 11:13:16 -0800
Subject: [PATCH 7/8] Remove markup from title

---
 .../org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 901fed9c7..5fc6969a7 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -51,7 +51,7 @@ THE SOFTWARE.
                                     <j:set var="it" value="${item}"/>
                                     <j:set var="instance" value="${null}"/>
                                     <j:set var="help" value="${descriptor.helpFile}"/>
-                                    <f:entry title="&lt;strong&gt;&lt;code&gt;${symbol}&lt;code&gt;&lt;/strong&gt;" help="${help}" />
+                                    <f:entry title="STEP: ${symbol}" help="${help}" />
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
                                         <f:block>
                                             ${%This step has not yet defined any visual configuration.}

From 6467f4f1b7842ce7d0c3ed7ad01eb62b5098b724 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Tue, 16 Feb 2021 13:49:55 -0800
Subject: [PATCH 8/8] Update
 src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 .../org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
index 5fc6969a7..9e97d06cd 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly
@@ -51,7 +51,7 @@ THE SOFTWARE.
                                     <j:set var="it" value="${item}"/>
                                     <j:set var="instance" value="${null}"/>
                                     <j:set var="help" value="${descriptor.helpFile}"/>
-                                    <f:entry title="STEP: ${symbol}" help="${help}" />
+                                    <f:entry title="${symbol}" help="${help}" />
                                     <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
                                         <f:block>
                                             ${%This step has not yet defined any visual configuration.}