Backport of PCT fixes to 2.426.x line (#395)

Author: basil

.github/release-drafter.yml

@@ -7,6 +7,10 @@ on:
     types:
       - completed
 
+permissions:
+  checks: read
+  contents: write
+
 jobs:
   maven-cd:
     uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1

.github/workflows/cd.yaml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.8</version>
   </extension>
 </extensions>

.mvn/extensions.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.72</version>
+    <version>4.81</version>
     <relativePath />
   </parent>
 
@@ -33,7 +33,7 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/pipeline-graph-view-plugin</gitHubRepo>
     <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-    <jenkins.version>2.426.1</jenkins.version>
+    <jenkins.version>2.426.3</jenkins.version>
     <node.version>16.18.1</node.version>
     <npm.version>8.19.4</npm.version>
     <spotless.check.skip>false</spotless.check.skip>
@@ -45,7 +45,7 @@
         <!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.426.x</artifactId>
-        <version>2718.v7e8a_d43b_3f0b_</version>
+        <version>2982.vdce2153031a_0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -60,8 +60,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>display-url-api</artifactId>
-      <!-- TODO: Remove once included in BOM -->
-      <version>2.3.9</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

pom.xml

@@ -1,4 +1,3 @@
-import { ConsoleLogStreamProps } from "./ConsoleLogModal";
 import React from "react";
 
 export type CloseIconProps = {

src/main/frontend/pipeline-console-view/pipeline-console/main/CloseIcon.tsx

@@ -73,7 +73,7 @@ public class PipelineNodeGraphVisitor extends StandardChunkVisitor {
 
     private static final Logger logger = LoggerFactory.getLogger(PipelineNodeGraphVisitor.class);
 
-    private final boolean isNodeVisitorDumpEnabled = logger.isTraceEnabled();
+    private static final boolean isNodeVisitorDumpEnabled = logger.isTraceEnabled();
 
     private final Stack<FlowNode> nestedStages = new Stack<>();
     private final Stack<FlowNode> nestedbranches = new Stack<>();

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineNodeGraphVisitor.java

@@ -43,7 +43,7 @@ pipeline {
         }
         stage('Skipped stage') {
             when {
-                branch 'master'
+                branch 'some-pattern'
             }
             steps {
                 echo 'This stage will be skipped.'