JENKINS-64078 Fix plugin on 2.264

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.2</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

pom.xml

@@ -29,18 +29,21 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.50</version>
+        <version>4.12</version>
     </parent>
 
     <artifactId>publish-over-ssh</artifactId>
     <packaging>hpi</packaging>
     <name>Publish Over SSH</name>
-    <version>1.21-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <description>Send build artifacts over SSH</description>
     <url>https://github.com/jenkinsci/publish-over-ssh-plugin</url>
 
     <properties>
-        <jenkins.version>2.60.3</jenkins.version>
+        <revision>1.21</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/publish-over-ssh-plugin</gitHubRepo>
+        <jenkins.version>2.235.1</jenkins.version>
         <java.level>8</java.level>
     </properties>
 
@@ -60,11 +63,22 @@
         </developer>
     </developers>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.jenkins.tools.bom</groupId>
+                <artifactId>bom-2.235.x</artifactId>
+                <version>16</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.55.1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -74,12 +88,10 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
-            <version>1.14</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -97,16 +109,15 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>2.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <scm>
-        <url>https://github.com/jenkinsci/publish-over-ssh-plugin</url>
-        <connection>scm:git:git://github.com/jenkinsci/publish-over-ssh-plugin.git</connection>
-        <developerConnection>scm:git:[email protected]:jenkinsci/publish-over-ssh-plugin.git</developerConnection>
-        <tag>HEAD</tag>
+        <url>https://github.com/${gitHubRepo}</url>
+        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <tag>${scmTag}</tag>
     </scm>
 
     <issueManagement>

src/main/resources/jenkins/plugins/publish_over_ssh/BapSshPublisher/config.jelly

@@ -24,7 +24,7 @@
   ~ THE SOFTWARE.
   -->
 
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:poj="/pojelly">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:poj="/pojelly" xmlns:s="/lib/publishoverssh">
 
     <poj:defaultMessages/>
 
@@ -66,14 +66,14 @@
         <j:scope>
             <j:set var="descriptor" value="${descriptor.transferDescriptor}"/>
             <f:repeatable items="${instance.transfers}" var="instance" name="transfers" minimum="1" header="${m.transfers_dragAndDropLabel()}" add="${m.addTransfer()}">
-                <table width="100%" padding="0" class="ssh-transfer">
+                <s:blockWrapper> width="100%" padding="0" class="ssh-transfer">
                     <st:include page="config.jelly" class="${descriptor.clazz}"/>
                     <f:entry title="">
                         <div align="right" class="show-if-not-only">
                             <f:repeatableDeleteButton value="${m.deleteTransfer()}"/>
                         </div>
                     </f:entry>
-                </table>
+                </s:blockWrapper>
             </f:repeatable>
         </j:scope>
     </f:entry>

src/main/resources/jenkins/plugins/publish_over_ssh/BapSshPublisherPlugin/config.jelly

@@ -24,7 +24,7 @@
   ~ THE SOFTWARE.
   -->
 
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:poj="/pojelly">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:poj="/pojelly" xmlns:s="/lib/publishoverssh">
 
     <j:set var="defaults" value="${descriptor.defaults}"/>
 
@@ -46,14 +46,14 @@
         <j:scope>
             <j:set var="descriptor" value="${descriptor.publisherDescriptor}"/>
             <f:repeatable items="${instance.publishers}" var="instance" name="publishers" minimum="1" header="${%publisher.dragAndDropLabel}" add="${m.addPublisher()}">
-                <table width="100%" padding="0">
+                <s:blockWrapper>
                     <st:include page="config.jelly" class="${descriptor.clazz}"/>
                     <f:entry title="">
                         <div align="right" class="show-if-not-only">
                             <f:repeatableDeleteButton value="${m.deletePublisher()}"/>
                         </div>
                     </f:entry>
-                </table>
+                </s:blockWrapper>
             </f:repeatable>
         </j:scope>
 

src/main/resources/jenkins/plugins/publish_over_ssh/BapSshPublisherPlugin/global.jelly

@@ -24,7 +24,8 @@
   ~ THE SOFTWARE.
   -->
 
-<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">
+<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:s="/lib/publishoverssh">
 
     <j:set var="m" value="${descriptor.commonManageMessages}"/>
 
@@ -35,14 +36,14 @@
             <j:scope>
                 <j:set var="descriptor" value="${descriptor.hostConfigurationDescriptor}"/>
                 <f:repeatable var="instance" items="${instance.hostConfigurations}" header="${%hostconfig.dragAndDrop}">
-                    <table width="100%">
+                    <s:blockWrapper>
                         <st:include page="config.jelly" class="${descriptor.clazz}"/>
                         <f:entry title="">
                             <div align="right">
                                 <f:repeatableDeleteButton />
                             </div>
                         </f:entry>
-                    </table>
+                    </s:blockWrapper>
                 </f:repeatable>
             </j:scope>
         </f:entry>

src/main/resources/lib/publishoverssh/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>