Skip to content

Commit

Permalink
Merge pull request #100 from dwnusbaum/dependency-updates
Browse files Browse the repository at this point in the history 
Update minimum core version, parent POM, and dependencies
  • Loading branch information
@dwnusbaum
dwnusbaum authored Aug 3, 2020
2 parents d12dd07 + 95b29f6 commit 0ec898e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin()
buildPlugin(useAci: true)
72 changes: 17 additions & 55 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.54</version>
<version>4.4</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -66,127 +66,111 @@ THE SOFTWARE.
<revision>2.22</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.138.4</jenkins.version>
<scm-api.version>2.6.3</scm-api.version>
<jenkins.version>2.176.4</jenkins.version>
<no-test-jar>false</no-test-jar>
<workflow-step-api.version>2.13</workflow-step-api.version>
<workflow-support.version>2.17</workflow-support.version>
<workflow-cps.version>2.53</workflow-cps.version>
<git-plugin.version>3.9.1</git-plugin.version>
<workflow-job-plugin.version>2.39</workflow-job-plugin.version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/264 is released. -->
<subversion-plugin.version>2.13.0</subversion-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>11</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>${workflow-step-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.21</version>
<version>${workflow-job-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>${workflow-cps.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.21</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.1.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>2.27</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-scm-step</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.42</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<version>2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps-global-lib</artifactId>
<version>2.4</version>
<version>2.17</version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/278 is released. -->
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>${workflow-step-api.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>${workflow-cps.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git-plugin.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -208,7 +192,6 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git-plugin.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
Expand Down Expand Up @@ -238,7 +221,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.20</version>
<version>${workflow-job-plugin.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand All @@ -248,40 +231,19 @@ THE SOFTWARE.
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>2.4</version>
<scope>test</scope><!-- from git-server via workflow-cps-global-lib and otherwise unavailable during tests -->
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>ssh-cli-auth</artifactId>
<version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.16</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mailer</artifactId>
<version>1.18</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
} else {
SCMHead head = branch.getHead();
FlowExecutionOwner owner = ((WorkflowRun) build).asFlowExecutionOwner();
TaskListener listener = owner != null ? owner.getListener() : TaskListener.NULL;
TaskListener listener = owner.getListener();
tip = scmSource.fetch(head, listener);
if (tip == null) {
throw new AbortException("Could not determine exact tip revision of " + branch.getName());
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,10 @@ public void testChoiceParameterSnippetizer() throws Exception {
r.waitUntilNoActivity(); // #1 built automatically
assertEquals(1, p.getBuilds().size());
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #2
Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
assertEquals(1, p.getBuilds().size());
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #3
Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
assertEquals(1, p.getBuilds().size());
WorkflowRun b3 = p.getLastBuild();
assertEquals(3, b3.getNumber());
Expand Down

0 comments on commit 0ec898e

Please sign in to comment.