[JENKINS-68195] Duplicated help icon for Host Key verification (#283)

* [JENKINS-68195] Duplicated help icon for Host Key verification * chore: add vscode to gitignore * feat: bump Jenkins core to 2.346.2 * fix: remove not longer needed change * feat: compile only with JDK 11 * fix: update bom dependencies
jenkinsci · Jul 15, 2022 · 622da57 · 622da57
1 parent 2034cd7
commit 622da57
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ target
 work
 bin
 .DS_Store
+.vscode
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,8 +1,7 @@
 //def buildConfiguration = buildPlugin.recommendedConfigurations()
 
 def buildConfiguration = [
-  [platform: 'linux',   jdk: '8'],
-  [platform: 'windows', jdk: '8'],
+  [platform: 'windows', jdk: '11'],
   [platform: 'linux',   jdk: '11'],
 ]
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <revision>1</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.319.1</jenkins.version>
+    <jenkins.version>2.346.2</jenkins.version>
     <java.level>8</java.level>
     <hpi.compatibleSinceVersion>1.31.0</hpi.compatibleSinceVersion>
   </properties>
@@ -102,7 +102,7 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.319.x</artifactId>
+        <artifactId>bom-2.346.x</artifactId>
         <version>1478.v81d3dc4f9a_43</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/src/main/resources/hudson/plugins/sshslaves/SSHConnector/config.jelly b/src/main/resources/hudson/plugins/sshslaves/SSHConnector/config.jelly
@@ -5,7 +5,7 @@
       <c:select checkMethod="post"/>
   </f:entry>
 
-  <f:dropdownDescriptorSelector title="${%Host Key Verification Strategy}" field="sshHostKeyVerificationStrategy" />
+  <f:dropdownDescriptorSelector field="sshHostKeyVerificationStrategy" title="${%Host Key Verification Strategy}"/>
 
   <f:advanced>
       <f:entry title="${%Port}" field="port">

diff --git a/...ces/hudson/plugins/sshslaves/verifiers/KnownHostsFileKeyVerificationStrategy/config.jelly b/...ces/hudson/plugins/sshslaves/verifiers/KnownHostsFileKeyVerificationStrategy/config.jelly
@@ -23,15 +23,4 @@ THE SOFTWARE.
 -->
 <?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">
-
-	<!-- the enclosing drop down list does not show a changeable help field for each type so we manually show one in its absence -->
-	<j:set var="help" value="${descriptor.helpFile}"/>
-    <j:if test="${help != null}">
-        <tr>
-            <td colspan="3"/>
-            <f:helpLink url="${help}"/>
-        </tr>
-        <f:helpArea/>
-    </j:if>
-
-</j:jelly>
+</j:jelly>
diff --git a/...s/hudson/plugins/sshslaves/verifiers/ManuallyProvidedKeyVerificationStrategy/config.jelly b/...s/hudson/plugins/sshslaves/verifiers/ManuallyProvidedKeyVerificationStrategy/config.jelly
@@ -23,19 +23,8 @@ THE SOFTWARE.
 -->
 <?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">
-
-	<!-- the enclosing drop down list does not show a changeable help field for each type so we manually show one in its absence -->
-	<j:set var="help" value="${descriptor.helpFile}"/>
-    <j:if test="${help != null}">
-        <tr>
-            <td colspan="3"/>
-            <f:helpLink url="${help}"/>
-        </tr>
-        <f:helpArea/>
-    </j:if>           
-
 	<f:entry title="${%SSH Key}" field="key">
 		<f:textarea checkMethod="post"/>
 	</f:entry>
 
-</j:jelly>
+</j:jelly>
diff --git a/...es/hudson/plugins/sshslaves/verifiers/ManuallyTrustedKeyVerificationStrategy/config.jelly b/...es/hudson/plugins/sshslaves/verifiers/ManuallyTrustedKeyVerificationStrategy/config.jelly
@@ -23,18 +23,7 @@ THE SOFTWARE.
 -->
 <?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">
-
-	<!-- the enclosing drop down list does not show a changeable help field for each type so we manually show one in its absence -->
-	<j:set var="help" value="${descriptor.helpFile}"/>
-    <j:if test="${help != null}">
-        <tr>
-            <td colspan="3"/>
-            <f:helpLink url="${help}"/>
-        </tr>
-        <f:helpArea/>
-    </j:if>
-
 	<f:entry title="${%Require manual verification of initial connection}" field="requireInitialManualTrust">
 		<f:checkbox />
 	</f:entry>
-</j:jelly>
+</j:jelly>
diff --git a/...urces/hudson/plugins/sshslaves/verifiers/NonVerifyingKeyVerificationStrategy/config.jelly b/...urces/hudson/plugins/sshslaves/verifiers/NonVerifyingKeyVerificationStrategy/config.jelly
@@ -23,15 +23,4 @@ THE SOFTWARE.
 -->
 <?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">
-
-	<!-- the enclosing drop down list does not show a changeable help field for each type so we manually show one in its absence -->
-	<j:set var="help" value="${descriptor.helpFile}"/>
-    <j:if test="${help != null}">
-        <tr>
-            <td colspan="3"/>
-            <f:helpLink url="${help}"/>
-        </tr>
-        <f:helpArea/>
-    </j:if>
-
-</j:jelly>
+</j:jelly>