Skip to content

Commit 367ffcb

Browse files
committed
Make docker-fixtures work on Java 17
1 parent e285088 commit 367ffcb

File tree

5 files changed

+17
-38
lines changed

5 files changed

+17
-38
lines changed

Jenkinsfile

+5-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
pipeline {
2-
options {
3-
buildDiscarder(logRotator(numToKeepStr: '20'))
4-
timeout(time: 1, unit: 'HOURS')
5-
}
6-
// cf. https://github.com/jenkins-infra/documentation/blob/master/ci.adoc
7-
agent {
8-
label 'docker'
9-
}
10-
tools {
11-
jdk 'jdk8'
12-
maven 'mvn'
13-
}
14-
stages {
15-
stage('main') {
16-
steps {
17-
sh 'mvn -B clean verify -Dmaven.test.failure.ignore'
18-
}
19-
post {
20-
success {
21-
junit '**/target/surefire-reports/TEST-*.xml'
22-
}
23-
}
24-
}
25-
}
26-
}
1+
buildPlugin(useContainerAgent: true, configurations: [
2+
[platform: 'linux', jdk: '8'],
3+
[platform: 'linux', jdk: '11'],
4+
[platform: 'linux', jdk: '17']
5+
])

pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci</groupId>
66
<artifactId>jenkins</artifactId>
7-
<version>1.76</version>
7+
<version>1.88</version>
88
<relativePath />
99
</parent>
1010
<groupId>org.jenkins-ci.test</groupId>
@@ -31,8 +31,8 @@
3131
</license>
3232
</licenses>
3333
<scm>
34-
<connection>scm:git:ssh://github.com/jenkinsci/docker-fixtures.git</connection>
35-
<developerConnection>scm:git:ssh://[email protected]/jenkinsci/docker-fixtures.git</developerConnection>
34+
<connection>scm:git:https://github.com/jenkinsci/docker-fixtures.git</connection>
35+
<developerConnection>scm:git:git://[email protected]/jenkinsci/docker-fixtures.git</developerConnection>
3636
<url>https://github.com/jenkinsci/docker-fixtures</url>
3737
<tag>HEAD</tag>
3838
</scm>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>com.fasterxml.jackson.core</groupId>
6969
<artifactId>jackson-databind</artifactId>
70-
<version>2.13.3</version>
70+
<version>2.13.4</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.jenkins-ci</groupId>
@@ -76,9 +76,9 @@
7676
<optional>true</optional>
7777
</dependency>
7878
<dependency>
79-
<groupId>commons-lang</groupId>
80-
<artifactId>commons-lang</artifactId>
81-
<version>2.6</version>
79+
<groupId>org.apache.commons</groupId>
80+
<artifactId>commons-lang3</artifactId>
81+
<version>3.12.0</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>junit</groupId>
@@ -93,8 +93,8 @@
9393
</dependency>
9494
<dependency>
9595
<groupId>org.mockito</groupId>
96-
<artifactId>mockito-all</artifactId>
97-
<version>1.10.19</version>
96+
<artifactId>mockito-core</artifactId>
97+
<version>4.8.0</version>
9898
<scope>test</scope>
9999
</dependency>
100100
</dependencies>

src/main/java/org/jenkinsci/test/acceptance/docker/DockerImage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jenkinsci.test.acceptance.docker;
22

33
import org.apache.commons.io.IOUtils;
4-
import org.apache.commons.lang.SystemUtils;
4+
import org.apache.commons.lang3.SystemUtils;
55
import org.jenkinsci.utils.process.CommandBuilder;
66

77
import java.io.File;

src/main/java/org/jenkinsci/test/acceptance/docker/fixtures/SshdContainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jenkinsci.test.acceptance.docker.fixtures;
22

33
import org.apache.commons.io.FileUtils;
4-
import org.apache.commons.lang.SystemUtils;
4+
import org.apache.commons.lang3.SystemUtils;
55
import org.jenkinsci.test.acceptance.docker.DockerContainer;
66
import org.jenkinsci.test.acceptance.docker.DockerFixture;
77
import org.jenkinsci.utils.process.CommandBuilder;

src/test/java/org/jenkinsci/test/acceptance/docker/DockerImageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.junit.runner.RunWith;
99
import org.mockito.Mock;
1010
import org.mockito.Mockito;
11-
import org.mockito.runners.MockitoJUnitRunner;
11+
import org.mockito.junit.MockitoJUnitRunner;
1212

1313
@RunWith(MockitoJUnitRunner.class)
1414
public class DockerImageTest {

0 commit comments

Comments
 (0)