Skip to content

Commit 04d1482

Browse files
authored
Update plugin POM and BOM (#392)
* Update plugin POM and BOM * SpotBugs * Update CD workflow * Remove existing Release Drafter configuration
1 parent 3d46398 commit 04d1482

File tree

8 files changed

+16
-9
lines changed

8 files changed

+16
-9
lines changed

.github/release-drafter.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/cd.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
types:
88
- completed
99

10+
permissions:
11+
checks: read
12+
contents: write
13+
1014
jobs:
1115
maven-cd:
1216
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.4</version>
5+
<version>1.8</version>
66
</extension>
77
</extensions>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.72</version>
7+
<version>4.81</version>
88
<relativePath />
99
</parent>
1010

@@ -33,7 +33,7 @@
3333
<changelist>999999-SNAPSHOT</changelist>
3434
<gitHubRepo>jenkinsci/pipeline-graph-view-plugin</gitHubRepo>
3535
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
36-
<jenkins.version>2.440</jenkins.version>
36+
<jenkins.version>2.440.1</jenkins.version>
3737
<node.version>16.18.1</node.version>
3838
<npm.version>8.19.4</npm.version>
3939
<spotless.check.skip>false</spotless.check.skip>
@@ -45,7 +45,7 @@
4545
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
4646
<groupId>io.jenkins.tools.bom</groupId>
4747
<artifactId>bom-2.440.x</artifactId>
48-
<version>2746.vb_79a_1d3e7b_c8</version>
48+
<version>2982.vdce2153031a_0</version>
4949
<type>pom</type>
5050
<scope>import</scope>
5151
</dependency>

src/main/java/io/jenkins/plugins/pipelinegraphview/treescanner/PipelineNodeTreeScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public boolean isDeclarative() {
146146
return this.declarative;
147147
}
148148

149-
private class GraphBuilder {
149+
private static class GraphBuilder {
150150
private final Map<String, FlowNode> nodeMap;
151151
private final Map<String, NodeRelationship> relationships;
152152
private final WorkflowRun run;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class PipelineNodeGraphVisitor extends StandardChunkVisitor implements Pi
8181

8282
private static final Logger logger = LoggerFactory.getLogger(PipelineNodeGraphVisitor.class);
8383

84-
private final boolean isNodeVisitorDumpEnabled = true; // logger.isTraceEnabled();
84+
private static final boolean isNodeVisitorDumpEnabled = true; // logger.isTraceEnabled();
8585

8686
private final Stack<FlowNode> nestedStages = new Stack<>();
8787
private final Stack<FlowNode> nestedbranches = new Stack<>();

src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiLegacyTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
192192
PipelineStepApi api = new PipelineStepApi(run);
193193

194194
List<PipelineStep> steps = api.getAllSteps().getSteps();
195-
assertThat(steps, hasSize(10));
195+
assertThat(steps, hasSize(11));
196196
assertThat(steps.get(0).getName(), is("This stage will be executed first."));
197197
assertThat(steps.get(0).getTitle(), is("Print Message"));
198198
assertThat(steps.get(1).getName(), is("Print Message"));
@@ -214,6 +214,8 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
214214
assertThat(steps.get(8).getTitle(), is("Print Message"));
215215
assertThat(steps.get(9).getName(), is("In stage Nested 2 - 2 within Branch C"));
216216
assertThat(steps.get(9).getTitle(), is("Print Message"));
217+
assertThat(steps.get(10).getName(), is("Get contextual object from internal APIs"));
218+
assertThat(steps.get(10).getTitle(), is(""));
217219
}
218220

219221
@Test

src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
230230
PipelineStepApi api = new PipelineStepApi(run);
231231

232232
List<PipelineStep> steps = api.getAllSteps().getSteps();
233-
assertThat(steps, hasSize(10));
233+
assertThat(steps, hasSize(11));
234234
assertThat(steps.get(0).getName(), is("This stage will be executed first."));
235235
assertThat(steps.get(0).getTitle(), is("Print Message"));
236236
assertThat(steps.get(1).getName(), is("Print Message"));
@@ -252,6 +252,8 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
252252
assertThat(steps.get(8).getTitle(), is("Print Message"));
253253
assertThat(steps.get(9).getName(), is("In stage Nested 2 - 2 within Branch C"));
254254
assertThat(steps.get(9).getTitle(), is("Print Message"));
255+
assertThat(steps.get(10).getName(), is("Get contextual object from internal APIs"));
256+
assertThat(steps.get(10).getTitle(), is(""));
255257
}
256258

257259
@Test

0 commit comments

Comments
 (0)