Merge pull request #411 from bitwiseman/tables-to-divs

Handle tables-to-divs conversion
jenkinsci · Feb 16, 2021 · 6cc32e5 · 6cc32e5
2 parents cb1c80f + 6467f4f
commit 6cc32e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -65,7 +65,7 @@
         <revision>2.89</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>
@@ -77,8 +77,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>

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
@@ -45,18 +45,13 @@ THE SOFTWARE.
                     <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}"/>
-                                    <j:if test="${help != null}">
-                                        <tr>
-                                            <td colspan="3"/>
-                                            <f:helpLink url="${help}"/>
-                                        </tr>
-                                        <f:helpArea/>
-                                    </j:if>
+                                    <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.}