Skip to content

Commit

Permalink
[JENKINS-49075] Bump parent pom and a few other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Rebecca Ysteboe committed Jan 22, 2018
1 parent 049fb5c commit 8b1ee82
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 16 deletions.
47 changes: 32 additions & 15 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.36</version>
<version>3.2</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -31,9 +31,8 @@
</scm>

<properties>
<jenkins.version>1.642.4</jenkins.version>
<java.level>7</java.level>
<jenkins-test-harness.version>2.30</jenkins-test-harness.version>
<jenkins.version>2.60.3</jenkins.version>
<java.level>8</java.level>
</properties>

<repositories>
Expand All @@ -54,7 +53,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.11</version>
<version>2.1.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -64,64 +63,82 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>authentication-tokens</artifactId>
<version>1.1</version>
<version>1.3</version>
</dependency>

<!-- for Pipeline-based unit tests -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>2.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>2.5</version>
<version>2.18</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.9</version>
<version>2.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.9</version>
<version>2.11</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.21</version>
<version>2.39</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.21</version>
<version>2.39</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.7</version>
<version>2.12.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<version>2.5</version>
<version>2.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.2</version>
<version>2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>2.10</version>
<version>2.14</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/jenkinsci/plugins/docker/commons/fingerprint/DockerFingerprints.java
View file
Expand Up @@ -23,6 +23,7 @@
*/
package org.jenkinsci.plugins.docker.commons.fingerprint;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.BulkChange;
import hudson.model.Fingerprint;
import hudson.model.Run;
Expand Down Expand Up @@ -79,8 +80,9 @@ private DockerFingerprints() {} // no instantiation
* @return Created fingerprint or null if it is not found
* @throws IOException Fingerprint loading error
*/
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
public static @CheckForNull Fingerprint of(@Nonnull String id) throws IOException {
final Jenkins jenkins = Jenkins.getInstance(); // should be not null
final Jenkins jenkins = Jenkins.getInstance(); // should be not null, but technically can be
return jenkins != null ? jenkins.getFingerprintMap().get(getFingerprintHash(id)) : null;
}

Expand Down

0 comments on commit 8b1ee82

Please sign in to comment.