Bumped version 2.6.0

Thierry Boileau · Thierry Boileau · commit 13ecf3a45b1c · 2025-06-29T20:51:38.000+02:00
diff --git a/changes.md b/changes.md
@@ -1,8 +1,6 @@
 Changes log
 ===========
 
-- 2.6.1 (??-??-2025)
-
 - 2.6.0 (29-06-2025)
 
 - 2.6 Release Candidate 2 (21-06-2025)
diff --git a/org.restlet.gwt/org.restlet.gwt.ext.json/pom.xml b/org.restlet.gwt/org.restlet.gwt.ext.json/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet.gwt</groupId>
         <artifactId>org.restlet.gwt.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.gwt/org.restlet.gwt.ext.xml/pom.xml b/org.restlet.gwt/org.restlet.gwt.ext.xml/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet.gwt</groupId>
         <artifactId>org.restlet.gwt.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.gwt/org.restlet.gwt/pom.xml b/org.restlet.gwt/org.restlet.gwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet.gwt</groupId>
         <artifactId>org.restlet.gwt.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/engine/Engine.java b/org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/engine/Engine.java
@@ -72,7 +72,7 @@ public class Engine {
     public static final String MINOR_NUMBER = "6";
 
     /** Release number. */
-    public static final String RELEASE_NUMBER = ".1-SNAPSHOT";
+    public static final String RELEASE_NUMBER = ".0";
 
     /** Complete version. */
     public static final String VERSION = MAJOR_NUMBER + '.' + MINOR_NUMBER
diff --git a/org.restlet.gwt/pom.xml b/org.restlet.gwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet</groupId>
         <artifactId>org.restlet.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.java/org.restlet.ext.atom/pom.xml b/org.restlet.java/org.restlet.ext.atom/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.crypto/pom.xml b/org.restlet.java/org.restlet.ext.crypto/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.freemarker/pom.xml b/org.restlet.java/org.restlet.ext.freemarker/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.gson/pom.xml b/org.restlet.java/org.restlet.ext.gson/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.guice/pom.xml b/org.restlet.java/org.restlet.ext.guice/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.gwt/pom.xml b/org.restlet.java/org.restlet.ext.gwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet</groupId>
         <artifactId>org.restlet.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.java/org.restlet.ext.jaas/pom.xml b/org.restlet.java/org.restlet.ext.jaas/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.jackson/pom.xml b/org.restlet.java/org.restlet.ext.jackson/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.jaxb/pom.xml b/org.restlet.java/org.restlet.ext.jaxb/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.jetty/pom.xml b/org.restlet.java/org.restlet.ext.jetty/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/AsyncTestCase.java b/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/AsyncTestCase.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.restlet.*;
 import org.restlet.data.*;
+import org.restlet.engine.Engine;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 
@@ -89,12 +90,13 @@ public void handle(Request request, Response response) {
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         // Create components
         clientComponent = new Component();
         originComponent = new Component();
 
         // Create a new Restlet that will display some path information.
-        final Restlet trace = new Restlet(originComponent.getContext()
+            final Restlet trace = new Restlet(originComponent.getContext()
                 .createChildContext()) {
             @Override
             public void handle(Request request, Response response) {
@@ -172,6 +174,7 @@ public void testDelete() throws Exception {
 
     @AfterEach
     protected void tearDownEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         // Stop the components
         clientComponent.stop();
         originComponent.stop();
diff --git a/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/ShutdownHookTestCase.java b/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/ShutdownHookTestCase.java
@@ -24,7 +24,9 @@
 
 package org.restlet.ext.jetty;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.restlet.*;
 import org.restlet.data.MediaType;
@@ -46,9 +48,17 @@ public class ShutdownHookTestCase {
     private static final Logger LOGGER = Logger.getLogger("ShutdownHookTest");
     private static boolean shouldDebug = false;
 
-    @BeforeAll
-    public static void setUp() {
-        LOGGER.setLevel(Level.INFO);
+    @BeforeEach
+    public void setUp() {
+        LOGGER.setLevel(Level.FINE);
+        Engine.clearThreadLocalVariables();
+        Engine.register(true);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        Engine.clearThreadLocalVariables();
+        Engine.register(true);
     }
 
     /**
diff --git a/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/BaseConnectorsTestCase.java b/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/BaseConnectorsTestCase.java
@@ -121,6 +121,7 @@ private void initEngine(HttpServer server, HttpClient client) {
             Engine.setLogLevel(Level.FINE);
         }
 
+        Engine.clearThreadLocalVariables();
         Engine nre = Engine.register(false);
         nre.getRegisteredServers().add(server.serverHelper);
         nre.getRegisteredClients().add(client.clientHelper);
@@ -130,7 +131,8 @@ private void initEngine(HttpServer server, HttpClient client) {
 
     private void resetEngine() {
         // Restore a clean engine
-        org.restlet.engine.Engine.register();
+        Engine.register();
+        Engine.clearThreadLocalVariables();
     }
 
     public enum HttpServer {
diff --git a/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/SslBaseConnectorsTestCase.java b/org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/SslBaseConnectorsTestCase.java
@@ -14,6 +14,7 @@
 import org.restlet.*;
 import org.restlet.data.Parameter;
 import org.restlet.data.Protocol;
+import org.restlet.engine.Engine;
 import org.restlet.engine.io.IoUtils;
 import org.restlet.util.Series;
 
@@ -39,6 +40,8 @@ public abstract class SslBaseConnectorsTestCase extends BaseConnectorsTestCase {
 
     @BeforeAll
     public static void globalSetUp() throws IOException {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
         testKeystoreFile = Files.createTempFile("sslBaseConnectorsTest", KEYSTORE_FILE_NAME).toFile();
         testKeystoreFile.delete();
 
@@ -110,7 +113,8 @@ protected static void tearDown() {
         testKeystoreFile.delete();
 
         // Restore a clean engine
-        org.restlet.engine.Engine.register();
+        Engine.clearThreadLocalVariables();
+        Engine.register();
     }
 
 }
diff --git a/org.restlet.java/org.restlet.ext.json/pom.xml b/org.restlet.java/org.restlet.ext.json/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.odata/pom.xml b/org.restlet.java/org.restlet.ext.odata/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.servlet/pom.xml b/org.restlet.java/org.restlet.ext.servlet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet</groupId>
         <artifactId>org.restlet.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.java/org.restlet.ext.slf4j/pom.xml b/org.restlet.java/org.restlet.ext.slf4j/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.spring/pom.xml b/org.restlet.java/org.restlet.ext.spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet</groupId>
         <artifactId>org.restlet.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.java/org.restlet.ext.thymeleaf/pom.xml b/org.restlet.java/org.restlet.ext.thymeleaf/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.velocity/pom.xml b/org.restlet.java/org.restlet.ext.velocity/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet.ext.xml/pom.xml b/org.restlet.java/org.restlet.ext.xml/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.restlet</groupId>
 		<artifactId>org.restlet.parent</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.6.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.restlet.java/org.restlet/pom.xml b/org.restlet.java/org.restlet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.restlet</groupId>
         <artifactId>org.restlet.parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/org.restlet.java/org.restlet/src/main/java/org/restlet/engine/Engine.java b/org.restlet.java/org.restlet/src/main/java/org/restlet/engine/Engine.java
@@ -90,7 +90,7 @@ public class Engine {
 	public static final String MINOR_NUMBER = "6";
 
 	/** Release number. */
-	public static final String RELEASE_NUMBER = ".1-SNAPSHOT";
+	public static final String RELEASE_NUMBER = ".0";
 
 	/** The org.restlet log level. */
 	private static volatile Level restletLogLevel;
diff --git a/org.restlet.java/org.restlet/src/test/java/org/restlet/representation/DigesterRepresentationTestCase.java b/org.restlet.java/org.restlet/src/test/java/org/restlet/representation/DigesterRepresentationTestCase.java
@@ -37,6 +37,7 @@ public class DigesterRepresentationTestCase {
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         Engine.register();
         component = new Component();
         final Server server = component.getServers().add(Protocol.HTTP, 0);
@@ -47,6 +48,8 @@ protected void setUpEach() throws Exception {
 
     @AfterEach
     protected void tearDownEach() throws Exception {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
         component.stop();
         component = null;
     }
diff --git a/org.restlet.java/org.restlet/src/test/java/org/restlet/representation/FileRepresentationTestCase.java b/org.restlet.java/org.restlet/src/test/java/org/restlet/representation/FileRepresentationTestCase.java
@@ -40,6 +40,7 @@ public class FileRepresentationTestCase {
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         Engine.getInstance().getRegisteredClients().add(new HttpClientHelper(null));
         Engine.getInstance().getRegisteredServers().add(new HttpServerHelper(null));
 
@@ -55,6 +56,7 @@ protected void setUpEach() throws Exception {
 
     @AfterEach
     protected void tearDownEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         component.stop();
         component = null;
     }
diff --git a/org.restlet.java/org.restlet/src/test/java/org/restlet/routing/RedirectTestCase.java b/org.restlet.java/org.restlet/src/test/java/org/restlet/routing/RedirectTestCase.java
diff --git a/org.restlet.java/pom.xml b/org.restlet.java/pom.xml
diff --git a/pom.xml b/pom.xml
