diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000000..948c874427
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,3 @@
+java adoptopenjdk-8.0.275+1
+maven 3.8.4
+nodejs 16.14.0
diff --git a/README.md b/README.md
index d76016d951..31ca3404a6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Restlet Framework
-## The leading REST API framework for Java
+## The first REST API framework for Java
Thanks to Restlet Framework's powerful routing and filtering capabilities, unified client and server Java API, developers can build secure and scalable RESTful web APIs.
@@ -20,9 +20,9 @@ To learn more about Restlet Framework, please have a look at the following resou
* [Change Log](https://restlet.talend.com/documentation/2.4/changelog)
* [Download](https://restlet.talend.com/downloads/current/)
* [Issue Tracker](https://github.com/restlet/restlet-framework-java/issues)
-* [Mailing List](https://groups.google.com/a/restlet.org/forum/#!forum/framework-discuss)
+* [Discussions](https://github.com/restlet/restlet-framework-java/discussions)
* [Stack Overflow](http://stackoverflow.com/questions/tagged/restlet)
-Copyright 2020 Talend
+Copyright 2024 Qlik
[](https://travis-ci.org/restlet/restlet-framework-java)
diff --git a/build/build.properties b/build/build.properties
index 2d228b2348..c6ffeb08be 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,12 +1,12 @@
-# =======================================================================
-# Restlet Framework build properties file - Copyright 2005-2020 Talend
-# =======================================================================
+# ====================================================================
+# Restlet Framework build properties file - Copyright 2005-2024 Qlik
+# ====================================================================
# The version numbers
major-number: 2
minor-number: 4
# the last figure of the real release number: e.g. 1 in "2.2m1", "2.3rc1", "2.4.1"
-release-number:4
+release-number:5
# choose among: final, snapshot, rc, milestone
meta.release-type: snapshot
version-minor: ${major-number}.${minor-number}
diff --git a/build/build.xml b/build/build.xml
index 3699fc4339..840b35e04e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,8 +1,8 @@
-
+
diff --git a/build/tmpl/editions/build.xml b/build/tmpl/editions/build.xml
index 221dc98cf8..e6a585d099 100644
--- a/build/tmpl/editions/build.xml
+++ b/build/tmpl/editions/build.xml
@@ -1,8 +1,8 @@
-
+
diff --git a/build/tmpl/editions/edition.properties b/build/tmpl/editions/edition.properties
index b0a30e7bc2..ee0cfbfd19 100644
--- a/build/tmpl/editions/edition.properties
+++ b/build/tmpl/editions/edition.properties
@@ -1,6 +1,6 @@
-# ======================================================================
-# Restlet edition properties file - Copyright 2005-${currentYear} Talend
-# ======================================================================
+# ===================================================================
+# Restlet edition properties file - Copyright 2005-${currentYear} Qlik
+# ===================================================================
edition: ${edition.id}
edition-full-label: ${edition.fullLabel}
diff --git a/build/tmpl/editions/javadocs.tmpl b/build/tmpl/editions/javadocs.tmpl
index 0aacdfc8e0..7bd9b2f5d8 100644
--- a/build/tmpl/editions/javadocs.tmpl
+++ b/build/tmpl/editions/javadocs.tmpl
@@ -21,7 +21,7 @@ JAVADOC target -->
source="${jdk.compilation.version}"
verbose="${verbose}">
- Copyright © 2005-${current-year} Restlet.]]>
+ Copyright © 2005-${current-year} Restlet.]]>
Restlet Framework ${version-full}
${edition-full-label}]]>
@@ -52,7 +52,7 @@ JAVADOC target -->
source="${jdk.compilation.version}"
verbose="${verbose}">
- Copyright © 2005-${current-year} Restlet.]]>
+ Copyright © 2005-${current-year} Restlet.]]>
Restlet Framework ${version-full}
${edition-full-label}]]>
@@ -93,7 +93,7 @@ JAVADOC target -->
source="${jdk.compilation.version}"
verbose="${verbose}">
- Copyright © 2005-${current-year} Restlet.]]>
+ Copyright © 2005-${current-year} Restlet.]]>
Restlet Framework ${version-full}
${edition-full-label}]]>
diff --git a/build/tmpl/editions/libraries.properties b/build/tmpl/editions/libraries.properties
index 91d99090e8..21a144cc61 100644
--- a/build/tmpl/editions/libraries.properties
+++ b/build/tmpl/editions/libraries.properties
@@ -1,7 +1,7 @@
<#compress>
-# ======================================================================
-# Restlet libraries properties file - Copyright 2005-${currentYear} Talend
-# ======================================================================
+# ===================================================================
+# Restlet libraries properties file - Copyright 2005-${currentYear} Qlik
+# ===================================================================
<#list edition.libraries?sort_by("id") as library>
lib-${library.id}-root: ${library.rootDirectory}
diff --git a/build/tmpl/editions/maven-javadocs.tmpl b/build/tmpl/editions/maven-javadocs.tmpl
index 84f0cf9fc8..fe9a62880f 100644
--- a/build/tmpl/editions/maven-javadocs.tmpl
+++ b/build/tmpl/editions/maven-javadocs.tmpl
@@ -16,7 +16,7 @@ maven JAVADOC target -->
source="${jdk.compilation.version}"
verbose="${verbose}">
- Copyright © 2005-${current-year} Restlet.]]>
+ Copyright © 2005-${current-year} Restlet.]]>
#noparse>
<#list edition.javadocsLinks as link>
diff --git a/build/tmpl/editions/modules.properties b/build/tmpl/editions/modules.properties
index 00ea2569c0..11b6460773 100644
--- a/build/tmpl/editions/modules.properties
+++ b/build/tmpl/editions/modules.properties
@@ -1,6 +1,6 @@
-# ======================================================================
-# Restlet modules properties file - Copyright 2005-${currentYear} Talend
-# ======================================================================
+# ===================================================================
+# Restlet modules properties file - Copyright 2005-${currentYear} Qlik
+# ===================================================================
<#list edition.modules?sort_by("id") as module>
mod-${module.id}-id: ${module.package}
diff --git a/build/tmpl/editions/org.restlet.parent.pom.tmpl b/build/tmpl/editions/org.restlet.parent.pom.tmpl
index 5a7e5ed59a..11c3d9cc3f 100644
--- a/build/tmpl/editions/org.restlet.parent.pom.tmpl
+++ b/build/tmpl/editions/org.restlet.parent.pom.tmpl
@@ -18,30 +18,21 @@
-
- maven-central
- Central Maven repository
- http://repo1.maven.org/maven2/
-
-
- maven2-java
- Java.net repository
- http://download.java.net/maven/2
-
- maven1-java
- http://download.java.net/maven/1
- legacy
+ maven2-java
+ Java.net repository
+ https://download.java.net/maven/2
+
+
+ maven-restlet
+ Restlet repository
+ https://maven.restlet.org
-
- maven-restlet
- Restlet repository
- http://maven.restlet.org
-
UTF-8
+ 1.8
<#list edition.libraries as library>
<#list library.packages?sort as package>
<#if package.mavenVersion??>${package.mavenVersion}<#else>${library.minorVersion}<#if library.versionSuffix??>.${library.versionSuffix}#if>#if>
@@ -77,9 +68,8 @@
http://www.opensource.org/licenses/eclipse-1.0
-
-
<#noparse>
+
${basedir}/src
@@ -94,16 +84,17 @@
-#noparse>
org.apache.maven.plugins
maven-compiler-plugin
+ 3.13.0
- 1.5
- 1.5
+ ${java-version}
+ ${java-version}
-
+#noparse>
+
diff --git a/build/tmpl/javadocs/overview-api.tmpl b/build/tmpl/javadocs/overview-api.tmpl
index bcdafca348..032f3a4eb3 100644
--- a/build/tmpl/javadocs/overview-api.tmpl
+++ b/build/tmpl/javadocs/overview-api.tmpl
@@ -5,7 +5,7 @@ Restlet Framework is a RESTful Web API framework for Java. This documentation co
Restlet Engine. In addition, there are several
Restlet Extensions available.
-The Restlet Framework is led by Restlet, Inc.
+The Restlet Framework is led by Restlet, Inc.
with the help of the Restlet community.
@see REST dissertation by Roy T. Fielding