Merge branch 'master' into feature/ConfigurePlotDimensions

jenkinsci · Mar 22, 2024 · 3ddb00c · 3ddb00c
2 parents 047e973 + 622687e
commit 3ddb00c
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 68 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,16 @@
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
+---
 version: 2
 updates:
   - package-ecosystem: "maven"
     directory: "/"
+    labels:
+      - "dependencies"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    labels:
+      - "skip-changelog"
     schedule:
       interval: "monthly"
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         with:
           publish: ${{ contains(github.event.head_commit.message, '[maven-release-plugin] prepare release') }}
         env:

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,16 +1,11 @@
-/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
 buildPlugin(
-  // Container agents start faster and are easier to administer
-  useContainerAgent: true,
-  // Show failures on all configurations
-  failFast: false,
-  // Opt-in to the Artifact Caching Proxy, to be removed when it will be in opt-out.
-  // See https://github.com/jenkins-infra/helpdesk/issues/2752 for more details and updates.
-  artifactCachingProxyEnabled: true,
-  // Test Java 8 with default Jenkins version, Java 11 with a recent LTS, Java 17 even more recent
+  forkCount: '1C', // Run parallel tests on ci.jenkins.io for lower costs, faster feedback
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux',   jdk: '17', jenkins: '2.375'],
-    [platform: 'linux',   jdk: '11', jenkins: '2.361.4'],
-    [platform: 'windows', jdk: '11']
-  ]
-)
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+])
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.54</version>
+    <version>4.76</version>
     <relativePath />
   </parent>
 
@@ -19,7 +19,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.361.x</artifactId>
-        <version>1798.vc671fe94856f</version>
+        <version>2102.v854b_fec19c92</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.opencsv</groupId>
       <artifactId>opencsv</artifactId>
-      <version>5.7.1</version>
+      <version>5.9</version>
     </dependency>
 
     <dependency>
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.1</version>
 	<!-- enable this when the plugin requires Java 11 -->
 	<!--
         <dependencies>

diff --git a/src/main/resources/hudson/plugins/plot/AbstractPlotPublisher/config.jelly b/src/main/resources/hudson/plugins/plot/AbstractPlotPublisher/config.jelly
@@ -6,14 +6,14 @@
  -->
 <?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:p="/lib/plot">
+  xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry>
     <f:repeatable var="plot" items="${instance.plots}" name="plots" add="${%Add Plot}" minimum="1">
       <div align="left">
         <f:repeatableDeleteButton value="${%Delete Plot}"/>
       </div>
       <input name="csvFileName" type="hidden" value="${plot.csvFileName}" />
-      <p:blockWrapper>
+      <div>
         <f:entry title="${%Plot group}" help="/plugin/plot/help-group.html">
           <f:textbox name="group" value="${plot.group}" clazz="required" />
         </f:entry>
@@ -73,7 +73,7 @@
 
         <f:entry title="" description="${%A new data series definition}">
           <f:repeatable var="series" items="${plot.series}" minimum="1">
-            <p:blockWrapperBackground>
+            <div>
               <f:entry title="${%Data series file}" help="/plugin/plot/help-series.html">
                 <f:textbox name="file" value="${series.file}"
                            checkUrl="'descriptorByName/hudson.plugins.plot.PlotPublisher/checkSeriesFile?value='+toValue(this)" />
@@ -180,7 +180,7 @@
                   <f:repeatableDeleteButton value="${%Delete Data Series}"/>
                 </div>
               </f:entry>
-            </p:blockWrapperBackground>
+            </div>
           </f:repeatable>
         </f:entry>
 
@@ -189,7 +189,7 @@
             <hr/>
           </f:block>
         </f:entry>
-      </p:blockWrapper>
+      </div>
     </f:repeatable>
   </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/plot/CSVSeries/config.jelly b/src/main/resources/hudson/plugins/plot/CSVSeries/config.jelly
@@ -1,8 +1,8 @@
 <?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:p="/lib/plot">
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry>
-    	<p:blockWrapperBackground>
+        <div>
             <f:entry title="${%Data series file}" field="file" help="/plugin/plot/help-series.html">
                 <f:textbox name="file" value="${series.file}"
                            checkUrl="'descriptorByName/hudson.plugins.plot.PlotPublisher/checkSeriesFile?value='+toValue(this)"/>
@@ -60,6 +60,6 @@
                     </div>
                 </f:entry>
             </f:nested>
-        </p:blockWrapperBackground>
+        </div>
     </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/plot/PlotBuilder/config.jelly b/src/main/resources/hudson/plugins/plot/PlotBuilder/config.jelly
@@ -6,11 +6,11 @@
  -->
 <?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:p="/lib/plot">
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry>
         <input name="csvFileName" type="hidden" value="${descriptor.csvFileName}" />
 
-        <p:blockWrapper>
+        <div>
             <f:entry title="${%Plot group}" field="group" help="/plugin/plot/help-group.html">
                 <f:textbox name="group" value="${plot.group}" clazz="required"/>
             </f:entry>
@@ -89,7 +89,7 @@
                 <f:repeatableProperty field="xmlSeries" add="Add XML series"/>
             </f:entry>
 
-        </p:blockWrapper>
+        </div>
 
     </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/plot/PropertiesSeries/config.jelly b/src/main/resources/hudson/plugins/plot/PropertiesSeries/config.jelly
@@ -1,7 +1,7 @@
 <?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:p="/lib/plot">
+<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">
     <f:entry>
-    <p:blockWrapperBackground>
+    <div>
     <f:entry title="${%Data series file}" help="/plugin/plot/help-series.html">
         <f:textbox name="file" value="${series.file}"
                    checkUrl="'descriptorByName/hudson.plugins.plot.PlotPublisher/checkSeriesFile?value='+toValue(this)" />
@@ -16,6 +16,6 @@
                 </div>
             </f:entry>
         </f:nested>
-    </p:blockWrapperBackground>
+    </div>
     </f:entry>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/plot/XMLSeries/config.jelly b/src/main/resources/hudson/plugins/plot/XMLSeries/config.jelly
@@ -1,7 +1,7 @@
 <?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:p="/lib/plot">
+<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">
     <f:entry>
-    <p:blockWrapperBackground>
+    <div>
     <f:entry title="${%Data series file}" help="/plugin/plot/help-series.html">
         <f:textbox name="file" value="${series.file}"
                    checkUrl="'descriptorByName/hudson.plugins.plot.PlotPublisher/checkSeriesFile?value='+toValue(this)" />
@@ -49,6 +49,6 @@
                 </div>
             </f:entry>
         </f:nested>
-    </p:blockWrapperBackground>
+    </div>
     </f:entry>
 </j:jelly>
diff --git a/src/main/resources/lib/plot/blockWrapper.jelly b/src/main/resources/lib/plot/blockWrapper.jelly
diff --git a/src/main/resources/lib/plot/blockWrapperBackground.jelly b/src/main/resources/lib/plot/blockWrapperBackground.jelly