From 60dde4c2098407aad4a18a265c6a2b7110eeb25a Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 18 Oct 2023 00:28:45 +0200
Subject: [PATCH] Split AnnotationCometDServlet into module
 cometd-java-annotation-server-jakarta. Updated release.sh. Updated
 documentation <web-app> elements to Servlet 6. Updated migration guide for
 8.0.x. Removed Java 17 profiles. Require Java 17 and Maven 3.9 for the build.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../resources/archetype-resources/pom.xml     |  2 +-
 .../resources/archetype-resources/pom.xml     |  2 +-
 cometd-demo/src/main/webapp/WEB-INF/web.xml   |  2 +-
 .../src/main/scripts/release.sh               |  4 +-
 cometd-documentation/pom.xml                  |  2 +-
 .../src/main/asciidoc/java_oort.adoc          |  8 +--
 .../src/main/asciidoc/java_oort_object.adoc   |  6 +--
 .../asciidoc/java_server_configuration.adoc   |  4 +-
 .../src/main/asciidoc/java_server_jmx.adoc    |  4 +-
 .../java_server_services_integration.adoc     |  4 +-
 .../src/main/asciidoc/migration.adoc          | 52 +++++++++++++------
 .../pom.xml                                   | 30 +++++++++++
 .../src/main/java/module-info.java            | 23 ++++++++
 .../jakarta}/AnnotationCometDServlet.java     |  7 +--
 .../cometd-java-annotation-server/pom.xml     |  6 +--
 .../src/main/java/module-info.java            |  2 -
 .../cometd-java-annotation-tests/pom.xml      | 16 +-----
 .../AnnotationCometDServletTest.java          |  2 +-
 cometd-java/cometd-java-annotation/pom.xml    |  1 +
 .../cometd-java-examples-embedded/pom.xml     |  2 +-
 .../java/org/cometd/examples/CometDDemo.java  |  2 +-
 cometd-java/cometd-java-examples/pom.xml      | 17 ++----
 .../cometd-java-tests-common/pom.xml          |  2 +-
 .../resources/http-service-custom-web.xml     |  2 +-
 .../src/test/resources/http-service-web.xml   |  2 +-
 .../cometd-java-tests-spring/pom.xml          |  6 +++
 cometd-java/cometd-java-tests/pom.xml         | 12 +----
 .../cometd-javascript-tests/pom.xml           |  2 +-
 pom.xml                                       | 14 +----
 29 files changed, 135 insertions(+), 103 deletions(-)
 create mode 100644 cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/pom.xml
 create mode 100644 cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/module-info.java
 rename cometd-java/cometd-java-annotation/{cometd-java-annotation-server/src/main/java/org/cometd/annotation/server => cometd-java-annotation-server-jakarta/src/main/java/org/cometd/annotation/server/jakarta}/AnnotationCometDServlet.java (95%)

diff --git a/cometd-archetypes/cometd-archetype-spring-dojo-jetty12/src/main/resources/archetype-resources/pom.xml b/cometd-archetypes/cometd-archetype-spring-dojo-jetty12/src/main/resources/archetype-resources/pom.xml
index 4b1af482c..8acac4ba0 100644
--- a/cometd-archetypes/cometd-archetype-spring-dojo-jetty12/src/main/resources/archetype-resources/pom.xml
+++ b/cometd-archetypes/cometd-archetype-spring-dojo-jetty12/src/main/resources/archetype-resources/pom.xml
@@ -84,7 +84,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${cometd-version}</version>
     </dependency>
     <dependency>
diff --git a/cometd-archetypes/cometd-archetype-spring-jquery-jetty12/src/main/resources/archetype-resources/pom.xml b/cometd-archetypes/cometd-archetype-spring-jquery-jetty12/src/main/resources/archetype-resources/pom.xml
index 303588c94..ddec157a4 100644
--- a/cometd-archetypes/cometd-archetype-spring-jquery-jetty12/src/main/resources/archetype-resources/pom.xml
+++ b/cometd-archetypes/cometd-archetype-spring-jquery-jetty12/src/main/resources/archetype-resources/pom.xml
@@ -84,7 +84,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${cometd-version}</version>
     </dependency>
     <dependency>
diff --git a/cometd-demo/src/main/webapp/WEB-INF/web.xml b/cometd-demo/src/main/webapp/WEB-INF/web.xml
index 4be6621c0..086d23fce 100644
--- a/cometd-demo/src/main/webapp/WEB-INF/web.xml
+++ b/cometd-demo/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
   <!-- CometD Servlet -->
   <servlet>
     <servlet-name>cometd</servlet-name>
-    <servlet-class>org.cometd.annotation.server.AnnotationCometDServlet</servlet-class>
+    <servlet-class>org.cometd.annotation.server.jakarta.AnnotationCometDServlet</servlet-class>
     <init-param>
       <param-name>timeout</param-name>
       <param-value>20000</param-value>
diff --git a/cometd-distribution/src/main/scripts/release.sh b/cometd-distribution/src/main/scripts/release.sh
index 73ef91dd4..c87cb67d2 100755
--- a/cometd-distribution/src/main/scripts/release.sh
+++ b/cometd-distribution/src/main/scripts/release.sh
@@ -34,12 +34,12 @@ tar cvf - -C ${COMETD_DIR}/cometd-documentation/target/html . | ssh ubuntu@docs.
 
 if yes_no "Relink documentation ? (Y/n)" y; then
   echo "Relinking documentation"
-  ssh ubuntu@docs.cometd.org "sudo -u www-data bash -c 'cd ${DOCS_ROOT} && ln -fns ${VERSION} current7'"
+  ssh ubuntu@docs.cometd.org "sudo -u www-data bash -c 'cd ${DOCS_ROOT} && ln -fns ${VERSION} current8'"
 fi
 
 echo "Updating cometd-javascript repository"
 COMETD_JS_DIR=${COMETD_DIR}/target/release/cometd-javascript
-git clone --branch 7.0.x git@github.com:cometd/cometd-javascript.git ${COMETD_JS_DIR}
+git clone --branch 8.0.x git@github.com:cometd/cometd-javascript.git ${COMETD_JS_DIR}
 
 COMETD_JS_SOURCE=${COMETD_DIR}/cometd-javascript/common/target/cometd-javascript-common-${VERSION}/js
 cp -v ${COMETD_JS_SOURCE}/cometd/cometd.js ${COMETD_JS_DIR}
diff --git a/cometd-documentation/pom.xml b/cometd-documentation/pom.xml
index 15dfe6d5b..a5443bfce 100644
--- a/cometd-documentation/pom.xml
+++ b/cometd-documentation/pom.xml
@@ -102,7 +102,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/cometd-documentation/src/main/asciidoc/java_oort.adoc b/cometd-documentation/src/main/asciidoc/java_oort.adoc
index f8c71d4e2..9df7e0047 100644
--- a/cometd-documentation/src/main/asciidoc/java_oort.adoc
+++ b/cometd-documentation/src/main/asciidoc/java_oort.adoc
@@ -222,8 +222,8 @@ You can accomplish the static discovery configuration either via code, or by con
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
     <servlet>
         <servlet-name>cometd</servlet-name>
@@ -409,8 +409,8 @@ You accomplish this by configuring the Oort configuration servlets to set the `o
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
     <servlet>
         <servlet-name>cometd</servlet-name>
diff --git a/cometd-documentation/src/main/asciidoc/java_oort_object.adoc b/cometd-documentation/src/main/asciidoc/java_oort_object.adoc
index 1508a7e6b..32f9186b0 100644
--- a/cometd-documentation/src/main/asciidoc/java_oort_object.adoc
+++ b/cometd-documentation/src/main/asciidoc/java_oort_object.adoc
@@ -227,12 +227,12 @@ You must specify class `MyCustomJSONContextServer` as the `jsonContext` paramete
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
     ...
     <servlet>
         <servlet-name>cometd</servlet-name>
-        <servlet-class>org.cometd.annotation.server.AnnotationCometDServlet</servlet-class>
+        <servlet-class>org.cometd.annotation.server.jakarta.AnnotationCometDServlet</servlet-class>
         <init-param>
             <param-name>jsonContext</param-name>
             <param-value>com.acme.MyCustomJSONContextServer</param-value>
diff --git a/cometd-documentation/src/main/asciidoc/java_server_configuration.adoc b/cometd-documentation/src/main/asciidoc/java_server_configuration.adoc
index 5ede3b9a6..bd60a559b 100644
--- a/cometd-documentation/src/main/asciidoc/java_server_configuration.adoc
+++ b/cometd-documentation/src/main/asciidoc/java_server_configuration.adoc
@@ -265,8 +265,8 @@ Here is an example of `web.xml` configuration for the `CrossOriginFilter`:
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
   <servlet>
     <servlet-name>cometd</servlet-name>
diff --git a/cometd-documentation/src/main/asciidoc/java_server_jmx.adoc b/cometd-documentation/src/main/asciidoc/java_server_jmx.adoc
index 172c5c816..9639d739a 100644
--- a/cometd-documentation/src/main/asciidoc/java_server_jmx.adoc
+++ b/cometd-documentation/src/main/asciidoc/java_server_jmx.adoc
@@ -64,8 +64,8 @@ with the corresponding `web.xml` configuration:
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
   <!-- The rest of your web.xml -->
 
diff --git a/cometd-documentation/src/main/asciidoc/java_server_services_integration.adoc b/cometd-documentation/src/main/asciidoc/java_server_services_integration.adoc
index 2b8905c2a..cbffc4fe8 100644
--- a/cometd-documentation/src/main/asciidoc/java_server_services_integration.adoc
+++ b/cometd-documentation/src/main/asciidoc/java_server_services_integration.adoc
@@ -65,8 +65,8 @@ Here is a sample `web.xml` file:
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
-         version="5.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 
   <servlet>
     <servlet-name>cometd</servlet-name>
diff --git a/cometd-documentation/src/main/asciidoc/migration.adoc b/cometd-documentation/src/main/asciidoc/migration.adoc
index 85553a826..6a35060d6 100644
--- a/cometd-documentation/src/main/asciidoc/migration.adoc
+++ b/cometd-documentation/src/main/asciidoc/migration.adoc
@@ -762,37 +762,59 @@ Migration from CometD 6.0.x to CometD 7.0.x implies migrating from Jetty 10.0.x
 | Java 11 | Java 17
 |===
 
-==== Servlet Specification Changes
+==== Jetty Dependency Changes
 
-[cols="1a,1a", options="header"]
+[cols="1,1", options="header"]
 |===
-| CometD 7.0.x | CometD 8.0.x
-| Servlet 5.0 | Servlet 6.0
+| CometD 7.0.x  | CometD 8.0.x
+| Jetty 11.0.x | Jetty 12.0.x
 |===
 
-==== Class Names Changes
+==== Servlet Specification Changes
 
 [cols="1a,1a", options="header"]
 |===
 | CometD 7.0.x | CometD 8.0.x
-| `org.cometd.**server**.CometDServlet` | `org.cometd.**server.http.jakarta.**CometDServlet`
-// TODO
+| Servlet 5.0 (Jakarta EE 9) | Servlet 6.0 (Jakarta EE 10)
 |===
 
-==== Maven Artifacts Changes
+==== Package/Class Names Changes
+
+The most notable changes are the split of artifacts to separate Jakarta EE 10 Servlet classes.
 
 [cols="1a,1a", options="header"]
 |===
 | CometD 7.0.x | CometD 8.0.x
-// TODO
+| `org.cometd.**server**.CometDServlet` | `org.cometd.**server.http.jakarta**.CometDServlet`
+| `org.cometd.annotation.server.AnnotationCometDServlet` | `org.cometd.annotation.server.**jakarta**.AnnotationCometDServlet`
+| `org.cometd.oort.OortStaticConfigServlet` | `org.cometd.oort.**jakarta**.OortStaticConfigServlet`
+| `org.cometd.oort.OortMulticastConfigServlet` | `org.cometd.oort.**jakarta**.OortMulticastConfigServlet`
+| `org.cometd.oort.SetServlet` | `org.cometd.oort.**jakarta**.SetServlet`
+| `org.cometd.client.websocket.**javax**.*` | `org.cometd.client.websocket.**jakarta**.*`
+| `org.cometd.server.websocket.**javax**.*` | `org.cometd.server.websocket.**jakarta**.*`
 |===
 
-==== Jetty Dependency Changes
+==== Maven Artifacts Changes
 
-[cols="1,1", options="header"]
+The most notable changes are the split of artifacts to separate Jakarta EE 10 Servlet classes.
+
+For example, class `CometDServlet` is in artifact `cometd-java-server-common` in CometD 7.0.x, and in artifact `cometd-java-server-http-jakarta` in CometD 8.0.x, but you can also use artifact ``cometd-java-server-http-jetty` if you are running in a Jetty 12 core environment.
+
+`Oort` and `Seti` configuration Servlets have been moved from artifact `cometd-java-oort` in CometD 7.0.x to artifact `cometd-java-oort-jakarta` in CometD 8.0.x.
+The `Oort` and `Seti` classes independent of Jakarta EE 10 have been moved from artifact `cometd-java-oort` in CometD 7.0.x to artifact `cometd-java-oort-common` in CometD 8.0.x.
+
+[cols="1a,1a", options="header"]
 |===
-| CometD 7.0.x  | CometD 8.0.x
-| Jetty 11.0.x | Jetty 12.0.x
+| CometD 7.0.x | CometD 8.0.x
+| `cometd-java-annotation-server` | `cometd-java-annotation-server` +
+`cometd-java-annotation-server-**jakarta**`
+| `cometd-java-client-websocket-**javax**` | `cometd-java-client-websocket-**jakarta**`
+| `cometd-java-**oort**` | `cometd-java-**oort-common**` +
+`cometd-java-**oort-jakarta**`
+| `cometd-java-server-common` | `cometd-java-server-common` +
+`cometd-java-server-**http-jakarta**` +
+`cometd-java-server-**http-jetty**`
+| `cometd-java-server-websocket-**javax**` | `cometd-java-server-websocket-**jakarta**`
 |===
 
 ==== `web.xml` Changes
@@ -817,8 +839,8 @@ Migration from CometD 6.0.x to CometD 7.0.x implies migrating from Jetty 10.0.x
 ----
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" <!--1-->
-         version="6.0"> <!--2-->
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" <1>
+         version="6.0"> <2>
 ----
 <1> `schemaLocation` attribute changed URI path
 <2> `version` attribute changed from `5.0` to `6.0`
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/pom.xml b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/pom.xml
new file mode 100644
index 000000000..08e553048
--- /dev/null
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.cometd.java</groupId>
+    <artifactId>cometd-java-annotation</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cometd-java-annotation-server-jakarta</artifactId>
+  <name>CometD :: Java :: Annotation :: Server :: Jakarta</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.cometd.java</groupId>
+      <artifactId>cometd-java-annotation-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.cometd.java</groupId>
+      <artifactId>cometd-java-server-http-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/module-info.java b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/module-info.java
new file mode 100644
index 000000000..c6f4c6397
--- /dev/null
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2008-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module org.cometd.annotation.server.jakarta {
+    exports org.cometd.annotation.server.jakarta;
+
+    requires transitive jakarta.servlet;
+    requires transitive org.cometd.annotation.server;
+    requires transitive org.cometd.server.http.jakarta;
+    requires org.slf4j;
+}
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/org/cometd/annotation/server/AnnotationCometDServlet.java b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/org/cometd/annotation/server/jakarta/AnnotationCometDServlet.java
similarity index 95%
rename from cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/org/cometd/annotation/server/AnnotationCometDServlet.java
rename to cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/org/cometd/annotation/server/jakarta/AnnotationCometDServlet.java
index a55f3cf85..ebc514c60 100644
--- a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/org/cometd/annotation/server/AnnotationCometDServlet.java
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-server-jakarta/src/main/java/org/cometd/annotation/server/jakarta/AnnotationCometDServlet.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.cometd.annotation.server;
+package org.cometd.annotation.server.jakarta;
 
 import java.util.ArrayList;
 import java.util.List;
 import jakarta.servlet.ServletException;
 
+import org.cometd.annotation.server.ServerAnnotationProcessor;
 import org.cometd.bayeux.server.BayeuxServer;
 import org.cometd.server.http.jakarta.CometDServlet;
 import org.slf4j.Logger;
@@ -31,10 +32,10 @@
  * <p>
  * A configuration example:
  * <pre>{@code
- * <web-app xmlns="http://java.sun.com/xml/ns/javaee" ...>
+ * <web-app ...>
  *   <servlet>
  *     <servlet-name>cometd</servlet-name>
- *     <servlet-class>org.cometd.annotation.AnnotationCometDServlet</servlet-class>
+ *     <servlet-class>org.cometd.annotation.server.jakarta.AnnotationCometDServlet</servlet-class>
  *     <init-param>
  *       <param-name>services</param-name>
  *       <param-value>org.cometd.examples.FooService, org.cometd.examples.BarService</param-value>
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/pom.xml b/cometd-java/cometd-java-annotation/cometd-java-annotation-server/pom.xml
index 0044b1882..0c8d7b84b 100644
--- a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/pom.xml
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-server/pom.xml
@@ -16,13 +16,9 @@
       <artifactId>cometd-java-annotation-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-server-http-jakarta</artifactId>
+      <artifactId>cometd-java-api-server</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/module-info.java b/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/module-info.java
index af98871e3..357e87721 100644
--- a/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/module-info.java
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-server/src/main/java/module-info.java
@@ -18,9 +18,7 @@
 
     requires jakarta.annotation;
     requires jakarta.inject;
-    requires transitive jakarta.servlet;
     requires transitive org.cometd.annotation;
     requires transitive org.cometd.api.server;
-    requires transitive org.cometd.server.http.jakarta;
     requires org.slf4j;
 }
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/pom.xml b/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/pom.xml
index fbdba25a3..4eedda0c2 100644
--- a/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/pom.xml
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/pom.xml
@@ -14,20 +14,6 @@
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <!-- Guice still uses javax.inject -->
-            <exclude>org.cometd.annotation.guice.GuiceAnnotationTest</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.cometd.java</groupId>
@@ -37,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/src/test/java/org/cometd/annotation/AnnotationCometDServletTest.java b/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/src/test/java/org/cometd/annotation/AnnotationCometDServletTest.java
index 78ad40347..3f3aacb2f 100644
--- a/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/src/test/java/org/cometd/annotation/AnnotationCometDServletTest.java
+++ b/cometd-java/cometd-java-annotation/cometd-java-annotation-tests/src/test/java/org/cometd/annotation/AnnotationCometDServletTest.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
-import org.cometd.annotation.server.AnnotationCometDServlet;
+import org.cometd.annotation.server.jakarta.AnnotationCometDServlet;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
diff --git a/cometd-java/cometd-java-annotation/pom.xml b/cometd-java/cometd-java-annotation/pom.xml
index afec628a1..14979c6a1 100644
--- a/cometd-java/cometd-java-annotation/pom.xml
+++ b/cometd-java/cometd-java-annotation/pom.xml
@@ -15,6 +15,7 @@
     <module>cometd-java-annotation-common</module>
     <module>cometd-java-annotation-client</module>
     <module>cometd-java-annotation-server</module>
+    <module>cometd-java-annotation-server-jakarta</module>
     <module>cometd-java-annotation-tests</module>
   </modules>
 </project>
diff --git a/cometd-java/cometd-java-examples/cometd-java-examples-embedded/pom.xml b/cometd-java/cometd-java-examples/cometd-java-examples-embedded/pom.xml
index 3efb5d969..7a67b51bc 100644
--- a/cometd-java/cometd-java-examples/cometd-java-examples-embedded/pom.xml
+++ b/cometd-java/cometd-java-examples/cometd-java-examples-embedded/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/cometd-java/cometd-java-examples/cometd-java-examples-embedded/src/main/java/org/cometd/examples/CometDDemo.java b/cometd-java/cometd-java-examples/cometd-java-examples-embedded/src/main/java/org/cometd/examples/CometDDemo.java
index 6033af1be..c91068090 100644
--- a/cometd-java/cometd-java-examples/cometd-java-examples-embedded/src/main/java/org/cometd/examples/CometDDemo.java
+++ b/cometd-java/cometd-java-examples/cometd-java-examples-embedded/src/main/java/org/cometd/examples/CometDDemo.java
@@ -18,7 +18,7 @@
 import java.net.URI;
 import java.util.List;
 
-import org.cometd.annotation.server.AnnotationCometDServlet;
+import org.cometd.annotation.server.jakarta.AnnotationCometDServlet;
 import org.cometd.bayeux.server.BayeuxServer;
 import org.cometd.bayeux.server.ServerChannel;
 import org.cometd.bayeux.server.ServerMessage.Mutable;
diff --git a/cometd-java/cometd-java-examples/pom.xml b/cometd-java/cometd-java-examples/pom.xml
index f9b2233ce..7810ee9d8 100644
--- a/cometd-java/cometd-java-examples/pom.xml
+++ b/cometd-java/cometd-java-examples/pom.xml
@@ -13,19 +13,8 @@
 
   <modules>
     <module>cometd-java-examples-embedded</module>
-  </modules>
+    <!-- There is no support for Jetty 12 in Spring Boot yet -->
+    <!--<module>cometd-java-examples-springboot</module>-->
+    </modules>
 
-<!-- There is no support for Jetty 12 in Spring Boot yet
-  <profiles>
-    <profile>
-      <id>jdk17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <modules>
-        <module>cometd-java-examples-springboot</module>
-      </modules>
-    </profile>
-  </profiles>
--->
 </project>
diff --git a/cometd-java/cometd-java-tests/cometd-java-tests-common/pom.xml b/cometd-java/cometd-java-tests/cometd-java-tests-common/pom.xml
index 2c08bf1dc..44da421d2 100644
--- a/cometd-java/cometd-java-tests/cometd-java-tests-common/pom.xml
+++ b/cometd-java/cometd-java-tests/cometd-java-tests-common/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-annotation-server</artifactId>
+      <artifactId>cometd-java-annotation-server-jakarta</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-custom-web.xml b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-custom-web.xml
index bc9a070ec..b4feb0c87 100644
--- a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-custom-web.xml
+++ b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-custom-web.xml
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>cometd</servlet-name>
-    <servlet-class>org.cometd.annotation.server.AnnotationCometDServlet</servlet-class>
+    <servlet-class>org.cometd.annotation.server.jakarta.AnnotationCometDServlet</servlet-class>
     <init-param>
       <param-name>jsonContext</param-name>
       <param-value>org.cometd.tests.WebAppService$JSONServerConfig</param-value>
diff --git a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-web.xml b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-web.xml
index 637bc1298..b22b29e24 100644
--- a/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-web.xml
+++ b/cometd-java/cometd-java-tests/cometd-java-tests-common/src/test/resources/http-service-web.xml
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>cometd</servlet-name>
-    <servlet-class>org.cometd.annotation.server.AnnotationCometDServlet</servlet-class>
+    <servlet-class>org.cometd.annotation.server.jakarta.AnnotationCometDServlet</servlet-class>
     <init-param>
       <param-name>services</param-name>
       <param-value>org.cometd.tests.WebAppService</param-value>
diff --git a/cometd-java/cometd-java-tests/cometd-java-tests-spring/pom.xml b/cometd-java/cometd-java-tests/cometd-java-tests-spring/pom.xml
index 4db708a43..0e76208b8 100644
--- a/cometd-java/cometd-java-tests/cometd-java-tests-spring/pom.xml
+++ b/cometd-java/cometd-java-tests/cometd-java-tests-spring/pom.xml
@@ -48,6 +48,12 @@
       <version>${jetty-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.cometd.java</groupId>
+      <artifactId>cometd-java-server-http-jakarta</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
       <artifactId>cometd-java-annotation-server</artifactId>
diff --git a/cometd-java/cometd-java-tests/pom.xml b/cometd-java/cometd-java-tests/pom.xml
index c93ef1b4e..e1578974d 100644
--- a/cometd-java/cometd-java-tests/pom.xml
+++ b/cometd-java/cometd-java-tests/pom.xml
@@ -19,17 +19,7 @@
   <modules>
     <module>cometd-java-tests-common</module>
     <module>cometd-java-tests-oort</module>
+    <module>cometd-java-tests-spring</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>jdk17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <modules>
-        <module>cometd-java-tests-spring</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/cometd-javascript/cometd-javascript-tests/pom.xml b/cometd-javascript/cometd-javascript-tests/pom.xml
index 2d2b4edfd..2a1c5feed 100644
--- a/cometd-javascript/cometd-javascript-tests/pom.xml
+++ b/cometd-javascript/cometd-javascript-tests/pom.xml
@@ -98,7 +98,7 @@
     </dependency>
     <dependency>
       <groupId>org.cometd.java</groupId>
-      <artifactId>cometd-java-server-common</artifactId>
+      <artifactId>cometd-java-server-http-jakarta</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index c5c22d9f8..e1fa863db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,16 +154,6 @@
       <id>release</id>
       <build>
         <plugins>
-          <plugin>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>[17,)</version>
-                </requireJavaVersion>
-              </rules>
-            </configuration>
-          </plugin>
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
             <executions>
@@ -196,10 +186,10 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[11,)</version>
+                  <version>[17,)</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
-                  <version>[3.5,)</version>
+                  <version>[3.9,)</version>
                 </requireMavenVersion>
               </rules>
             </configuration>