Merge remote-tracking branch 'origin/master' into antlr4

jenkinsci · Apr 28, 2023 · 7711719 · 7711719
2 parents 12b1b34 + c23caa9
commit 7711719
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 48 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,5 @@
-buildPlugin(configurations: [
+buildPlugin(useContainerAgent: true, configurations: [
     [platform: 'linux', jdk: '11'],
     [platform: 'windows', jdk: '11'],
+    [platform: 'linux', jdk: '17'],
 ])
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.49</version>
+    <version>4.61</version>
     <relativePath />
   </parent>
 
@@ -67,7 +67,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-    <jenkins.version>2.376</jenkins.version>
+    <jenkins.version>2.387.1</jenkins.version>
   </properties>
 
   <repositories>
@@ -87,8 +87,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
-        <version>1654.vcb_69d035fa_20</version>
+        <artifactId>bom-2.387.x</artifactId>
+        <version>1836.vfe602c266c05</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-matchers</artifactId>
-      <version>2.9.0</version>
+      <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -195,9 +195,9 @@
       <id>pdfs</id>
       <properties>
         <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
-        <asciidoctorj.pdf.version>2.3.0</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.5</asciidoctorj.version>
-        <jruby.version>9.3.4.0</jruby.version>
+        <asciidoctorj.pdf.version>2.3.4</asciidoctorj.pdf.version>
+        <asciidoctorj.version>2.5.7</asciidoctorj.version>
+        <jruby.version>9.4.1.0</jruby.version>
       </properties>
       <build>
         <plugins>

diff --git a/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java
@@ -629,7 +629,7 @@ public CredentialsStore getStore() {
         @Override
         public String getIconFileName() {
             return isVisible()
-                    ? "symbol-jenkins"
+                    ? "/plugin/credentials/images/system-store.svg"
                     : null;
         }
 
@@ -639,7 +639,7 @@ public String getIconFileName() {
         @Override
         public String getIconClassName() {
             return isVisible()
-                    ? "symbol-jenkins"
+                    ? "icon-credentials-system-store icon-sm"
                     : null;
         }
 

diff --git a/...loudbees/plugins/credentials/CredentialsSelectHelper/WrappedCredentialsStore/dialog.jelly b/...loudbees/plugins/credentials/CredentialsSelectHelper/WrappedCredentialsStore/dialog.jelly
@@ -44,10 +44,8 @@
             <st:include page="credential"/>
           </f:block>
           <f:block>
-            <input id="credentials-add-submit" class="yui-button primary" value="${%Add}"
-                   onclick="return window.credentials.addSubmit(this);"/>
-            <input id="credentials-add-abort" class="yui-button"
-                   onclick="window.credentials.dialog.hide(); return false;" value="${%Cancel}"/>
+            <input id="credentials-add-submit" class="yui-button primary" value="${%Add}"/>
+            <input id="credentials-add-abort" class="yui-button" value="${%Cancel}"/>
           </f:block>
         </table>
       </form>

diff --git a/...ources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly b/...ources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly
@@ -26,27 +26,27 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
          xmlns:f="/lib/form" xmlns:c="/lib/credentials"  xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName}" permission="${it.parent.VIEW}" type="one-column">
-    <l:app-bar title="${it.displayName}">
-      <l:hasPermission permission="${it.parent.CREATE}">
-        <a href="newCredentials" class="jenkins-button jenkins-button--primary">
-          <l:icon src="symbol-add" />
-          ${%Add Credentials}
-        </a>
-      </l:hasPermission>
-      <j:if test="${!it.global and it.parent.domainsModifiable}">
+    <l:main-panel>
+      <l:app-bar title="${it.displayName}">
         <l:hasPermission permission="${it.parent.CREATE}">
-          <a href="configure" class="jenkins-button">
-            <l:icon class="icon-setting icon-md" />
-            ${%Configure domain}
-          </a>
-          <a href="delete" class="jenkins-button jenkins-button--destructive jenkins-!-destructive-color">
-            <l:icon class="icon-edit-delete icon-md" />
-            ${%Delete domain}
+          <a href="newCredentials" class="jenkins-button jenkins-button--primary">
+            <l:icon src="symbol-add" />
+            ${%Add Credentials}
           </a>
         </l:hasPermission>
-      </j:if>
-    </l:app-bar>
-    <l:main-panel>
+        <j:if test="${!it.global and it.parent.domainsModifiable}">
+          <l:hasPermission permission="${it.parent.CREATE}">
+            <a href="configure" class="jenkins-button">
+              <l:icon class="icon-setting icon-md" />
+              ${%Configure domain}
+            </a>
+            <a href="delete" class="jenkins-button jenkins-button--destructive jenkins-!-destructive-color">
+              <l:icon class="icon-edit-delete icon-md" />
+              ${%Delete domain}
+            </a>
+          </l:hasPermission>
+        </j:if>
+      </l:app-bar>
       <div>
         <j:out value="${it.description!=null ? app.markupFormatter.translate(it.description) : ''}" />
       </div>

diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
@@ -35,18 +35,17 @@
     </j:when>
     <j:otherwise>
       <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
-        <l:app-bar title="${it.displayName}">
-          <j:if test="${it.domainsModifiable}">
-            <l:hasPermission permission="${it.parent.CREATE}">
-              <a href="newDomain" class="jenkins-button jenkins-button--primary">
-                <l:icon src="symbol-add" />
-                ${%Add domain}
-              </a>
-            </l:hasPermission>
-          </j:if>
-        </l:app-bar>
-
         <l:main-panel>
+          <l:app-bar title="${it.displayName}">
+            <j:if test="${it.domainsModifiable}">
+              <l:hasPermission permission="${it.parent.CREATE}">
+                <a href="newDomain" class="jenkins-button jenkins-button--primary">
+                  <l:icon src="symbol-add" />
+                  ${%Add domain}
+                </a>
+              </l:hasPermission>
+            </j:if>
+          </l:app-bar>
           <t:setIconSize/>
           <table class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
             <thead>

diff --git a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
@@ -26,8 +26,8 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
-    <l:app-bar title="${%Credentials}" />
     <l:main-panel>
+      <l:app-bar title="${%Credentials}" />
       <style>
         .masked-credential {
           filter: grayscale(100%); /* Real browsers */

diff --git a/src/main/resources/lib/credentials/dialog.js b/src/main/resources/lib/credentials/dialog.js
@@ -0,0 +1,7 @@
+Behaviour.specify("#credentials-add-submit", 'credentials-dialog-add', 0, function (e) {
+    e.onclick = (_) => window.credentials.addSubmit(e);
+});
+
+Behaviour.specify("#credentials-add-abort", 'credentials-dialog-abort', 0, function (e) {
+    e.onclick = (_) => window.credentials.dialog.hide();
+});
diff --git a/src/main/resources/lib/credentials/select.jelly b/src/main/resources/lib/credentials/select.jelly
@@ -65,6 +65,7 @@
   <j:set var="selectHelper" value="${app.getDescriptorByName('com.cloudbees.plugins.credentials.CredentialsSelectHelper')}"/>
   <j:set var="includeUser" value="${attrs.includeUser ? true : false}"/>
   <j:set var="context" value="${selectHelper.resolveContext(attrs.context ?: it)}"/>
+  <st:adjunct includes="lib.credentials.dialog"/>
   <div class="credentials-select-control">
     <j:if test="${attrs.expressionAllowed}">
       <label field-disabled="true">
@@ -114,7 +115,7 @@
       <j:set var="storeItems" value="${selectHelper.getStoreItems(context, includeUser)}"/>
       <j:choose>
         <j:when test="${selectHelper.hasCreatePermission(context, includeUser) and storeItems != null and !storeItems.isEmpty()}">
-          <button class="credentials-add-menu hetero-list-add jenkins-button jenkins-button--transparent jenkins-button--tertiary jenkins-!-margin-top-2" menualign="${attrs.menuAlign}"
+          <button class="credentials-add-menu hetero-list-add jenkins-!-margin-top-2" menualign="${attrs.menuAlign}"
                   suffix="${attrs.name}">
             <l:icon src="symbol-add"/>
             ${%Add}
@@ -147,7 +148,7 @@
           </div>
         </j:when>
         <j:otherwise>
-          <button class="credentials-add jenkins-button jenkins-button--transparent jenkins-button--tertiary jenkins-!-margin-top-2">
+          <button class="credentials-add jenkins-!-margin-top-2">
             <l:icon src="symbol-add"/>
             ${%Add}
           </button>

diff --git a/src/main/resources/lib/credentials/select/select.css b/src/main/resources/lib/credentials/select/select.css
@@ -1,5 +1,4 @@
 select.credentials-select {  width:auto; vertical-align: top; }
-button.credentials-add-menu { padding:0 20px 0 10px; }
 div.credentials-select-content-inactive { display:none; }
 div#credentialsDialog {overflow-y: scroll;}
 body.masked {overflow-y: hidden;}