Skip to content

Commit 2bd99dd

Browse files
authored
Merge pull request #56 from basil/lang3
Refresh plugin for 2023
2 parents 2d09283 + ed38958 commit 2bd99dd

File tree

2 files changed

+45
-13
lines changed

2 files changed

+45
-13
lines changed

Jenkinsfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/usr/bin/env groovy
22

33
/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
4-
buildPlugin()
4+
buildPlugin(useContainerAgent: true, configurations: [
5+
[platform: 'linux', jdk: 17],
6+
[platform: 'windows', jdk: 11],
7+
])

pom.xml

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>3.57</version>
8+
<version>4.54</version>
9+
<relativePath />
910
</parent>
1011

1112
<artifactId>docker-java-api</artifactId>
@@ -14,28 +15,27 @@
1415

1516
<name>Docker API Plugin</name>
1617
<description>Plugin providing Docker API for other plugins. Wrap docker-java and required dependency for Netty transport only. JAX-RS default transport is not usable</description>
17-
<url>https://github.com/jenkinsci/docker-java-api-plugin</url>
18+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
1819

1920
<scm>
20-
<connection>scm:git:https://github.com/jenkinsci/docker-java-api-plugin.git</connection>
21-
<developerConnection>scm:git:[email protected]:jenkinsci/docker-java-api-plugin.git</developerConnection>
22-
<url>https://github.com/jenkinsci/docker-java-api-plugin</url>
21+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
22+
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
23+
<url>https://github.com/${gitHubRepo}</url>
2324
<tag>${scmTag}</tag>
2425
</scm>
2526

2627
<properties>
2728
<revision>3.2.13</revision>
2829
<changelist>999999-SNAPSHOT</changelist>
29-
<jenkins.version>1.609.1</jenkins.version>
30-
<java.level>8</java.level>
31-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
<jenkins.version>2.361.3</jenkins.version>
31+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3232
<hpi.compatibleSinceVersion>3.2</hpi.compatibleSinceVersion>
3333
</properties>
3434

3535
<licenses>
3636
<license>
3737
<name>MIT</name>
38-
<url>http://opensource.org/licenses/MIT</url>
38+
<url>https://opensource.org/licenses/MIT</url>
3939
</license>
4040
</licenses>
4141

@@ -52,6 +52,18 @@
5252
</pluginRepository>
5353
</pluginRepositories>
5454

55+
<dependencyManagement>
56+
<dependencies>
57+
<dependency>
58+
<groupId>io.jenkins.tools.bom</groupId>
59+
<artifactId>bom-2.361.x</artifactId>
60+
<version>1798.vc671fe94856f</version>
61+
<scope>import</scope>
62+
<type>pom</type>
63+
</dependency>
64+
</dependencies>
65+
</dependencyManagement>
66+
5567
<dependencies>
5668
<dependency>
5769
<groupId>com.github.docker-java</groupId>
@@ -91,6 +103,10 @@
91103
<groupId>commons-lang</groupId>
92104
<artifactId>commons-lang</artifactId>
93105
</exclusion>
106+
<exclusion>
107+
<groupId>org.apache.commons</groupId>
108+
<artifactId>commons-lang3</artifactId>
109+
</exclusion>
94110
<exclusion>
95111
<groupId>org.slf4j</groupId>
96112
<artifactId>slf4j-api</artifactId>
@@ -138,24 +154,37 @@
138154
<groupId>com.github.docker-java</groupId>
139155
<artifactId>docker-java-transport-httpclient5</artifactId>
140156
<version>${revision}</version>
157+
<exclusions>
158+
<!-- Provided by Jenkins core -->
159+
<exclusion>
160+
<groupId>net.java.dev.jna</groupId>
161+
<artifactId>jna</artifactId>
162+
</exclusion>
163+
<exclusion>
164+
<groupId>org.slf4j</groupId>
165+
<artifactId>slf4j-api</artifactId>
166+
</exclusion>
167+
</exclusions>
168+
</dependency>
169+
170+
<dependency>
171+
<groupId>io.jenkins.plugins</groupId>
172+
<artifactId>commons-lang3-api</artifactId>
141173
</dependency>
142174

143175
<dependency>
144176
<groupId>org.jenkins-ci.plugins</groupId>
145177
<artifactId>jackson2-api</artifactId>
146-
<version>2.10.3</version>
147178
</dependency>
148179

149180
<dependency>
150181
<groupId>org.hamcrest</groupId>
151182
<artifactId>hamcrest-core</artifactId>
152-
<version>2.2</version>
153183
<scope>test</scope>
154184
</dependency>
155185
<dependency>
156186
<groupId>org.mockito</groupId>
157187
<artifactId>mockito-core</artifactId>
158-
<version>2.28.2</version>
159188
<scope>test</scope>
160189
</dependency>
161190
</dependencies>

0 commit comments

Comments
 (0)