Skip to content

Commit ece7a4b

Browse files
authored
Merge pull request #60 from NotMyFault/jdk21
Update dependencies to support Java 21
2 parents 912b950 + 65a8595 commit ece7a4b

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

.mvn/extensions.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.4</version>
5+
<version>1.6</version>
66
</extension>
77
</extensions>

pom.xml

+11-4
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.88</version>
7+
<version>1.99</version>
88
<relativePath/>
99
</parent>
1010
<groupId>org.jenkins-ci.test</groupId>
@@ -56,12 +56,14 @@
5656
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5757
<spotbugs.failOnError>false</spotbugs.failOnError> <!-- TODO -->
5858
<maven.compiler.release>8</maven.compiler.release> <!-- TODO until dropping Java 8 support in consuming plugins -->
59+
<!-- TODO triage violations -->
60+
<spotbugs.threshold>High</spotbugs.threshold>
5961
</properties>
6062
<dependencies>
6163
<dependency>
6264
<groupId>commons-io</groupId>
6365
<artifactId>commons-io</artifactId>
64-
<version>2.11.0</version>
66+
<version>2.13.0</version>
6567
</dependency>
6668
<dependency>
6769
<groupId>org.jenkins-ci</groupId>
@@ -71,7 +73,7 @@
7173
<dependency>
7274
<groupId>com.fasterxml.jackson.core</groupId>
7375
<artifactId>jackson-databind</artifactId>
74-
<version>2.13.4</version>
76+
<version>2.15.2</version>
7577
</dependency>
7678
<dependency>
7779
<groupId>org.jenkins-ci</groupId>
@@ -98,9 +100,14 @@
98100
<dependency>
99101
<groupId>org.mockito</groupId>
100102
<artifactId>mockito-core</artifactId>
101-
<version>4.8.0</version>
103+
<version>4.9.0</version>
102104
<scope>test</scope>
103105
</dependency>
106+
<dependency>
107+
<groupId>com.github.spotbugs</groupId>
108+
<artifactId>spotbugs-annotations</artifactId>
109+
<optional>true</optional>
110+
</dependency>
104111
</dependencies>
105112
<profiles>
106113
<profile>

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

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

3+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
34
import org.apache.commons.io.FileUtils;
45
import org.apache.commons.io.IOUtils;
56
import org.jenkinsci.utils.process.CommandBuilder;
@@ -83,6 +84,7 @@ private DockerImage build(String image, File dir) throws IOException, Interrupte
8384
return build(image, dir, null);
8485
}
8586

87+
@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "TODO needs triage")
8688
public static boolean NO_CACHE;
8789

8890
/**

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

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

3+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
34
import org.apache.commons.io.IOUtils;
45

56
import java.io.File;
@@ -39,6 +40,7 @@ public InputStream asInputStream() {
3940
}
4041
}
4142

43+
@SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
4244
public Reader asReader() {
4345
try {
4446
return new InputStreamReader(url.openStream());

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

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

3+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
34
import org.apache.commons.io.FileUtils;
45
import org.apache.commons.lang3.SystemUtils;
56
import org.jenkinsci.test.acceptance.docker.DockerContainer;
@@ -63,6 +64,7 @@ public File getEncryptedPrivateKey() {
6364
return privateKeyEnc;
6465
}
6566

67+
@SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
6668
public String getPrivateKeyString() {
6769
try {
6870
return new String(Files.readAllBytes(getPrivateKey().toPath()));

0 commit comments

Comments
 (0)