From 2865c6032cb130a1472596a45f8a0e5824fb7341 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 23 Mar 2024 07:35:14 -0600
Subject: [PATCH] Remove divBasedFormLayout UI conditional

Jenkins 2.277.x introduced the layout change from tables to divs.  Since
the plugin requires Jenkins 2.387.3 or newer, the divBasedFormLayout
conditional is always true.  Remove the conditional and use '<div>'
directly in the jelly file.
---
 .../plugins/s3/S3BucketPublisher/global.jelly    |  4 ++--
 .../resources/lib/s3Plugin/blockWrapper.jelly    | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/resources/lib/s3Plugin/blockWrapper.jelly

diff --git a/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly b/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
index 67e5eb9e..018ec425 100644
--- a/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
+++ b/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
@@ -4,7 +4,7 @@
   <f:section title="Amazon S3 profiles">
     <f:entry title="S3 profiles" description="Profiles for publishing to S3 buckets">
       <f:repeatable var="profile" items="${descriptor.profiles}">
-        <s3:blockWrapper>
+        <div>
           <f:entry title="Profile name" help="/plugin/s3/help-profile.html">
             <f:textbox name="name" value="${profile.name}" />
           </f:entry>
@@ -48,7 +48,7 @@
             </div>
           </f:entry>
 
-        </s3:blockWrapper>
+        </div>
       </f:repeatable>
     </f:entry>
   </f:section>
diff --git a/src/main/resources/lib/s3Plugin/blockWrapper.jelly b/src/main/resources/lib/s3Plugin/blockWrapper.jelly
deleted file mode 100644
index 1077c59c..00000000
--- a/src/main/resources/lib/s3Plugin/blockWrapper.jelly
+++ /dev/null
@@ -1,16 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
-  <!-- TODO remove and switch to div after baseline is 2.264 or newer -->
-  <j:choose>
-    <j:when test="${divBasedFormLayout}">
-      <div>
-        <d:invokeBody/>
-      </div>
-    </j:when>
-    <j:otherwise>
-      <table width="100%" padding="0">
-        <d:invokeBody/>
-      </table>
-    </j:otherwise>
-  </j:choose>
-</j:jelly>