JENKINS-64502 Fix plugin on Jenkins >=2.264 (#159)

jenkinsci · Dec 23, 2020 · f2e7778 · f2e7778
1 parent baa3845
commit f2e7778
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.7</version>
+    <version>4.15</version>
     <relativePath />
   </parent>
 
@@ -117,7 +117,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-auth</artifactId>
-      <version>2.6.4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -144,7 +143,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>token-macro</artifactId>
-      <version>2.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -154,7 +152,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.263.x</artifactId>
-        <version>19</version>
+        <version>20</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/src/main/resources/hudson/plugins/parameterizedtrigger/BooleanParameters/config.jelly b/src/main/resources/hudson/plugins/parameterizedtrigger/BooleanParameters/config.jelly
@@ -3,15 +3,15 @@
   <f:entry title="" field="configs">
     <f:repeatable field="configs" noAddButton="true" minimum="1">
       <j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
-      <table width="100%">
+      <div>
         <st:include class="${descriptor.clazz}" page="config.jelly" />
         <f:entry>
           <div align="right">
             <input type="button" value="${%Add parameter...}" class="repeatable-add show-if-last" />
             <input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
           </div>
         </f:entry>
-      </table>
+      </div>
     </f:repeatable>
   </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/parameterizedtrigger/BuildTrigger/config.jelly b/src/main/resources/hudson/plugins/parameterizedtrigger/BuildTrigger/config.jelly
@@ -4,7 +4,7 @@
     <f:repeatable field="configs" noAddButton="true" minimum="1">
       <j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
       <j:set var="configFor" value="publisher" /> <!-- used for views of AbstractBuildParameters to determine called for builder or publisher -->
-      <table width="100%">
+      <div>
         <st:include class="${descriptor.clazz}" page="config.jelly" />
 
         <f:entry>
@@ -13,7 +13,7 @@
             <input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
           </div>
         </f:entry>
-      </table>
+      </div>
     </f:repeatable>
   </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/parameterizedtrigger/TriggerBuilder/config.jelly b/src/main/resources/hudson/plugins/parameterizedtrigger/TriggerBuilder/config.jelly
@@ -4,7 +4,7 @@
     <f:repeatable field="configs" noAddButton="true" minimum="1">
       <j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
       <j:set var="configFor" value="builder" /> <!-- used for views of AbstractBuildParameters to determine called for builder or publisher -->
-      <table width="100%">
+      <div>
         <st:include class="${descriptor.clazz}" page="config.jelly" />
 
         <f:entry>
@@ -13,7 +13,7 @@
             <input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
           </div>
         </f:entry>
-      </table>
+      </div>
     </f:repeatable>
   </f:entry>
 </j:jelly>