26 jetty 12

.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 {
 
     /**

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

@@ -20,7 +20,9 @@
  * Conveys information about a category associated with an entry or feed.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Category {
     /** The human-readable label for display in end-user applications. */
     private volatile String label;

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

@@ -29,7 +29,9 @@
  * Atom Protocol collection, part of a workspace.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Collection {
 
     /**

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

@@ -24,7 +24,9 @@
  * Either contains or links to the content of the entry.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Content {
 
     /** Reference to the external representation. */

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

@@ -35,7 +35,9 @@
  * associated with the entry.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Entry extends SaxRepresentation {
 
     /** The authors of the entry. */

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

@@ -23,7 +23,9 @@
  * EntryReader.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class EntryReader extends DefaultHandler {
 
     /** Extra entry reader. */

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

@@ -33,7 +33,9 @@
  * with the feed.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Feed extends SaxRepresentation {
     /** Atom Syndication Format namespace. */
     public final static String ATOM_NAMESPACE = "http://www.w3.org/2005/Atom";

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

@@ -23,7 +23,9 @@
  * FeedReader.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class FeedReader extends DefaultHandler {
 
     /** Extra feed reader. */

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

@@ -21,7 +21,9 @@
  * purposes.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Generator {
 
     /** Human-readable name for the generating agent. */

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

@@ -22,7 +22,9 @@
  * Defines a reference from an entry or feed to a Web resource.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Link {
 
     /** Contains or links to the content of the entry. */

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

@@ -20,7 +20,9 @@
  * 'person').
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Person {
 
     /**

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

@@ -18,7 +18,9 @@
  * @see <a
  *      href="http://www.iana.org/assignments/link-relations/link-relations.xhtml">IANA
  *      Atom relations</a>
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Relation {
     /**
      * Signifies that the IRI in the value of the href attribute identifies an

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

@@ -33,7 +33,9 @@
  * Represents an Atom introspection document.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Service extends SaxRepresentation {
     /** Atom Publishing Protocol namespace. */
     public static final String APP_NAMESPACE = "http://www.w3.org/2007/app";

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

@@ -24,7 +24,9 @@
  * Source feed's metadata for entries copied from another feed.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Source {
 
     /** The authors of the entry. */

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

@@ -24,7 +24,9 @@
  * The content of Text constructs is Language-Sensitive.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Text {
 
     /**

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

@@ -23,7 +23,9 @@
  * Workspace containing collections of members entries.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Workspace {
 
     /**

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/internal/CategoriesContentReader.java

@@ -24,7 +24,9 @@
  * Content reader for categories.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class CategoriesContentReader extends DefaultHandler {
 
     private Categories categories = null;

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/internal/EntryContentReader.java

@@ -36,7 +36,9 @@
  * Content reader for entries.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class EntryContentReader extends EntryReader {
     private enum State {
         FEED_ENTRY, FEED_ENTRY_AUTHOR, FEED_ENTRY_AUTHOR_EMAIL, FEED_ENTRY_AUTHOR_NAME, FEED_ENTRY_AUTHOR_URI, FEED_ENTRY_CATEGORY, FEED_ENTRY_CONTENT, FEED_ENTRY_CONTRIBUTOR, FEED_ENTRY_ID, FEED_ENTRY_LINK, FEED_ENTRY_PUBLISHED, FEED_ENTRY_RIGHTS, FEED_ENTRY_SOURCE, FEED_ENTRY_SOURCE_AUTHOR, FEED_ENTRY_SOURCE_AUTHOR_EMAIL, FEED_ENTRY_SOURCE_AUTHOR_NAME, FEED_ENTRY_SOURCE_AUTHOR_URI, FEED_ENTRY_SOURCE_CATEGORY, FEED_ENTRY_SOURCE_CONTRIBUTOR, FEED_ENTRY_SOURCE_GENERATOR, FEED_ENTRY_SOURCE_ICON, FEED_ENTRY_SOURCE_ID, FEED_ENTRY_SOURCE_LINK, FEED_ENTRY_SOURCE_LOGO, FEED_ENTRY_SOURCE_RIGHTS, FEED_ENTRY_SOURCE_SUBTITLE, FEED_ENTRY_SOURCE_TITLE, FEED_ENTRY_SOURCE_UPDATED, FEED_ENTRY_SUMMARY, FEED_ENTRY_TITLE, FEED_ENTRY_UPDATED, NONE

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/internal/FeedContentReader.java

@@ -36,7 +36,9 @@
  * Content reader for feeds.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class FeedContentReader extends FeedReader {
     private enum State {
         FEED, FEED_AUTHOR, FEED_AUTHOR_EMAIL, FEED_AUTHOR_NAME, FEED_AUTHOR_URI, FEED_CATEGORY, FEED_CONTRIBUTOR, FEED_CONTRIBUTOR_EMAIL, FEED_CONTRIBUTOR_NAME, FEED_CONTRIBUTOR_URI, FEED_ENTRY, FEED_ENTRY_AUTHOR, FEED_ENTRY_AUTHOR_EMAIL, FEED_ENTRY_AUTHOR_NAME, FEED_ENTRY_AUTHOR_URI, FEED_ENTRY_CATEGORY, FEED_ENTRY_CONTENT, FEED_ENTRY_CONTRIBUTOR, FEED_ENTRY_ID, FEED_ENTRY_LINK, FEED_ENTRY_PUBLISHED, FEED_ENTRY_RIGHTS, FEED_ENTRY_SOURCE, FEED_ENTRY_SOURCE_AUTHOR, FEED_ENTRY_SOURCE_AUTHOR_EMAIL, FEED_ENTRY_SOURCE_AUTHOR_NAME, FEED_ENTRY_SOURCE_AUTHOR_URI, FEED_ENTRY_SOURCE_CATEGORY, FEED_ENTRY_SOURCE_CONTRIBUTOR, FEED_ENTRY_SOURCE_GENERATOR, FEED_ENTRY_SOURCE_ICON, FEED_ENTRY_SOURCE_ID, FEED_ENTRY_SOURCE_LINK, FEED_ENTRY_SOURCE_LOGO, FEED_ENTRY_SOURCE_RIGHTS, FEED_ENTRY_SOURCE_SUBTITLE, FEED_ENTRY_SOURCE_TITLE, FEED_ENTRY_SOURCE_UPDATED, FEED_ENTRY_SUMMARY, FEED_ENTRY_TITLE, FEED_ENTRY_UPDATED, FEED_GENERATOR, FEED_ICON, FEED_ID, FEED_LINK, FEED_LOGO, FEED_RIGHTS, FEED_SUBTITLE, FEED_TITLE, FEED_UPDATED, NONE

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/internal/ServiceContentReader.java

@@ -26,7 +26,9 @@
  * Content reader for services.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class ServiceContentReader extends DefaultHandler {
 
     private final static int IN_ACCEPT = 1;

org.restlet.java/org.restlet.ext.atom/src/main/java/org/restlet/ext/atom/package.html

@@ -5,5 +5,6 @@
 @since Restlet 1.1
 @see <a href="http://www.atomenabled.org/">Atom Enabled consortium</a>
 @see <a href="http://restlet.org/learn/guide/2.2/extensions/atom">User Guide - Atom extension</a>
+@deprecated Will be removed in next major release.
 </BODY>
 </HTML>

org.restlet.java/org.restlet.ext.guice/pom.xml

@@ -20,11 +20,6 @@
 			<artifactId>guice</artifactId>
 			<version>${lib-guice-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>${lib-javax-inject-version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.restlet</groupId>
 			<artifactId>org.restlet</artifactId>

org.restlet.java/org.restlet.ext.guice/src/main/java/org/restlet/ext/guice/FinderFactory.java

@@ -20,7 +20,9 @@
  * Factory for dependency-injecting Finders.
  * 
  * @author Tim Peierls
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface FinderFactory {
 
     /**