26 jetty 12 (#1443)

* Ongoing work to upgrade to Jakarta API and Jetty 12

* Update jdk version and drop useless modules from pom.xml

* hide example and test modules temporarily to prevent compilation issues

* Prevent creation of Jetty httpClient without authenticationStore

* Drop references to javax.inject and upgrade Guice to 7.0.0

* Updated changes log.

* Fixed JDK used for compiling branch

* Updated Chunked encoding tests

* Updated Chunked encoding tests

* refacto connectors TUs

* Updated javadocs

* refacto connectors TUs

* refacto connectors TUs

* Deprecated extensions for removal in V2.7/3.0

      - Deprecated the Atom, JAXB, Guice, GWT, OData and Servlet extensions.

* Hide flaky ChunkedTestCases

* Hide flaky ChunkedTestCases

---------

Co-authored-by: Jerome Louvel <374450+jlouvel@users.noreply.github.com>
Co-authored-by: Thierry Boileau <thboileau@gmaiil.com>

Author: 3 people

.github/workflows/build.yaml

@@ -3,15 +3,15 @@ name: CI
 on:
   push:
     branches:
-      - "2.5"
+      - "2.6"
   pull_request:
   workflow_dispatch:
 concurrency:
   group:
     ${{ github.repository }}-${{ github.workflow }}-${{ github.event.number || github.head_ref || github.run_id || github.sha }}
   cancel-in-progress: true
 env:
-  JAVA_VERSION: 8
+  JAVA_VERSION: 17
 jobs:
   build:
     runs-on: ubuntu-latest

.tool-versions

@@ -1,2 +1,2 @@
-java adoptopenjdk-8.0.422+5 
+java adoptopenjdk-17.0.8+101
 maven 3.8.8

changes.md

@@ -1,15 +1,19 @@
 Changes log
 ===========
 
-- 2.6 Milestone 1 (??-12-2024)
+- 2.6 Milestone 1 (??-01-2025)
     - Enhancements
       - Java 17 is the minimum requirement.
     - Security
        - ...
     - Bugs fixed
        - ...
     - Misc
+      - Upgraded Guice to 7.0.0.
+      - Upgraded Jetty to 12.0.16.
+      - Upgraded Spring to 6.2.0.
       - Removed deprecated extensions FileUpload, GAE, OSGi, RDF.
       - Removed deprecated code related to WebDAV, NIO, POP, POPS, SDC, SIP, SIPS, SMTP, SMTPS.
+      - Deprecated the Atom, JAXB, Guice, GWT, OData and Servlet extensions.
       ...
 

org.restlet.java/org.restlet.example/pom.xml

@@ -14,11 +14,6 @@
     <description>Example projects including those from the tutorial</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-            <version>${lib-mongodb-version}</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -34,12 +29,6 @@
             <artifactId>org.restlet.ext.crypto</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.restlet</groupId>
-            <artifactId>org.restlet.ext.fileupload</artifactId>
-            <version>${project.version}</version>
-			<type>pom</type>
-        </dependency>
         <dependency>
             <groupId>org.restlet</groupId>
             <artifactId>org.restlet.ext.freemarker</artifactId>

org.restlet.java/org.restlet.example/src/main/java/org/restlet/example/book/restlet/ch07/sec1/sub5/MailServerResource.java

@@ -9,17 +9,11 @@
 
 package org.restlet.example.book.restlet.ch07.sec1.sub5;
 
-import java.util.List;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.restlet.data.LocalReference;
 import org.restlet.data.MediaType;
 import org.restlet.data.Reference;
 import org.restlet.example.book.restlet.ch07.sec1.sub1.Mail;
-import org.restlet.ext.fileupload.RestletFileUpload;
 import org.restlet.ext.freemarker.TemplateRepresentation;
-import org.restlet.representation.InputRepresentation;
 import org.restlet.representation.Representation;
 import org.restlet.resource.ClientResource;
 import org.restlet.resource.Get;
@@ -54,6 +48,7 @@ public Representation toHtml() throws ResourceException {
 
     @Put
     public String store(Representation input) throws Exception {
+        /*
         // Create a factory for disk-based file items
         RestletFileUpload fileUpload = new RestletFileUpload(
                 new DiskFileItemFactory());
@@ -70,6 +65,8 @@ public String store(Representation input) throws Exception {
             }
         }
 
+         */
+
         return "Mail updated!";
     }
 }

org.restlet.java/org.restlet.example/src/main/java/org/restlet/example/ext/fileupload/FileUploadServerResource.java

@@ -12,12 +12,8 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
-import org.restlet.ext.fileupload.RestletFileUpload;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.resource.Post;
@@ -28,6 +24,7 @@ public class FileUploadServerResource extends ServerResource {
     @Post
     public Representation accept(Representation entity) throws Exception {
         Representation result = null;
+        /*
         if (entity != null
                 && MediaType.MULTIPART_FORM_DATA.equals(entity.getMediaType(),
                         true)) {
@@ -75,6 +72,8 @@ public Representation accept(Representation entity) throws Exception {
             setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
         }
 
+         */
+
         return result;
     }
 

org.restlet.java/org.restlet.example/src/main/java/org/restlet/example/ext/guice/HelloWorld.java

@@ -16,7 +16,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Qualifier for demonstrating use of FinderFactory with qualifiers.

org.restlet.java/org.restlet.example/src/main/java/org/restlet/example/ext/guice/Main.java

@@ -13,8 +13,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.restlet.Application;
 import org.restlet.Component;

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/AtomConverter.java

@@ -24,7 +24,9 @@
  * Converter between the Atom API and Representation classes.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class AtomConverter extends ConverterHelper {
 
     private static final VariantInfo VARIANT_ATOM = new VariantInfo(

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/Categories.java

@@ -30,7 +30,9 @@
  * Collection of {@link Category} entries.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Categories extends SaxRepresentation {
 
     /**