From 1fd82213dde337c61192b57fc8139f88c0c240f8 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 10 Jun 2023 13:04:28 -0600
Subject: [PATCH] Remove unused divBasedFormLayout conditionals in jelly files

Jenkins 2.277.1 (or newer) has long been the minimum required Jenkins
version for this plugin.
---
 .../PromotionProcess/process-config.jelly     | 10 ++++----
 .../PublisherImpl/config.jelly                | 10 ++++----
 .../lib/promoted_builds/blockWrapper.jelly    | 23 -------------------
 3 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/resources/lib/promoted_builds/blockWrapper.jelly

diff --git a/src/main/resources/hudson/plugins/promoted_builds/PromotionProcess/process-config.jelly b/src/main/resources/hudson/plugins/promoted_builds/PromotionProcess/process-config.jelly
index a26558b5..f6f5c964 100644
--- a/src/main/resources/hudson/plugins/promoted_builds/PromotionProcess/process-config.jelly
+++ b/src/main/resources/hudson/plugins/promoted_builds/PromotionProcess/process-config.jelly
@@ -1,8 +1,8 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:p="/lib/promoted_builds">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <fieldset style="margin-bottom:1em">
     <legend>${%Promotion process}</legend>
-    <p:blockWrapper>
+    <div>
       <f:entry title="Name" field="name">
         <f:textbox />
       </f:entry>
@@ -51,9 +51,9 @@
 
       <f:section title="Criteria">
         <f:nested>
-          <p:blockWrapper>
+          <div>
             <f:descriptorList field="conditions" descriptors="${descriptor.getApplicableConditions(it)}" />
-          </p:blockWrapper>
+          </div>
         </f:nested>
       </f:section>
  
@@ -81,6 +81,6 @@
           <input type="button" value="${%Delete this promotion process}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
         </div>
       </f:entry>
-    </p:blockWrapper>
+    </div>
   </fieldset>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/promoted_builds/PublisherImpl/config.jelly b/src/main/resources/hudson/plugins/promoted_builds/PublisherImpl/config.jelly
index 5d2cee20..905e4196 100644
--- a/src/main/resources/hudson/plugins/promoted_builds/PublisherImpl/config.jelly
+++ b/src/main/resources/hudson/plugins/promoted_builds/PublisherImpl/config.jelly
@@ -1,9 +1,9 @@
 <?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" xmlns:p="/lib/promoted_builds">
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:nested>
     <f:repeatable var="s" items="${instance.criteria}" noAddButton="true" minimum="1" name="criteria">
-      <p:blockWrapper>
+      <div>
         <f:entry title="Name">
           <f:textbox name="criteria.name" value="${s.name}" />
         </f:entry>
@@ -11,9 +11,9 @@
           Promote a build when all of the following conditions are met:
         </f:block>
         <f:entry>
-          <p:blockWrapper>
+          <div>
             <f:descriptorList varName="condition" descriptors="${descriptor.getApplicableConditions(it)}" instances="${s.conditions.toMap()}" />
-          </p:blockWrapper>
+          </div>
         </f:entry>
 
         <f:entry>
@@ -22,7 +22,7 @@
             <input type="button" value="Delete" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
           </div>
         </f:entry>
-      </p:blockWrapper>
+      </div>
     </f:repeatable>
   </f:nested>
 </j:jelly>
diff --git a/src/main/resources/lib/promoted_builds/blockWrapper.jelly b/src/main/resources/lib/promoted_builds/blockWrapper.jelly
deleted file mode 100644
index 266a0049..00000000
--- a/src/main/resources/lib/promoted_builds/blockWrapper.jelly
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:documentation>
-    This adds a wrapper allowing adding an ID to a field or group of fields that can be targeted by JavaScript
-    The wrapper will be a `table` tag before form layout changes are merged: https://github.com/jenkinsci/jenkins/pull/3895,
-    and a `div` tag after that.
-    
-  </st:documentation>
-
-  <j:choose>
-    <j:when test="${divBasedFormLayout}">
-      <div>
-        <d:invokeBody/>
-      </div>
-    </j:when>
-    <j:otherwise>
-      <table>
-        <d:invokeBody/>
-      </table>
-    </j:otherwise>
-  </j:choose>
-
-</j:jelly>