From d53301a77df5cf8a5605a42d2a5dd8f3e30be65f Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 18 Oct 2023 01:11:21 +0200 Subject: [PATCH] Build also with Java 21 on CI. Added missing dependency in WebAppTest. Signed-off-by: Simone Bordet --- Jenkinsfile | 2 +- .../src/test/java/org/cometd/tests/WebAppTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index aab06a1cb..d0eb6c44d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { axes { axis { name 'JDK' - values 'jdk17' + values 'jdk17', 'jdk21' } } stages { diff --git a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/java/org/cometd/tests/WebAppTest.java b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/java/org/cometd/tests/WebAppTest.java index 28397052d..73dd467f4 100644 --- a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/java/org/cometd/tests/WebAppTest.java +++ b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/java/org/cometd/tests/WebAppTest.java @@ -93,6 +93,7 @@ private void start(Path webXML) throws Exception { copyWebAppDependency(org.eclipse.jetty.logging.JettyLogger.class, webINF); copyWebAppDependency(org.cometd.annotation.Service.class, webINF); copyWebAppDependency(org.cometd.annotation.server.RemoteCall.class, webINF); + copyWebAppDependency(org.cometd.annotation.server.jakarta.AnnotationCometDServlet.class, webINF); copyWebAppDependency(org.cometd.bayeux.Message.class, webINF); copyWebAppDependency(org.cometd.bayeux.client.ClientSession.class, webINF); copyWebAppDependency(org.cometd.bayeux.server.BayeuxServer.class, webINF);