Skip to content

Commit

Permalink
Update plugin POM and BOM (#392)
Browse files Browse the repository at this point in the history
* Update plugin POM and BOM

* SpotBugs

* Update CD workflow

* Remove existing Release Drafter configuration
  • Loading branch information
basil committed Apr 26, 2024
1 parent 3d46398 commit 04d1482
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/release-drafter.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.72</version>
<version>4.81</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -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.440</jenkins.version>
<jenkins.version>2.440.1</jenkins.version>
<node.version>16.18.1</node.version>
<npm.version>8.19.4</npm.version>
<spotless.check.skip>false</spotless.check.skip>
Expand All @@ -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.440.x</artifactId>
<version>2746.vb_79a_1d3e7b_c8</version>
<version>2982.vdce2153031a_0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public boolean isDeclarative() {
return this.declarative;
}

private class GraphBuilder {
private static class GraphBuilder {
private final Map<String, FlowNode> nodeMap;
private final Map<String, NodeRelationship> relationships;
private final WorkflowRun run;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class PipelineNodeGraphVisitor extends StandardChunkVisitor implements Pi

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

private final boolean isNodeVisitorDumpEnabled = true; // logger.isTraceEnabled();
private static final boolean isNodeVisitorDumpEnabled = true; // logger.isTraceEnabled();

private final Stack<FlowNode> nestedStages = new Stack<>();
private final Stack<FlowNode> nestedbranches = new Stack<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
PipelineStepApi api = new PipelineStepApi(run);

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

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception
PipelineStepApi api = new PipelineStepApi(run);

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

@Test
Expand Down

0 comments on commit 04d1482

Please sign in to comment.