Skip to content

Commit

Permalink
fix(deps): bump jenkins/jenkins from 2.259 to 2.260 (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] authored Oct 13, 2020
1 parent 09998dc commit ec386a3
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/jenkins:2.259
FROM jenkins/jenkins:2.261

ARG DEV_HOST=localhost
ARG CREATE_ADMIN=true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/jenkins:2.259-alpine
FROM jenkins/jenkins:2.261-alpine

ARG DEV_HOST=localhost
ARG CREATE_ADMIN=true
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 🚀 New features and improvements

# 📦 Dependency Updates
- jenkins 2.259
- jenkins 2.261
- jenkins plugins

# 📝 Documentation updates
Expand Down
8 changes: 4 additions & 4 deletions master/plugins.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
authorize-project:1.3.0
blueocean:1.24.0
blueocean:1.24.1
cloudbees-folder:6.14
configuration-as-code:1.43
configuration-as-code:1.44
configuration-as-code-groovy:1.1
dark-theme:0.0.10
git:4.4.4
github-api:1.116
greenballs:1.15
influxdb:2.4
influxdb:2.5
jdk-tool:1.4
job-dsl:1.77
job-restrictions:0.8
locale:1.4
mailer:1.32.1
matrix-auth:2.6.3
maven-plugin:3.7
maven-plugin:3.8
ownership:0.13.0
pipeline-utility-steps:2.6.1
role-strategy:3.1
Expand Down
28 changes: 21 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.9</version>
<version>4.11</version>
</parent>

<groupId>com.cx.jenkins.image</groupId>
Expand All @@ -22,7 +22,7 @@
</scm>

<properties>
<jenkins.version>2.259</jenkins.version>
<jenkins.version>2.261</jenkins.version>
<java.level>8</java.level>
<groovy.version>2.4.20</groovy.version>
</properties>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.jenkins-ci.main</groupId><!-- for historical reason, this plugin has a different groupId -->
<artifactId>maven-plugin</artifactId>
<version>3.7</version>
<version>3.8</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -81,7 +81,7 @@
<dependency>
<groupId>io.jenkins.blueocean</groupId>
<artifactId>blueocean</artifactId>
<version>1.24.0</version>
<version>1.24.1</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>1.43</version>
<version>1.44</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand Down Expand Up @@ -182,12 +182,22 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-api</artifactId>
<version>1.116</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>influxdb</artifactId>
<version>2.4</version>
<version>2.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -244,6 +254,10 @@
<artifactId>timestamper</artifactId>
<version>1.11.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
Expand Down Expand Up @@ -592,7 +606,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.10.1</version>
<version>1.11.0</version>
<configuration>
<targetBytecode>1.8</targetBytecode>
</configuration>
Expand Down

0 comments on commit ec386a3

Please sign in to comment.