Merge pull request #570 from alecharp/fix/java-21-support

[JENKINS-71957] Fix support for Java 21
jenkinsci · Sep 8, 2023 · 0f08314 · 0f08314
2 parents 7be5d1b + 4ac4120
commit 0f08314
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,5 +2,6 @@
 buildPlugin(useContainerAgent: true, configurations: [
     [platform: 'linux', jdk: 11], 
     [platform: 'windows', jdk: 11],
-    [platform: 'linux', jdk: 17]
+    [platform: 'linux', jdk: 17],
+    [platform: 'linux', jdk: 21]
 ])
diff --git a/src/test/java/hudson/plugins/jira/JiraCreateReleaseNotesTest.java b/src/test/java/hudson/plugins/jira/JiraCreateReleaseNotesTest.java
@@ -21,6 +21,7 @@
 import hudson.model.Result;
 import hudson.tasks.BuildWrapper;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -62,8 +63,7 @@ public class JiraCreateReleaseNotesTest {
     @Mock
     JiraSite site;
 
-    @Mock
-    private PrintWriter printWriter;
+    private final PrintWriter printWriter = new PrintWriter(OutputStream.nullOutputStream());
 
     @Mock
     JiraSession session;