From 42d09a7fd56a76a5e5d8e93ba763735b0bae87f1 Mon Sep 17 00:00:00 2001
From: Jerome Louvel <374450+jlouvel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:23:28 -0400
Subject: [PATCH] Deprecated extensions for future removal

Deprecated GAE, GWT, OSGi and RDF extensions for removal in next major release.
---
 changes.md                                                     | 1 +
 .../src/main/java/org/restlet/ext/gae/GaeAuthenticator.java    | 2 ++
 .../src/main/java/org/restlet/ext/gae/GaeEnroler.java          | 2 ++
 .../src/main/java/org/restlet/ext/gae/package.html             | 1 +
 .../src/main/java/org/restlet/ext/gwt/GwtConverter.java        | 2 ++
 .../main/java/org/restlet/ext/gwt/ObjectRepresentation.java    | 2 ++
 .../java/org/restlet/ext/gwt/SimpleSerializationPolicy.java    | 2 ++
 .../org/restlet/ext/gwt/SimpleSerializationPolicyProvider.java | 2 ++
 .../src/main/java/org/restlet/ext/gwt/package.html             | 3 ++-
 .../main/java/org/restlet/ext/osgi/ApplicationProvider.java    | 2 ++
 .../java/org/restlet/ext/osgi/BaseApplicationProvider.java     | 3 ++-
 .../main/java/org/restlet/ext/osgi/BaseDirectoryProvider.java  | 3 ++-
 .../src/main/java/org/restlet/ext/osgi/BaseFilterProvider.java | 3 ++-
 .../main/java/org/restlet/ext/osgi/BaseResourceProvider.java   | 3 ++-
 .../main/java/org/restlet/ext/osgi/BaseRestletProvider.java    | 3 ++-
 .../src/main/java/org/restlet/ext/osgi/BaseRouterProvider.java | 3 ++-
 .../src/main/java/org/restlet/ext/osgi/DirectoryProvider.java  | 2 ++
 .../src/main/java/org/restlet/ext/osgi/DynamicFinder.java      | 2 ++
 .../src/main/java/org/restlet/ext/osgi/FilterProvider.java     | 2 ++
 .../src/main/java/org/restlet/ext/osgi/ObapClientHelper.java   | 2 ++
 .../src/main/java/org/restlet/ext/osgi/ResourceProvider.java   | 2 ++
 .../src/main/java/org/restlet/ext/osgi/RestletProvider.java    | 2 ++
 .../src/main/java/org/restlet/ext/osgi/RouterProvider.java     | 3 ++-
 .../src/main/java/org/restlet/ext/osgi/internal/Activator.java | 2 ++
 .../src/main/java/org/restlet/ext/osgi/package.html            | 1 +
 .../src/main/java/org/restlet/ext/rdf/Couple.java              | 2 ++
 .../src/main/java/org/restlet/ext/rdf/Graph.java               | 2 ++
 .../src/main/java/org/restlet/ext/rdf/GraphBuilder.java        | 2 ++
 .../src/main/java/org/restlet/ext/rdf/GraphHandler.java        | 2 ++
 .../src/main/java/org/restlet/ext/rdf/Link.java                | 2 ++
 .../src/main/java/org/restlet/ext/rdf/Literal.java             | 2 ++
 .../src/main/java/org/restlet/ext/rdf/RdfClientResource.java   | 2 ++
 .../src/main/java/org/restlet/ext/rdf/RdfConverter.java        | 2 ++
 .../src/main/java/org/restlet/ext/rdf/RdfRepresentation.java   | 2 ++
 .../src/main/java/org/restlet/ext/rdf/Triple.java              | 2 ++
 .../main/java/org/restlet/ext/rdf/internal/RdfConstants.java   | 2 ++
 .../src/main/java/org/restlet/ext/rdf/internal/RdfReader.java  | 2 ++
 .../java/org/restlet/ext/rdf/internal/n3/FormulaToken.java     | 2 ++
 .../main/java/org/restlet/ext/rdf/internal/n3/RdfN3Reader.java | 2 ++
 .../main/java/org/restlet/ext/rdf/internal/n3/RdfN3Writer.java | 2 ++
 .../restlet/ext/rdf/internal/ntriples/RdfNTriplesReader.java   | 2 ++
 .../restlet/ext/rdf/internal/ntriples/RdfNTriplesWriter.java   | 2 ++
 .../org/restlet/ext/rdf/internal/turtle/BlankNodeToken.java    | 2 ++
 .../main/java/org/restlet/ext/rdf/internal/turtle/Context.java | 2 ++
 .../java/org/restlet/ext/rdf/internal/turtle/LexicalUnit.java  | 2 ++
 .../java/org/restlet/ext/rdf/internal/turtle/ListToken.java    | 2 ++
 .../org/restlet/ext/rdf/internal/turtle/RdfTurtleReader.java   | 2 ++
 .../org/restlet/ext/rdf/internal/turtle/RdfTurtleWriter.java   | 2 ++
 .../java/org/restlet/ext/rdf/internal/turtle/StringToken.java  | 2 ++
 .../main/java/org/restlet/ext/rdf/internal/turtle/Token.java   | 2 ++
 .../java/org/restlet/ext/rdf/internal/turtle/UriToken.java     | 2 ++
 .../java/org/restlet/ext/rdf/internal/xml/ContentReader.java   | 2 ++
 .../java/org/restlet/ext/rdf/internal/xml/RdfXmlReader.java    | 2 ++
 .../java/org/restlet/ext/rdf/internal/xml/RdfXmlWriter.java    | 2 ++
 .../java/org/restlet/ext/rdf/internal/xml/ScopedProperty.java  | 2 ++
 .../src/main/java/org/restlet/ext/rdf/package.html             | 1 +
 pom.xml                                                        | 2 +-
 57 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/changes.md b/changes.md
index 4c1c3e4202..a4ac307a8e 100644
--- a/changes.md
+++ b/changes.md
@@ -20,6 +20,7 @@ Changes log
       - Removed incubator to rely instead on pull requests.
       - Renamed extension Inject into Guice as it isn't truly generic.
       - Updated the links in all Javadocs file for accuracy.
+      - Deprecated GAE, GWT, OSGi and RDF extensions for removal in next major release.
 
 - 2.5 Milestone 1 (03/09/2020)
     - Bugs fixed
diff --git a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeAuthenticator.java b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeAuthenticator.java
index 36baf2ebaf..251b3215b8 100644
--- a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeAuthenticator.java
+++ b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeAuthenticator.java
@@ -25,7 +25,9 @@
  * UserService.
  * 
  * @author Matt Kennedy
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class GaeAuthenticator extends Authenticator {
     /**
      * The GAE UserService that provides facilities to check whether a user has
diff --git a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeEnroler.java b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeEnroler.java
index 510fec4f51..636181083f 100644
--- a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeEnroler.java
+++ b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/GaeEnroler.java
@@ -21,7 +21,9 @@
  * {@link ClientInfo} if the GAE API reports that the user is an administrator.
  * 
  * @author Matt Kennedy
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class GaeEnroler implements Enroler {
 
     /** The Administrator role. */
diff --git a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/package.html b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/package.html
index 0b82f1b866..3c0f510708 100644
--- a/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/package.html
+++ b/org.restlet.java/org.restlet.ext.gae/src/main/java/org/restlet/ext/gae/package.html
@@ -5,5 +5,6 @@
 @since Restlet 2.1
 @see <a href="@home-uri@">Google App Engine</a>
 @see <a href="http://restlet.org/learn/guide/2.2/extensions/gae">User Guide - GAE extension</a>
+@deprecated Will be removed in next major release.
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/GwtConverter.java b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/GwtConverter.java
index af7d511f66..fe7904abaf 100644
--- a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/GwtConverter.java
+++ b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/GwtConverter.java
@@ -30,7 +30,9 @@
  * serialization format.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class GwtConverter extends ConverterHelper {
 
     /** GWT variant. */
diff --git a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/ObjectRepresentation.java b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/ObjectRepresentation.java
index 766c2785c8..b13ca8ef20 100644
--- a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/ObjectRepresentation.java
+++ b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/ObjectRepresentation.java
@@ -28,7 +28,9 @@
  * @author Jerome Louvel
  * @param <T>
  *            The class to serialize.
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class ObjectRepresentation<T> extends StringRepresentation {
 
     /** The wrapped object. */
diff --git a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicy.java b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicy.java
index 42fb4255c7..84f30cf82c 100644
--- a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicy.java
+++ b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicy.java
@@ -17,7 +17,9 @@
  * fields.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class SimpleSerializationPolicy extends SerializationPolicy {
 
     private static final SimpleSerializationPolicy instance = new SimpleSerializationPolicy();
diff --git a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicyProvider.java b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicyProvider.java
index dbce84ae46..06a579a36f 100644
--- a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicyProvider.java
+++ b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/SimpleSerializationPolicyProvider.java
@@ -17,7 +17,9 @@
  * {@link SimpleSerializationPolicy} default instance all the time.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class SimpleSerializationPolicyProvider implements
         SerializationPolicyProvider {
 
diff --git a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/package.html b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/package.html
index df1e594076..2a16df8b9c 100644
--- a/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/package.html
+++ b/org.restlet.java/org.restlet.ext.gwt/src/main/java/org/restlet/ext/gwt/package.html
@@ -1,9 +1,10 @@
 <HTML>
 <BODY>
-Server-side integration with GWT @minor-version@. 
+Server-side integration with GWT. 
 
 @since Restlet 1.1
 @see <a href="@home-uri@">Google Web Toolkit</a>
 @see <a href="http://restlet.org/learn/guide/2.2/extensions/gwt">User Guide - GWT extension</a>
+@deprecated Will be removed in next major release.
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ApplicationProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ApplicationProvider.java
index 8bc667b0ae..64eb853269 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ApplicationProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ApplicationProvider.java
@@ -26,7 +26,9 @@
  * 
  * @author Bryan Hunt
  * @author Wolfgang Werner
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface ApplicationProvider {
     /**
      * The key constant that may be used to look up the
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseApplicationProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseApplicationProvider.java
index fd01a5a09c..0a520e4f7d 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseApplicationProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseApplicationProvider.java
@@ -57,8 +57,9 @@
  * </p>
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class BaseApplicationProvider implements ApplicationProvider {
     private String alias;
 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseDirectoryProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseDirectoryProvider.java
index 58ea01c301..c9c4116413 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseDirectoryProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseDirectoryProvider.java
@@ -66,8 +66,9 @@
  * </p>
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class BaseDirectoryProvider extends BaseRestletProvider implements
         DirectoryProvider {
     private boolean deeplyAccessible = true;
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseFilterProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseFilterProvider.java
index a489915cbd..324d1f0a2b 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseFilterProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseFilterProvider.java
@@ -57,8 +57,9 @@
  * </p>
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class BaseFilterProvider extends BaseRestletProvider implements
         FilterProvider {
     private Filter filter;
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseResourceProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseResourceProvider.java
index 65c86e5acf..e1bef3d117 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseResourceProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseResourceProvider.java
@@ -61,8 +61,9 @@
  * </p>
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class BaseResourceProvider extends BaseRestletProvider
         implements ResourceProvider {
     private Finder finder;
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRestletProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRestletProvider.java
index ebe1a0d336..385aff1e88 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRestletProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRestletProvider.java
@@ -18,8 +18,9 @@
  * but instead extend an appropriate base provider.
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class BaseRestletProvider implements RestletProvider {
     private FilterProvider filterProvider;
 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRouterProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRouterProvider.java
index bbb2006f11..334950bfbe 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRouterProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/BaseRouterProvider.java
@@ -53,8 +53,9 @@
  * </p>
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class BaseRouterProvider extends BaseRestletProvider implements
         RouterProvider {
     private RestletProvider defaultRestletProvider;
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DirectoryProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DirectoryProvider.java
index e105103d27..c952aefd26 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DirectoryProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DirectoryProvider.java
@@ -17,7 +17,9 @@
  * implementation of {@link DirectoryProvider}.
  * 
  * @author Bryan Hunt
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface DirectoryProvider extends RestletProvider {
     /**
      * 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DynamicFinder.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DynamicFinder.java
index 2c342e0aae..51dffd155e 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DynamicFinder.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/DynamicFinder.java
@@ -20,7 +20,9 @@
  * 
  * @author Bryan Hunt
  * @author Wolfgang Werner
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class DynamicFinder extends Finder {
     private Bundle bundle;
 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/FilterProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/FilterProvider.java
index 4b52dfb9b1..fdae6f7dd4 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/FilterProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/FilterProvider.java
@@ -19,7 +19,9 @@
  * {@link FilterProvider} if you need complete control.
  * 
  * @author Bryan Hunt
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface FilterProvider extends RestletProvider {
     /**
      * 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ObapClientHelper.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ObapClientHelper.java
index e0fe4ef155..453707ea9a 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ObapClientHelper.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ObapClientHelper.java
@@ -35,7 +35,9 @@
  * Connector to the resources accessed via bundles.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class ObapClientHelper extends LocalClientHelper {
 
     /** Map of registered bundles. */
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ResourceProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ResourceProvider.java
index e3269f74fa..4b4bb9b147 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ResourceProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/ResourceProvider.java
@@ -25,7 +25,9 @@
  * 
  * @author Bryan Hunt
  * @author Wolfgang Werner
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface ResourceProvider extends RestletProvider {
     /**
      * 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RestletProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RestletProvider.java
index 27e143b5dd..5001ce7366 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RestletProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RestletProvider.java
@@ -18,7 +18,9 @@
  * specialized provider interfaces.
  * 
  * @author Bryan Hunt
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface RestletProvider {
     /**
      * 
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RouterProvider.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RouterProvider.java
index a4745085cc..caa4b91408 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RouterProvider.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/RouterProvider.java
@@ -17,7 +17,8 @@
  * implementation of {@link RouterProvider}.
  * 
  * @author Bryan Hunt
- * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public interface RouterProvider extends RestletProvider {
 }
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/internal/Activator.java b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/internal/Activator.java
index e102304576..5a13296521 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/internal/Activator.java
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/internal/Activator.java
@@ -24,7 +24,9 @@
  * 
  * @author Thierry Boileau
  * @See {@link ObapClientHelper}
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Activator implements BundleActivator {
 
     private static Logger logger = Logger.getLogger("org.restlet.ext.osgi");
diff --git a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/package.html b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/package.html
index 243853a6e8..1fafc82166 100644
--- a/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/package.html
+++ b/org.restlet.java/org.restlet.ext.osgi/src/main/java/org/restlet/ext/osgi/package.html
@@ -6,5 +6,6 @@
 @author Bryan Hunt
 @see <a href="@home-uri@">OSGi Web site</a>
 @see <a href="http://restlet.org/learn/guide/2.2/extensions/osgi">User Guide - OSGi extension</a>
+@deprecated Will be removed in next major release.
 </BODY>
 </HTML>
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Couple.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Couple.java
index 8c27437141..289dbd0b47 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Couple.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Couple.java
@@ -22,7 +22,9 @@
  *            The first object's type.
  * @param <U>
  *            The second object's type.
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Couple<T, U> {
 
     /** The first object. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Graph.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Graph.java
index a18bf71081..0fc768445b 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Graph.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Graph.java
@@ -20,7 +20,9 @@
  * model.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Graph extends CopyOnWriteArraySet<Link> {
 
     /** The serialization unique identifier. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphBuilder.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphBuilder.java
index f9d75b1c9e..bf772efec2 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphBuilder.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphBuilder.java
@@ -14,7 +14,9 @@
 /**
  * Graph handler used when parsing an RDF representation. It completes the inner
  * set of links with all detected ones.
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class GraphBuilder extends GraphHandler {
 
     /** The inner graph of links. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphHandler.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphHandler.java
index f954a45e0a..31b96336ba 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphHandler.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/GraphHandler.java
@@ -16,7 +16,9 @@
 /**
  * Handler for the content of a {@link Graph}. List of callbacks used when
  * parsing or writing a representation of a RDF graph.
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class GraphHandler {
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Link.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Link.java
index 32d20ee412..854b8f1979 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Link.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Link.java
@@ -23,7 +23,9 @@
  * 
  * @author Jerome Louvel
  * @see <a href="http://www.w3.org/TR/rdf-concepts/">RDF concepts</a>
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Link {
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Literal.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Literal.java
index e0a9fc1028..c4d53c5936 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Literal.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Literal.java
@@ -19,7 +19,9 @@
  * @author Jerome Louvel
  * @see <a href="http://www.w3.org/TR/rdf-concepts/#section-Graph-Literal">RDF
  *      literals</a>
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Literal {
 
     /** The optional datatype reference. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfClientResource.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfClientResource.java
index bd7aee41f5..375ac0e445 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfClientResource.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfClientResource.java
@@ -33,7 +33,9 @@
  * navigate the Web of data.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfClientResource extends ClientResource {
 
     /** The links cache. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfConverter.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfConverter.java
index eb9c982dd1..65357e7e0e 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfConverter.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfConverter.java
@@ -24,7 +24,9 @@
  * Converter between the Graph and RDF Representation classes.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfConverter extends ConverterHelper {
 
     private static final VariantInfo VARIANT_RDF_N3 = new VariantInfo(
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfRepresentation.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfRepresentation.java
index 7608909790..972c83ecb7 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfRepresentation.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/RdfRepresentation.java
@@ -34,7 +34,9 @@
  * deserialize a {@link Graph}.
  * 
  * @author Jerome Louvel
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfRepresentation extends WriterRepresentation {
 
     /** The inner graph of links. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Triple.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Triple.java
index 56fd065c55..4f37998ece 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Triple.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/Triple.java
@@ -24,7 +24,9 @@
  *            The second object's type.
  * @param <V>
  *            The third object's type.
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Triple<T, U, V> {
 
     /** The first object. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfConstants.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfConstants.java
index 9b23e51562..d2bf0ebab7 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfConstants.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfConstants.java
@@ -15,7 +15,9 @@
  * Constants related to RDF documents.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfConstants {
 
     /** List "first". */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfReader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfReader.java
index 304b3343fd..a7eb063ea9 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfReader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/RdfReader.java
@@ -17,7 +17,9 @@
 /**
  * Super class of all RDF readers.
  * 
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class RdfReader {
     /** The graph handler invoked when parsing. */
     private GraphHandler graphHandler;
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/FormulaToken.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/FormulaToken.java
index ea855ee4dd..0c19bcf7c5 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/FormulaToken.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/FormulaToken.java
@@ -19,7 +19,9 @@
  * feature is not supported yet.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class FormulaToken extends LexicalUnit {
 
     public FormulaToken(RdfN3Reader contentHandler, Context context)
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Reader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Reader.java
index 24248325e8..c128b46d32 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Reader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Reader.java
@@ -32,7 +32,9 @@
  * Handler of RDF content according to the N3 notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfN3Reader extends RdfTurtleReader {
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Writer.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Writer.java
index 43ae206e7f..f363175268 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Writer.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/n3/RdfN3Writer.java
@@ -25,7 +25,9 @@
  * Handler of RDF content according to the N3 notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfN3Writer extends GraphHandler {
 
     /** The current context object. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesReader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesReader.java
index b859a96a84..35344603a0 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesReader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesReader.java
@@ -26,7 +26,9 @@
  * Handler of RDF content according to the N-Triples notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfNTriplesReader extends RdfReader {
 
     /** Internal buffered reader. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesWriter.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesWriter.java
index 6609db0750..1609a0778a 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesWriter.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/ntriples/RdfNTriplesWriter.java
@@ -22,7 +22,9 @@
  * Handler of RDF content according to the N-Triples notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfNTriplesWriter extends GraphHandler {
 
     /** The character writer. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/BlankNodeToken.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/BlankNodeToken.java
index 094407e63c..61c3879463 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/BlankNodeToken.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/BlankNodeToken.java
@@ -21,7 +21,9 @@
  * parse a blank node in N3 documents.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class BlankNodeToken extends LexicalUnit {
 
     /** List of lexical units contained by this blank node. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Context.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Context.java
index b928f09222..c985cd19d8 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Context.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Context.java
@@ -21,7 +21,9 @@
  * the list of known namespaces, keywords.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Context {
 
     /** The value of the "base" keyword. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/LexicalUnit.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/LexicalUnit.java
index 3bdb8d2455..19c9bfc696 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/LexicalUnit.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/LexicalUnit.java
@@ -15,7 +15,9 @@
  * Represents a lexical unit inside a Turtle document.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public abstract class LexicalUnit {
 
     /** The content handler of the current Turtle document. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/ListToken.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/ListToken.java
index c4422ce764..07048006f3 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/ListToken.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/ListToken.java
@@ -20,7 +20,9 @@
  * Represents a list of Turtle tokens.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class ListToken extends LexicalUnit {
     /** The list of contained tokens. */
     List<LexicalUnit> lexicalUnits;
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleReader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleReader.java
index 16dad031b6..1e11e05ba5 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleReader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleReader.java
@@ -26,7 +26,9 @@
  * Handler of RDF content according to the RDF Turtle notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfTurtleReader extends RdfNTriplesReader {
 
     /** Increment used to identify inner blank nodes. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleWriter.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleWriter.java
index 690779d419..5ce3f1e8d7 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleWriter.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/RdfTurtleWriter.java
@@ -24,7 +24,9 @@
  * Handler of RDF content according to the N3 notation.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfTurtleWriter extends GraphHandler {
 
     /** The current context object. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/StringToken.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/StringToken.java
index 78a26fc19d..f9561a4ada 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/StringToken.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/StringToken.java
@@ -19,7 +19,9 @@
  * language.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class StringToken extends LexicalUnit {
     /** The language of the value. */
     private String language;
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Token.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Token.java
index 4d5ee6e262..2c24c628fe 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Token.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/Token.java
@@ -18,7 +18,9 @@
  * Represents a still unidentified Turtle token.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class Token extends LexicalUnit {
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/UriToken.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/UriToken.java
index e9bc8fb802..e3f649745a 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/UriToken.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/turtle/UriToken.java
@@ -17,7 +17,9 @@
  * Represents a URI token inside a RDF Turtle document.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class UriToken extends LexicalUnit {
     /**
      * Constructor with arguments.
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ContentReader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ContentReader.java
index 22dfff826e..ed634ba6c6 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ContentReader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ContentReader.java
@@ -30,7 +30,9 @@
  * Content reader part.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 class ContentReader extends DefaultHandler {
     public enum State {
         LITERAL, NONE, OBJECT, PREDICATE, SUBJECT
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlReader.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlReader.java
index b39997936a..bcd5c744e4 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlReader.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlReader.java
@@ -20,7 +20,9 @@
  * Handler of RDF content according to the RDF/XML format.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfXmlReader extends RdfReader {
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlWriter.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlWriter.java
index 37e34a3792..b9030d13c2 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlWriter.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/RdfXmlWriter.java
@@ -28,7 +28,9 @@
  * Handler of RDF content according to the RDF XML syntax.
  * 
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 public class RdfXmlWriter extends GraphHandler {
 
     /** The last source reference written, to try to factor statements. */
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ScopedProperty.java b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ScopedProperty.java
index 000ac3dd43..da9d8e3f6c 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ScopedProperty.java
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/internal/xml/ScopedProperty.java
@@ -19,7 +19,9 @@
  * @param <E>
  *            The type of the property.
  * @author Thierry Boileau
+ * @deprecated Will be removed in next major release.
  */
+@Deprecated
 class ScopedProperty<E> {
     private int[] depths;
 
diff --git a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/package.html b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/package.html
index 2183a6a195..45eeb2500f 100644
--- a/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/package.html
+++ b/org.restlet.java/org.restlet.ext.rdf/src/main/java/org/restlet/ext/rdf/package.html
@@ -6,5 +6,6 @@
 @since Restlet 2.0 
 @see <a href="http://www.w3.org/RDF/">Resource Description Framework</a>
 @see <a href="http://restlet.org/learn/guide/2.2/extensions/rdf">User Guide - RDF extension</a>
+@deprecated Will be removed in next major release.
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d417633a85..dfaa227fed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <lib-swagger-version>1.5.3-M1</lib-swagger-version>
         <lib-testng-version>7.5.1</lib-testng-version>
         <lib-thymeleaf-version>3.0.11.RELEASE</lib-thymeleaf-version>
-        <lib-velocity-version>2.3</lib-velocity-version>
+        <lib-velocity-version>2.4.1</lib-velocity-version>
         <lib-woodstock-core-version>4.4.1</lib-woodstock-core-version>
     </properties>