Move to Jetty 12

.github/workflows/main.yml

@@ -36,10 +36,10 @@ jobs:
     - name: Checkout Code
       uses: actions/checkout@v4
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
 

.jenkins/ci.jenkins

@@ -8,7 +8,7 @@ pipeline {
   agent any
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk11-latest'
+    jdk 'temurin-jdk17-latest'
   }
   options {
     timeout (time: 30, unit: 'MINUTES')

.jenkins/nightly.jenkins

@@ -9,7 +9,7 @@ pipeline {
   agent any
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk11-latest'
+    jdk 'temurin-jdk17-latest'
   }
   options {
     timeout (time: 60, unit: 'MINUTES')

.jenkins/release.jenkins

@@ -37,7 +37,7 @@ pipeline {
   }
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk11-latest'
+    jdk 'temurin-jdk17-latest'
   }
   options {
     timeout (time: 30, unit: 'MINUTES')

.jenkins/test.jenkins

@@ -24,7 +24,7 @@ pipeline {
   }
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk11-latest'
+    jdk 'temurin-jdk17-latest'
   }
   options {
     timeout (time: 30, unit: 'MINUTES')

.jenkins/weekly.jenkins

@@ -8,7 +8,7 @@ pipeline {
   agent any
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk11-latest'
+    jdk 'temurin-jdk17-latest'
   }
   options {
     timeout (time: 30, unit: 'MINUTES')

leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java

@@ -27,10 +27,10 @@
 import org.eclipse.californium.core.config.CoapConfig;
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.scandium.config.DtlsConfig;
+import org.eclipse.jetty.ee10.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.leshan.bsserver.EditableBootstrapConfigStore;
 import org.eclipse.leshan.bsserver.LeshanBootstrapServer;
 import org.eclipse.leshan.bsserver.LeshanBootstrapServerBuilder;
@@ -217,7 +217,7 @@ private static Server createJettyServer(LeshanBsServerDemoCLI cli, LeshanBootstr
             jettyAddr = new InetSocketAddress(cli.main.webhost, cli.main.webPort);
         }
         Server server = new Server(jettyAddr);
-        ServletContextHandler root = new ServletContextHandler(null, "/", true, false);
+        ServletContextHandler root = new ServletContextHandler("/", true, false);
         server.setHandler(root);
 
         // Create static Servlet

leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java

@@ -22,11 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.bsserver.BootstrapConfig;
 import org.eclipse.leshan.bsserver.EditableBootstrapConfigStore;
@@ -42,6 +37,11 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.CollectionType;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Servlet for REST API in charge of adding bootstrap information to the bootstrap server.
  */

leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java

@@ -21,10 +21,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.jetty.servlets.EventSource;
-import org.eclipse.jetty.servlets.EventSourceServlet;
+import org.eclipse.jetty.ee10.servlets.EventSource;
+import org.eclipse.jetty.ee10.servlets.EventSourceServlet;
 import org.eclipse.leshan.bsserver.BootstrapFailureCause;
 import org.eclipse.leshan.bsserver.BootstrapSession;
 import org.eclipse.leshan.bsserver.BootstrapSessionListener;
@@ -44,6 +42,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 public class EventServlet extends EventSourceServlet {
     private static final long serialVersionUID = 1L;
 

leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java

@@ -21,11 +21,6 @@
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.bsserver.LeshanBootstrapServer;
 import org.eclipse.leshan.bsserver.endpoint.LwM2mBootstrapServerEndpoint;
@@ -36,6 +31,11 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class ServerServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;

leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java

@@ -33,10 +33,10 @@
 import org.eclipse.californium.elements.util.CertPathUtil;
 import org.eclipse.californium.scandium.config.DtlsConfig;
 import org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole;
+import org.eclipse.jetty.ee10.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.leshan.core.endpoint.DefaultEndPointUriHandler;
 import org.eclipse.leshan.core.endpoint.EndPointUriHandler;
 import org.eclipse.leshan.core.endpoint.Protocol;
@@ -290,7 +290,7 @@ private static Server createJettyServer(LeshanServerDemoCLI cli, LeshanServer lw
             jettyAddr = new InetSocketAddress(cli.main.webhost, cli.main.webPort);
         }
         Server server = new Server(jettyAddr);
-        ServletContextHandler root = new ServletContextHandler(null, "/", true, false);
+        ServletContextHandler root = new ServletContextHandler("/", true, false);
         server.setHandler(root);
 
         // Create static Servlet

leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ClientServlet.java

@@ -31,11 +31,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.core.link.Link;
@@ -92,6 +87,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Service HTTP REST API calls.
  */

leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/EventServlet.java

@@ -25,10 +25,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.jetty.servlets.EventSource;
-import org.eclipse.jetty.servlets.EventSourceServlet;
+import org.eclipse.jetty.ee10.servlets.EventSource;
+import org.eclipse.jetty.ee10.servlets.EventSourceServlet;
 import org.eclipse.leshan.core.LwM2m.Version;
 import org.eclipse.leshan.core.link.Link;
 import org.eclipse.leshan.core.node.LwM2mNode;
@@ -66,6 +64,7 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import jakarta.servlet.http.HttpServletRequest;
 import jline.internal.Log;
 
 public class EventServlet extends EventSourceServlet {

leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ObjectSpecServlet.java

@@ -21,11 +21,6 @@
 import java.util.Comparator;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.core.model.LwM2mModel;
 import org.eclipse.leshan.core.model.ObjectModel;
@@ -35,6 +30,11 @@
 import org.eclipse.leshan.server.registration.Registration;
 import org.eclipse.leshan.server.registration.RegistrationService;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class ObjectSpecServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;

leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ServerServlet.java

@@ -21,11 +21,6 @@
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.demo.servers.json.PublicKeySerDes;
 import org.eclipse.leshan.demo.servers.json.X509CertificateSerDes;
@@ -36,6 +31,11 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class ServerServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;

leshan-demo-servers-shared/pom.xml

@@ -39,12 +39,12 @@ Contributors:
       <artifactId>leshan-demo-shared</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-webapp</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlets</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/servlet/SecurityServlet.java

@@ -23,11 +23,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Collection;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.leshan.demo.servers.json.JacksonSecurityDeserializer;
 import org.eclipse.leshan.demo.servers.json.JacksonSecuritySerializer;
@@ -46,6 +41,11 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Service HTTP REST API calls for security information.
  */

leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/ClientEndpointNameProvider.java

@@ -21,7 +21,6 @@
 /**
  * Since LWM2M v1.1, endpoint name is optional in REGISTER and BOOTSTRAP request. An {@link ClientEndpointNameProvider}
  * is determine the endpoint name value which should be used in Register/BootstrapRequest.
- * <p>
  *
  * @see <a href="https://github.com/eclipse-leshan/leshan/issues/1457"></a>
  * @see DefaultClientEndpointNameProvider

leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java

@@ -197,7 +197,6 @@ public static List<ObjectModel> loadDdfResources(String path, String[] filenames
      * Load object definition from DDF resources following rules of {@link Class#getResourceAsStream(String)}.
      * <p>
      * It should be used to load DDF embedded with your application bundle (e.g. jar, war, ...)
-     * <p>
      *
      * @param path directory path to the DDF files
      * @param filenames names of all the DDF files
@@ -247,7 +246,6 @@ public static List<ObjectModel> loadDdfResources(String[] paths)
      * Load object definition from DDF resources following rules of {@link Class#getResourceAsStream(String)}.
      * <p>
      * It should be used to load DDF embedded with your application bundle (e.g. jar, war, ...)
-     * <p>
      *
      * @param paths An array of paths to DDF files.
      * @param validate true if you want model validation. Validation is not free and it could make sense to not validate
@@ -265,7 +263,6 @@ public static List<ObjectModel> loadDdfResources(String[] paths, boolean validat
      * Load object definition from DDF resources following rules of {@link Class#getResourceAsStream(String)}.
      * <p>
      * It should be used to load DDF embedded with your application bundle (e.g. jar, war, ...)
-     * <p>
      *
      * @param paths An array of paths to DDF files.
      * @param ddfFileParser a ddfFileParser which could do validation optionally.

leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java

@@ -105,7 +105,6 @@ List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, ContentFormat f
 
     /**
      * Deserializes a binary content into a {@link TimestampedLwM2mNodes}.
-     * <p>
      *
      * @param content the content
      * @param format the content format

leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java

@@ -32,7 +32,6 @@
 public interface TimestampedMultiNodeDecoder {
     /**
      * Deserializes a binary content into a {@link TimestampedLwM2mNodes}.
-     * <p>
      *
      * @param content the content
      * @param rootPath the expected rootPath also known as alternatePath of LWM2M client.

leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeEncoder.java

@@ -26,7 +26,6 @@
 public interface TimestampedMultiNodeEncoder {
     /**
      * Serializes a {@link TimestampedLwM2mNodes} object into a byte array.
-     * <p>
      *
      * @param rootPath to use by LWM2M client (also known as alternate path)
      * @param timestampedNodes timestamped nodes to be serialized

leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java

@@ -49,7 +49,6 @@ public class WriteCompositeRequest extends AbstractLwM2mRequest<WriteCompositeRe
 
     /**
      * Create WriteComposite Request.
-     * <p>
      *
      * @param values The values to write as a the Map of string path to value. Value can not be <code>null</code>. And
      *        must be {@link Boolean} or {@link String} or a byte array or {@link Date} or {@link Long} or

leshan-lwm2m-servers-shared/src/main/java/org/eclipse/leshan/servers/ServerEndpointNameProvider.java

@@ -20,7 +20,6 @@
 /**
  * Since LWM2M v1.1, endpoint name is optional in REGISTER and BOOTSTRAP request. An {@link ServerEndpointNameProvider}
  * is responsible to find the right Endpoint Name from the client identity.
- * <p>
  *
  * @see <a href="https://github.com/eclipse-leshan/leshan/issues/1457"></a>
  * @see DefaultServerEndpointNameProvider