From 7390cbac94dded26d311e261901cf6dcd5484339 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Sat, 19 Dec 2020 09:17:06 +0000
Subject: [PATCH 1/3] Refresh plugin

---
 pom.xml | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index d03dfc31..8c525e39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.51</version>
+        <version>4.14</version>
     </parent>
 
     <artifactId>vsphere-cloud</artifactId>
@@ -18,7 +18,7 @@
     <licenses>
         <license>
             <name>Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
             <comments>A business-friendly OSS license</comments>
         </license>
@@ -61,27 +61,50 @@
         <revision>2.25</revision>
         <changelist>-SNAPSHOT</changelist>
         <java.level>8</java.level>
-        <jenkins.version>2.60.3</jenkins.version>
+        <jenkins.version>2.235.5</jenkins.version>
         <spotbugs.skip>true</spotbugs.skip>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.jenkins.tools.bom</groupId>
+                <artifactId>bom-2.235.x</artifactId>
+                <version>19</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
-            <version>2.1.2</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>cloudbees-folder</artifactId>
-            <version>5.2.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>command-launcher</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.toastcoders</groupId>
             <artifactId>yavijava</artifactId>
             <version>6.0.05</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <!-- https://github.com/yavijava/yavijava/issues/272 and https://github.com/yavijava/yavijava/issues/234 -->
+                <exclusion>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -91,24 +114,19 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>ssh-slaves</artifactId>
-            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>io.jenkins</groupId>
             <artifactId>configuration-as-code</artifactId>
-            <version>1.32</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.jenkins</groupId>
-            <artifactId>configuration-as-code</artifactId>
-            <version>1.32</version>
-            <classifier>tests</classifier>
+            <groupId>io.jenkins.configuration-as-code</groupId>
+            <artifactId>test-harness</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 554ee5be526967240fdde2ee3b67389b113df3fc Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Sat, 19 Dec 2020 09:30:10 +0000
Subject: [PATCH 2/3] JENKINS-64357 Fix plugin on Jenkins >2.263

---
 .../resources/lib/vsphere/blockWrapper.jelly     | 16 ++++++++++++++++
 src/main/resources/lib/vsphere/taglib            |  0
 .../plugins/vSphereCloud/config-inner.jelly      |  6 +++---
 .../vSphereCloudSlave/configure-entries.jelly    | 12 ++----------
 .../vSphereCloudSlaveTemplate/config.jelly       |  6 +++---
 .../VSphereGuestInfoProperty/config.jelly        |  6 +++---
 .../ReconfigureNetworkAdapters/config.jelly      | 10 +++++-----
 .../configure-entries.jelly                      | 12 ++----------
 8 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 src/main/resources/lib/vsphere/blockWrapper.jelly
 create mode 100644 src/main/resources/lib/vsphere/taglib

diff --git a/src/main/resources/lib/vsphere/blockWrapper.jelly b/src/main/resources/lib/vsphere/blockWrapper.jelly
new file mode 100644
index 00000000..d43a2fe5
--- /dev/null
+++ b/src/main/resources/lib/vsphere/blockWrapper.jelly
@@ -0,0 +1,16 @@
+<?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 style="width:100%">
+                <d:invokeBody/>
+            </table>
+        </j:otherwise>
+    </j:choose>
+</j:jelly>
diff --git a/src/main/resources/lib/vsphere/taglib b/src/main/resources/lib/vsphere/taglib
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/resources/org/jenkinsci/plugins/vSphereCloud/config-inner.jelly b/src/main/resources/org/jenkinsci/plugins/vSphereCloud/config-inner.jelly
index 7ce3d623..c248a1e0 100644
--- a/src/main/resources/org/jenkinsci/plugins/vSphereCloud/config-inner.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vSphereCloud/config-inner.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
-    <table width="100%">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:v="/lib/vsphere">
+    <v:blockWrapper>
         <st:include page="config.jelly" class="${descriptor.clazz}"/>
-    </table>
+    </v:blockWrapper>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/configure-entries.jelly b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/configure-entries.jelly
index 9c407221..9fbf077b 100644
--- a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/configure-entries.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/configure-entries.jelly
@@ -64,11 +64,7 @@
                 <j:set var="descriptor" value="${d}"/>
                 <j:set var="instance"
                        value="${it.delegateLauncher.descriptor==d ? it.delegateLauncher : null}"/>
-                <tr>
-                    <td>
-                        <input type="hidden" name="stapler-class" value="${d.clazz.name}"/>
-                    </td>
-                </tr>
+                <f:invisibleEntry><input type="hidden" name="stapler-class" value="${d.clazz.name}"/></f:invisibleEntry>
                 <st:include from="${d}" page="${d.configPage}" optional="true"/>
             </f:dropdownListBlock>
         </j:forEach>
@@ -86,11 +82,7 @@
                         <j:set var="descriptor" value="${d}"/>
                         <j:set var="instance"
                                value="${it.retentionStrategy.descriptor==d ? it.retentionStrategy : null}"/>
-                        <tr>
-                            <td>
-                                <input type="hidden" name="stapler-class" value="${d.clazz.name}"/>
-                            </td>
-                        </tr>
+                        <f:invisibleEntry><input type="hidden" name="stapler-class" value="${d.clazz.name}"/></f:invisibleEntry>
                         <st:include from="${d}" page="${d.configPage}" optional="true"/>
                     </f:dropdownListBlock>
                 </j:if>
diff --git a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/config.jelly b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/config.jelly
index ab4f7095..261a2173 100644
--- a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/config.jelly
@@ -1,6 +1,6 @@
 <?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">
-    <table width="100%">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:v="/lib/vsphere">
+    <v:blockWrapper>
         <f:entry title="${%Clone Name Prefix}" field="cloneNamePrefix">
             <f:textbox/>
         </f:entry>
@@ -133,5 +133,5 @@
             </div>
         </f:entry>
 
-    </table>
+    </v:blockWrapper>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereGuestInfoProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereGuestInfoProperty/config.jelly
index 02d8c8fd..1d8a131a 100644
--- a/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereGuestInfoProperty/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereGuestInfoProperty/config.jelly
@@ -1,6 +1,6 @@
 <?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:c="/lib/credentials">
-    <table width="100%">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:v="/lib/vsphere">
+    <v:blockWrapper>
         <f:entry title="${%Property Name}" field="name">
             <f:textbox/>
         </f:entry>
@@ -8,5 +8,5 @@
         <f:entry title="${%Property Value}" field="value">
             <f:textbox/>
         </f:entry>
-    </table>
+    </v:blockWrapper>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/org/jenkinsci/plugins/vsphere/builders/ReconfigureNetworkAdapters/config.jelly b/src/main/resources/org/jenkinsci/plugins/vsphere/builders/ReconfigureNetworkAdapters/config.jelly
index 000b9f06..7a2013fc 100644
--- a/src/main/resources/org/jenkinsci/plugins/vsphere/builders/ReconfigureNetworkAdapters/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vsphere/builders/ReconfigureNetworkAdapters/config.jelly
@@ -15,7 +15,7 @@ limitations under the License.
 -->
 <?jelly escape-by-default='true'?>
 
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:v="/lib/vsphere">
     <f:entry title="${%Action to Perform}" field="deviceAction">
         <f:enum>
             ${it.getLabel()}
@@ -31,18 +31,18 @@ limitations under the License.
     </f:entry>
 
     <f:block>
-        <table>
+        <v:blockWrapper>
             <f:optionalBlock name="standardSwitch" title="Configure VMWare Standard Switch"
                              inline="true" checked="${instance.standardSwitch}">
                 <f:entry title="${%Network Port Group}" field="portGroup">
                     <f:textbox  />
                 </f:entry>
             </f:optionalBlock>
-        </table>
+        </v:blockWrapper>
     </f:block>
 
     <f:block>
-        <table>
+        <v:blockWrapper>
             <f:optionalBlock name="distributedSwitch" title="Configure VMWare Distributed Switch"
                              inline="true" checked="${instance.distributedSwitch}">
                 <f:entry title="${%Distributed Port Group}" field="distributedPortGroup">
@@ -52,6 +52,6 @@ limitations under the License.
                     <f:textbox  />
                 </f:entry>
             </f:optionalBlock>
-        </table>
+        </v:blockWrapper>
     </f:block>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/configure-entries.jelly b/src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/configure-entries.jelly
index 0ed75678..4322334c 100644
--- a/src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/configure-entries.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/configure-entries.jelly
@@ -64,11 +64,7 @@
                 <j:set var="descriptor" value="${d}"/>
                 <j:set var="instance"
                        value="${it.delegateLauncher.descriptor==d ? it.delegateLauncher : null}"/>
-                <tr>
-                    <td>
-                        <input type="hidden" name="stapler-class" value="${d.clazz.name}"/>
-                    </td>
-                </tr>
+                <f:invisibleEntry><input type="hidden" name="stapler-class" value="${d.clazz.name}"/></f:invisibleEntry>
                 <st:include from="${d}" page="${d.configPage}" optional="true"/>
             </f:dropdownListBlock>
         </j:forEach>
@@ -86,11 +82,7 @@
                         <j:set var="descriptor" value="${d}"/>
                         <j:set var="instance"
                                value="${it.retentionStrategy.descriptor==d ? it.retentionStrategy : null}"/>
-                        <tr>
-                            <td>
-                                <input type="hidden" name="stapler-class" value="${d.clazz.name}"/>
-                            </td>
-                        </tr>
+                        <f:invisibleEntry><input type="hidden" name="stapler-class" value="${d.clazz.name}"/></f:invisibleEntry>
                         <st:include from="${d}" page="${d.configPage}" optional="true"/>
                     </f:dropdownListBlock>
                 </j:if>

From c90ec873830288655367f626293a2be96fd3b5d6 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Tue, 22 Dec 2020 00:04:50 +0000
Subject: [PATCH 3/3] Lower jenkins.version to 2.190.x

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c525e39..5181ccfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <revision>2.25</revision>
         <changelist>-SNAPSHOT</changelist>
         <java.level>8</java.level>
-        <jenkins.version>2.235.5</jenkins.version>
+        <jenkins.version>2.190.1</jenkins.version>
         <spotbugs.skip>true</spotbugs.skip>
     </properties>
 
@@ -69,8 +69,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.235.x</artifactId>
-                <version>19</version>
+                <artifactId>bom-2.190.x</artifactId>
+                <version>16</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>