Merge remote-tracking branch 'upstream/master' into fix-Date-format-o…

…f-build-in-StageView
jenkinsci · Sep 1, 2024 · 44ec60f · 44ec60f
2 parents 2638934 + 6038968
commit 44ec60f
Show file tree

Hide file tree

Showing 12 changed files with 3,116 additions and 1,814 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @jenkinsci/pipeline-stage-view-plugin-developers
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,8 +3,12 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+  - package-ecosystem: "npm"
+    directory: "/ui"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml
@@ -0,0 +1,21 @@
+name: Jenkins Security Scan
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
+
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
+jobs:
+  security-scan:
+    uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
+    with:
+      java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
+      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -7,6 +7,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.7</version>
+    <version>1.8</version>
   </extension>
 </extensions>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,6 @@
 buildPlugin(
   useContainerAgent: true,
   configurations: [
-    [platform: "linux", jdk: "11"],
     [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    // TODO #341 error from parcel: [platform: 'windows', jdk: 17],
 ])
diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,6 @@
         <changelist>-SNAPSHOT</changelist>
         <node.version>18.7.0</node.version>
         <npm.version>8.15.0</npm.version>
-        <frontend-version>1.14.2</frontend-version>
     </properties>
 
     <repositories>

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/external/JobExt.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/external/JobExt.java
@@ -102,12 +102,17 @@ public static JobExt create(WorkflowJob job) {
     }
 
     private static int countRuns(WorkflowJob job) {
+        int maxRunsPerJob = Integer.getInteger(MAX_RUNS_PER_JOB_PROPERTY_NAME, MAX_RUNS_PER_JOB_DEFAULT);
+
         int count = 0;
 
-        // RunList.size() is deprecated, so iterating to count them.
+        // RunList.size() is deprecated *for a good reason*, so iterating to count them.
         RunList<WorkflowRun> runs = job.getBuilds();
         for (WorkflowRun run : runs) {
             count++;
+            if (count >= maxRunsPerJob) {
+                break;
+            }
         }
 
         return count;

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/hal/Link.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/hal/Link.java
@@ -23,6 +23,8 @@
  */
 package com.cloudbees.workflow.rest.hal;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 
 /**
  * HAL <a href="https://tools.ietf.org/html/draft-kelly-json-hal-06#section-5">link</a>
@@ -35,6 +37,7 @@ public class Link {
     /**
      * <a href="https://tools.ietf.org/html/draft-kelly-json-hal-06#section-8.1">self</a> HAL link.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Only used internally anyway.")
     public String href;
 
     public static Link newLink(String href) {

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/hal/Links.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/hal/Links.java
@@ -23,6 +23,8 @@
  */
 package com.cloudbees.workflow.rest.hal;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 
 /**
  * Abstract HAL <a href="https://tools.ietf.org/html/draft-kelly-json-hal-06#section-4.1.1">_links</a>
@@ -38,6 +40,7 @@ public abstract class Links {
     /**
      * <a href="https://tools.ietf.org/html/draft-kelly-json-hal-06#section-8.1">self</a> HAL link.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Only used internally anyway.")
     public Link self;
 
     public Links initSelf(String rel) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* @jenkinsci/pipeline-stage-view-plugin-developers