From 5db534d6951909e48441cec6dbe0402af1a39e84 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:32:34 +0200 Subject: [PATCH 01/17] Adapt plugin for jetty 12 ee8 --- Jenkinsfile | 3 +- pom.xml | 11 +++- .../ApacheAsyncHttpClientTest.java | 55 +++++++++---------- .../jira/JiraSiteSecurity1029Test.java | 6 +- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21133baa..d5757dba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,6 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'linux', jdk: 11], - [platform: 'windows', jdk: 11], + [platform: 'windows', jdk: 17], [platform: 'linux', jdk: 17], [platform: 'linux', jdk: 21] ]) diff --git a/pom.xml b/pom.xml index c45b92ec..8a35b5fa 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,13 @@ jenkinsci/${project.artifactId}-plugin 5.2.7 4.7.2 + + + 2.462 - 2.440.3 + 2.472 + + 2254.vcff7a_d4969e5 false @@ -61,8 +66,8 @@ io.jenkins.tools.bom - bom-2.440.x - 3234.v5ca_5154341ef + bom-${jenkins.baseline}.x + 3271.vf18ea_cb_9edfb_ pom import diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index 5a33cbfa..8a22c9f9 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -10,25 +10,25 @@ import hudson.ProxyConfiguration; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Base64; import java.util.Date; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.io.Content; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.util.Callback; import org.junit.After; import org.junit.Assert; import org.junit.Rule; @@ -151,7 +151,7 @@ public void simple_post_with_proxy() throws Exception { Assert.assertEquals("FOO", testHandler.postReceived); } - public class ProxyTestHandler extends AbstractHandler { + public static class ProxyTestHandler extends Handler.Abstract { String postReceived; @@ -164,55 +164,52 @@ public class ProxyTestHandler extends AbstractHandler { final String realm = "test_realm"; @Override - public void handle( - String target, - org.eclipse.jetty.server.Request jettyRequest, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException { + public boolean handle( + org.eclipse.jetty.server.Request request, + org.eclipse.jetty.server.Response response, + Callback callback) + throws IOException { - final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes("UTF-8")); + final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes(StandardCharsets.UTF_8)); - jettyRequest.setHandled(true); - - String authorization = request.getHeader(HttpHeader.PROXY_AUTHORIZATION.asString()); + String authorization = request.getHeaders().get(HttpHeader.PROXY_AUTHORIZATION); if (authorization == null) { response.setStatus(HttpStatus.PROXY_AUTHENTICATION_REQUIRED_407); - response.setHeader(HttpHeader.PROXY_AUTHENTICATE.asString(), "Basic realm=\"" + realm + "\""); - return; + response.getHeaders().add(HttpHeader.PROXY_AUTHENTICATE, "Basic realm=\"" + realm + "\""); + return true; } else { String prefix = "Basic "; if (authorization.startsWith(prefix)) { String attempt = authorization.substring(prefix.length()); if (!credentials.equals(attempt)) { - return; + return true; } } } if (StringUtils.equalsIgnoreCase("post", request.getMethod())) { - postReceived = IOUtils.toString(request.getReader()); + postReceived = Content.Source.asString(request, StandardCharsets.UTF_8); } - response.getWriter().write(CONTENT_RESPONSE); + Content.Sink.write(response, true, CONTENT_RESPONSE, callback); + return true; } } - public class TestHandler extends AbstractHandler { + public static class TestHandler extends Handler.Abstract { String postReceived; @Override - public void handle( - String target, - org.eclipse.jetty.server.Request jettyRequest, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException { - jettyRequest.setHandled(true); + public boolean handle( + org.eclipse.jetty.server.Request request, + org.eclipse.jetty.server.Response response, + Callback callback) + throws IOException { if (StringUtils.equalsIgnoreCase("post", request.getMethod())) { - postReceived = IOUtils.toString(request.getReader()); + postReceived = Content.Source.asString(request, StandardCharsets.UTF_8); } - response.getWriter().write(CONTENT_RESPONSE); + Content.Sink.write(response, true, CONTENT_RESPONSE, callback); + return true; } } diff --git a/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java b/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java index 06acae62..7c6df61a 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java @@ -28,9 +28,9 @@ import net.sf.json.JSONObject; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.DefaultServlet; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.htmlunit.HttpMethod; import org.htmlunit.Page; import org.htmlunit.WebRequest; From 613f89ee3ddce8e71363882a3ca319a6ed8b780c Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:36:00 +0200 Subject: [PATCH 02/17] use jdk 17 --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5757dba..2854a3aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,5 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ [platform: 'windows', jdk: 17], - [platform: 'linux', jdk: 17], - [platform: 'linux', jdk: 21] + [platform: 'linux', jdk: 17] ]) From dee83478ad711459b97fac822011662253226569 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:52:04 +0200 Subject: [PATCH 03/17] compiler jdk17 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 8a35b5fa..03563dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,7 @@ 2254.vcff7a_d4969e5 false + 17 From da6281e967443e422142b39d5ec93485a9b33e32 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:54:12 +0200 Subject: [PATCH 04/17] compiler jdk17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03563dd8..636081cf 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2254.vcff7a_d4969e5 false - 17 + 17 From b761776d0fd0e23cb42bf842df07a0bbe05cf092 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:56:42 +0200 Subject: [PATCH 05/17] fix jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2854a3aa..f03ec971 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'windows', jdk: 17], - [platform: 'linux', jdk: 17] + [platform: 'linux', jdk: 11], + [platform: 'windows', jdk: 11], + [platform: 'linux', jdk: 17], + [platform: 'linux', jdk: 21] ]) From a5ef2e4db321d6282f9eba2c7c97ce92e9ace529 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 11:58:57 +0200 Subject: [PATCH 06/17] fix pom --- pom.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 636081cf..155b9047 100644 --- a/pom.xml +++ b/pom.xml @@ -52,11 +52,8 @@ jenkinsci/${project.artifactId}-plugin 5.2.7 4.7.2 - - - 2.462 - 2.472 + 2.440.3 2254.vcff7a_d4969e5 false @@ -67,8 +64,8 @@ io.jenkins.tools.bom - bom-${jenkins.baseline}.x - 3271.vf18ea_cb_9edfb_ + bom-2.440.x + 3234.v5ca_5154341ef pom import From 9c88099a79360157a14f8080fb92c623a6109b72 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Tue, 20 Aug 2024 12:01:05 +0200 Subject: [PATCH 07/17] fix pom --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 155b9047..4128fd37 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ 2254.vcff7a_d4969e5 false - 17 From 81d0cf1b05f87773b0860eb0cda499bc3b3b9352 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Thu, 29 Aug 2024 22:25:05 +0200 Subject: [PATCH 08/17] fix jenkinsfile --- Jenkinsfile | 3 +-- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f03ec971..d5757dba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,6 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'linux', jdk: 11], - [platform: 'windows', jdk: 11], + [platform: 'windows', jdk: 17], [platform: 'linux', jdk: 17], [platform: 'linux', jdk: 21] ]) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index 8a22c9f9..2e76b7b2 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -170,7 +170,7 @@ public boolean handle( Callback callback) throws IOException { - final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes(StandardCharsets.UTF_8)); + final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes("UTF-8")); String authorization = request.getHeaders().get(HttpHeader.PROXY_AUTHORIZATION); if (authorization == null) { From 56c44aef4d4b1cd7abcfb644d82841148d119698 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Thu, 29 Aug 2024 22:29:08 +0200 Subject: [PATCH 09/17] fix jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5757dba..2854a3aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,5 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ [platform: 'windows', jdk: 17], - [platform: 'linux', jdk: 17], - [platform: 'linux', jdk: 21] + [platform: 'linux', jdk: 17] ]) From 4ce859e91137331e1d807b223384f0c482584ea3 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Thu, 29 Aug 2024 22:30:27 +0200 Subject: [PATCH 10/17] fix pom --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4128fd37..155b9047 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 2254.vcff7a_d4969e5 false + 17 From 8bfca0a88421fd08b173ddd74bafdf2afbaf2b60 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Thu, 29 Aug 2024 23:17:24 +0200 Subject: [PATCH 11/17] fix header --- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index 2e76b7b2..d9c7d5dc 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -175,7 +175,7 @@ public boolean handle( String authorization = request.getHeaders().get(HttpHeader.PROXY_AUTHORIZATION); if (authorization == null) { response.setStatus(HttpStatus.PROXY_AUTHENTICATION_REQUIRED_407); - response.getHeaders().add(HttpHeader.PROXY_AUTHENTICATE, "Basic realm=\"" + realm + "\""); + response.getHeaders().add(HttpHeader.PROXY_AUTHENTICATE.asString(), "Basic realm=\"" + realm + "\""); return true; } else { String prefix = "Basic "; From d8d8d107301cb42119266465e0e2232e22a6fe02 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 10:23:23 +0200 Subject: [PATCH 12/17] fix header --- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index d9c7d5dc..bdc9ceb2 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -172,7 +172,7 @@ public boolean handle( final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes("UTF-8")); - String authorization = request.getHeaders().get(HttpHeader.PROXY_AUTHORIZATION); + String authorization = request.getHeaders().get(HttpHeader.PROXY_AUTHORIZATION.asString()); if (authorization == null) { response.setStatus(HttpStatus.PROXY_AUTHENTICATION_REQUIRED_407); response.getHeaders().add(HttpHeader.PROXY_AUTHENTICATE.asString(), "Basic realm=\"" + realm + "\""); From 7c8c778186cadd6ab9895992ad92b30a7a112a61 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 15:29:32 +0200 Subject: [PATCH 13/17] fix handler --- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index bdc9ceb2..d64e9215 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -176,12 +176,14 @@ public boolean handle( if (authorization == null) { response.setStatus(HttpStatus.PROXY_AUTHENTICATION_REQUIRED_407); response.getHeaders().add(HttpHeader.PROXY_AUTHENTICATE.asString(), "Basic realm=\"" + realm + "\""); + callback.succeeded(); return true; } else { String prefix = "Basic "; if (authorization.startsWith(prefix)) { String attempt = authorization.substring(prefix.length()); if (!credentials.equals(attempt)) { + callback.succeeded(); return true; } } From ea899216a95a721d0639aac67ce4cc28526ef24f Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 15:34:52 +0200 Subject: [PATCH 14/17] update jenkins version --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 155b9047..0edbaffc 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ jenkinsci/${project.artifactId}-plugin 5.2.7 4.7.2 - - 2.440.3 + + 2.472 2254.vcff7a_d4969e5 false @@ -64,8 +64,8 @@ io.jenkins.tools.bom - bom-2.440.x - 3234.v5ca_5154341ef + bom-2.462.x + 3258.vcdcf15936a_fd pom import From 94e22b27353dc776d683bd85642a1d79e6b9f2d4 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 15:46:39 +0200 Subject: [PATCH 15/17] remove unused import --- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index d64e9215..9dbd10ce 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -27,7 +27,6 @@ import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.Callback; import org.junit.After; import org.junit.Assert; From a6d1d30fa198feac6a357dc1fb26d384d04813ca Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 15:59:08 +0200 Subject: [PATCH 16/17] Apply spotless --- .../apache/httpcomponents/ApacheAsyncHttpClientTest.java | 8 ++------ .../hudson/plugins/jira/JiraSiteSecurity1029Test.java | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java index 9dbd10ce..405bda4f 100644 --- a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java +++ b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java @@ -164,9 +164,7 @@ public static class ProxyTestHandler extends Handler.Abstract { @Override public boolean handle( - org.eclipse.jetty.server.Request request, - org.eclipse.jetty.server.Response response, - Callback callback) + org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws IOException { final String credentials = Base64.getEncoder().encodeToString((user + ":" + password).getBytes("UTF-8")); @@ -202,9 +200,7 @@ public static class TestHandler extends Handler.Abstract { @Override public boolean handle( - org.eclipse.jetty.server.Request request, - org.eclipse.jetty.server.Response response, - Callback callback) + org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws IOException { if (StringUtils.equalsIgnoreCase("post", request.getMethod())) { postReceived = Content.Source.asString(request, StandardCharsets.UTF_8); diff --git a/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java b/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java index 7c6df61a..63d7d185 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteSecurity1029Test.java @@ -26,11 +26,11 @@ import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; import net.sf.json.JSONObject; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.ee8.servlet.DefaultServlet; import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.htmlunit.HttpMethod; import org.htmlunit.Page; import org.htmlunit.WebRequest; From d85b50ad44e1ec8c7f93d05bafdb3b58ef5070a4 Mon Sep 17 00:00:00 2001 From: Boris Yao Date: Fri, 30 Aug 2024 15:59:56 +0200 Subject: [PATCH 17/17] fix Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2854a3aa..d5757dba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ // Builds a module using https://github.com/jenkins-infra/pipeline-library buildPlugin(useContainerAgent: true, configurations: [ [platform: 'windows', jdk: 17], - [platform: 'linux', jdk: 17] + [platform: 'linux', jdk: 17], + [platform: 'linux', jdk: 21] ])