Skip to content

Commit

Permalink
Modernize plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed May 20, 2023
1 parent b974f76 commit 1a96e98
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 29 deletions.
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.0-beta-5</version>
<version>1.6</version>
</extension>
</extensions>
7 changes: 3 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ buildPlugin(
failFast: false,
// Test Java 11 with minimum Jenkins version, Java 17 with a more recent version
configurations: [
[platform: 'windows', jdk: '17'],
[platform: 'linux', jdk: '11'],
]
)
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
])
34 changes: 10 additions & 24 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.51</version>
<version>4.63</version>
<relativePath />
</parent>

Expand All @@ -15,7 +15,7 @@

<name>Docker plugin</name>
<description>Provide Cloud Provisioning and other Docker features</description>
<url>https://github.com/jenkinsci/docker-plugin</url>
<url>https://github.com/jenkinsci/${project.artifactId}</url>
<licenses>
<license>
<name>MIT License</name>
Expand Down Expand Up @@ -55,8 +55,7 @@
<properties>
<revision>1.3.1</revision>
<changelist>-SNAPSHOT</changelist>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jenkins.version>2.332.4</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<gitHubRepo>jenkinsci/docker-plugin</gitHubRepo>
<!-- Our unit-tests that talk to a real docker deamon aren't very stable -->
<surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
Expand All @@ -73,19 +72,13 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-java-api</artifactId>
<version>3.2.13-37.vf3411c9828b9</version>
</dependency>

<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-httpclient5</artifactId>
<version>3.2.13</version>
<version>3.2.13-68.va_875df25a_b_45</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.18</version>
<version>419.v8e3cd84ef49c</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -150,13 +143,6 @@
<version>2.3.0</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -184,18 +170,18 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1763.v092b_8980a_f5e</version>
<artifactId>bom-2.361.x</artifactId>
<version>2081.v85885a_d2e5c5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<scm>
<connection>scm:git:https://github.com/jenkinsci/docker-plugin.git</connection>
<developerConnection>scm:git:ssh://[email protected]/jenkinsci/docker-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/docker-plugin</url>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

Expand Down

0 comments on commit 1a96e98

Please sign in to comment.