Skip to content

Commit

Permalink
Clean-up project in preparation of 2,5 M2 release
Browse files Browse the repository at this point in the history
 - Updated readme, changes, copyright, license files
 - Updated POM files, including a few minor dependency revisions
 - Ported a fix on ResourceException from 2.4 branch,
  • Loading branch information
jlouvel committed Oct 28, 2024
1 parent 4c70afa commit a017724
Show file tree
Hide file tree
Showing 9 changed files with 276 additions and 28 deletions.
49 changes: 49 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Changes log
===========

- 2.5 Milestone 2 (???/2024)
- Enhancements
- Changed the minimum requirements back to Java 8 like for Restlet Framework 2.4 to facilitate upgrade.
- Transitioned project to native Maven including code base, build and delivery.
- Artifacts are now published in Maven Central and Sonatype OSS repository for snapshots and only there.
- Updated all libraries used as dependency for various extensions.
- RestletFileUpload can now dynamically adapt to Java SE or Java EE environments.
- Bugs fixed
- Ensured that all 2.4.4 fixes have been ported forward to the 2.5 branch.
- Non-serializable internal attributes (status, request, and message) marked as transient,
this is to allow ResourceException to be serialized, passing over the message and stack-trace
(which is typically all that is needed to show the error or print it in the log).
- Misc
- Replaced separate Android, GAE, Java EE and OSGi editions by a single 'Java' edition
(tested to work in those various environments).
- Kept a distinct 'GWT' edition using a forked code base due to many GWT specificities.
- 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.

- 2.5 Milestone 1 (03/09/2020)
- Bugs fixed
- Allow parsing of double values like "2.0" or "4.0" being received in
the Retry-After header. Issue #1355.
Reported by Brett Cooper.
- MemoryRealm.unmap method leads to ArrayOutOfBound exception. Issue #1358.
Reported by j-perrin.
- Misc
- Removed deprecated extensions emf, javamail, jaxrs, jibx, lucene, nio,
oauth, openid, platform, raml, simple, wadl. Issue #1351.
- Removed generation of Eclipse p2 artifacts from the build since the
Eclipse p2 site is no more maintained.
- Refresh copyright headers. Issue #1351.
- Upgraded to JDK 11. Issue #1351.
- Upgraded FileUpload library to version 1.4. Issue #1353.
- Upgraded GSON library to version 2.8.6. Issue #1353.
- Upgraded Guice library to version 4.2.2. Issue #1353.
- Upgraded JaxB library to version 2.4.0-b180830.0438. Issue #1353.
- Upgraded Spring Framework library to version 5.2.2-RELEASE. Issue #1353.
- Upgraded Thymeleaf library to version 3.0.11. Issue #1353.
- Upgraded Velocity library to version 2.1. Issue #1353.
- Upgraded Guava library to version 28.1-jre. Issue #1353.
- Upgraded Jackson library to version 2.10.1. Issue #1353.
- Upgraded Snakeyaml library to version 1.24. Issue #1353.
- Upgraded Jetty library to version 9.4.24.v20191120. Issue #1353.
- Upgraded GWT library to version 2.8.2. Issue #1363.
15 changes: 15 additions & 0 deletions copyright.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Copyright notice
================

Version 5.0, October 2024

Copyright 2005-2024 Qlik

The contents of this open source project are subject to the terms of the Apache 2.0 open
source license available at http://www.opensource.org/licenses/apache-2.0

Restlet is a registered trademark of QlikTech International AB.

All third-party libraries redistributed with this software remain the property
of their respective copyright owners and are subject to separate license
agreements.
181 changes: 181 additions & 0 deletions license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
License agreement
=================

Version 7.0, October 2024

This software distribution, including the "Restlet API", the "Restlet Engine"
and the "Restlet Extensions", together defined as the "Restlet Framework" is
provided to you under the Apache license version 2.0.

Note that this agreement doesn't cover the redistributed third-party libraries.
Those libraries are provided to you for convenience purpose but remain under
their respective license.

_______________________________________________________________________
Apache License, Version 2.0

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control
with that entity. For the purposes of this definition, "control" means
(i) the power, direct or indirect, to cause the direction or management
of such entity, whether by contract or otherwise, or (ii) ownership of
fifty percent (50%) or more of the outstanding shares, or (iii)
beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation source,
and configuration files.

"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled
object code, generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the
Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial
revisions, annotations, elaborations, or other modifications represent,
as a whole, an original work of authorship. For the purposes of this License,
Derivative Works shall not include works that remain separable from, or merely
link (or bind by name) to the interfaces of, the Work and Derivative Works
thereof.

"Contribution" shall mean any work of authorship, including the original
version of the Work and any modifications or additions to that Work or
Derivative Works thereof, that is intentionally submitted to Licensor for
inclusion in the Work by the copyright owner or by an individual or Legal
Entity authorized to submit on behalf of the copyright owner. For the
purposes of this definition, "submitted" means any form of electronic, verbal,
or written communication sent to the Licensor or its representatives, including
but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but excluding
communication that is conspicuously marked or otherwise designated in writing by
the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
whom a Contribution has been received by Licensor and subsequently incorporated
within the Work.

2. Grant of Copyright License.

Subject to the terms and conditions of this License, each Contributor hereby grants
to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of, publicly display, publicly
perform, sublicense, and distribute the Work and such Derivative Works in Source or
Object form.

3. Grant of Patent License.

Subject to the terms and conditions of this License, each Contributor hereby grants
to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made, use, offer to
sell, sell, import, and otherwise transfer the Work, where such license applies only
to those patent claims licensable by such Contributor that are necessarily infringed
by their Contribution(s) alone or by combination of their Contribution(s) with the Work
to which such Contribution(s) was submitted. If You institute patent litigation against
any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
Work or a Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License for
that Work shall terminate as of the date such litigation is filed.

4. Redistribution.

You may reproduce and distribute copies of the Work or Derivative Works thereof in
any medium, with or without modifications, and in Source or Object form, provided
that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of
this License; and
You must cause any modified files to carry prominent notices stating that You
changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute,
all copyright, patent, trademark, and attribution notices from the Source form
of the Work, excluding those notices that do not pertain to any part of the
Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then
any Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in at least one of the
following places: within a NOTICE text file distributed as part of the Derivative
Works; within the Source form or documentation, if provided along with the Derivative
Works; or, within a display generated by the Derivative Works, if and wherever such
third-party notices normally appear. The contents of the NOTICE file are for
informational purposes only and do not modify the License. You may add Your own
attribution notices within Derivative Works that You distribute, alongside or as
an addendum to the NOTICE text from the Work, provided that such additional attribution
notices cannot be construed as modifying the License.

You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.

5. Submission of Contributions.

Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions. Notwithstanding
the above, nothing herein shall supersede or modify the terms of any separate license
agreement you may have executed with Licensor regarding such Contributions.

6. Trademarks.

This License does not grant permission to use the trade names, trademarks, service
marks, or product names of the Licensor, except as required for reasonable and
customary use in describing the origin of the Work and reproducing the content of
the NOTICE file.

7. Disclaimer of Warranty.

Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without
limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any risks associated
with Your exercise of permissions under this License.

8. Limitation of Liability.

In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to damages
for loss of goodwill, work stoppage, computer failure or malfunction, or any and
all other commercial damages or losses), even if such Contributor has been advised
of the possibility of such damages.

9. Accepting Warranty or Additional Liability.

While redistributing the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity, or other liability
obligations and/or rights consistent with this License. However, in accepting such
obligations, You may act only on Your own behalf and on Your sole responsibility,
not on behalf of any other Contributor, and only if You agree to indemnify, defend,
and hold each Contributor harmless for any liability incurred by, or claims asserted
against, such Contributor by reason of your accepting any such warranty or additional
liability.
2 changes: 1 addition & 1 deletion org.restlet.java/org.restlet.ext.fileupload/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${lib-fileupload-version}</version>
<version>${lib-commons-fileupload-version}</version>
</dependency>
<dependency>
<groupId>org.restlet</groupId>
Expand Down
10 changes: 5 additions & 5 deletions org.restlet.java/org.restlet.ext.httpclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${lib-codec-version}</version>
<version>${lib-commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${lib-httpclient-version}</version>
<version>${lib-commons-httpclient-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${lib-httpcore-version}</version>
<version>${lib-commons-httpcore-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${lib-httpmime-version}</version>
<version>${lib-commons-httpmime-version}</version>
</dependency>
<dependency>
<groupId>net.jcip</groupId>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${lib-logging-version}</version>
<version>${lib-commons-logging-version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Expand Down
2 changes: 1 addition & 1 deletion org.restlet.java/org.restlet.ext.spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${lib-logging-version}</version>
<version>${lib-commons-logging-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public class ResourceException extends RuntimeException {
private static final long serialVersionUID = 1L;

/** The status associated to this exception. */
private final Status status;
private transient Status status;

/** The request associated to this exception. Could be null. */
private final Request request;
private transient Request request;

/** The response associated to this exception. Could be null. */
private final Response response;
private transient Response response;

/**
* Constructor.
Expand Down
25 changes: 12 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Restlet project</name>
<name>Restlet Framework project</name>
<description>Lightweight REST framework</description>
<url>https://restlet.talend.com/</url>
<inceptionYear>2005</inceptionYear>
Expand All @@ -32,10 +32,17 @@
<lib-aopalliance-version>1.0</lib-aopalliance-version>
<lib-bloat-version>1.0</lib-bloat-version>
<lib-cglib-version>3.3.0</lib-cglib-version>
<lib-codec-version>1.17.0</lib-codec-version>
<lib-commons-codec-version>1.17.0</lib-commons-codec-version>
<lib-commons-collections-version>3.2.2</lib-commons-collections-version>
<lib-commons-fileupload-version>1.5</lib-commons-fileupload-version>
<lib-commons-httpclient-version>4.5.14</lib-commons-httpclient-version>
<lib-commons-httpcore-version>4.4.16</lib-commons-httpcore-version>
<lib-commons-httpmime-version>4.5.14</lib-commons-httpmime-version>
<lib-commons-io-version>2.16.1</lib-commons-io-version>
<lib-commons-lang-version>3.14.0</lib-commons-lang-version>
<lib-commons-logging-version>1.3.1</lib-commons-logging-version>
<lib-commons-pool-version>1.6</lib-commons-pool-version>
<lib-e4-version>1.7.500</lib-e4-version>
<lib-fileupload-version>1.5</lib-fileupload-version>
<lib-freemarker-version>2.3.32</lib-freemarker-version>
<lib-gae-version>1.9.98</lib-gae-version>
<lib-gcollections-version>1.0</lib-gcollections-version>
Expand All @@ -46,35 +53,27 @@
<lib-gwt-version>2.11.0</lib-gwt-version>
<lib-gwt-server-version>2.10.0</lib-gwt-server-version>
<lib-hamcrest-version>1.3</lib-hamcrest-version>
<lib-httpclient-version>4.5.14</lib-httpclient-version>
<lib-httpcore-version>4.4.16</lib-httpcore-version>
<lib-httpmime-version>4.5.14</lib-httpmime-version>
<lib-io-version>2.16.1</lib-io-version>
<lib-jackson-version>2.17.0</lib-jackson-version>
<lib-jaxb-ri-version>2.4.0-b180830.0438</lib-jaxb-ri-version>
<lib-jaxb-api-version>2.4.0-b180830.0359</lib-jaxb-api-version>
<lib-jaxrs-api-version>2.0</lib-jaxrs-api-version>
<lib-javax-inject-version>1</lib-javax-inject-version>
<lib-jcip-annotations-version>1.0</lib-jcip-annotations-version>
<lib-jetty-version>9.4.54.v20240208</lib-jetty-version>
<lib-jetty-version>9.4.56.v20240826</lib-jetty-version>
<lib-joda-time-version>2.12.7</lib-joda-time-version>
<lib-json4s-version>3.2.4</lib-json4s-version>
<lib-json-version>20240303</lib-json-version>
<lib-jsslutils-version>1.0.5</lib-jsslutils-version>
<lib-junit-version>5.10.2</lib-junit-version>
<lib-lang-version>3.14.0</lib-lang-version>
<lib-log4j-version>1.2.17</lib-log4j-version>
<lib-logging-version>1.3.1</lib-logging-version>
<lib-mime4j-version>0.8.11</lib-mime4j-version>
<lib-mongodb-version>2.14.3</lib-mongodb-version>
<lib-osgi-version>4.0.0</lib-osgi-version>
<lib-pool-version>1.6</lib-pool-version>
<lib-protobuf-version>2.2.0</lib-protobuf-version>
<lib-raml-version>0.8.40</lib-raml-version>
<lib-scala-version>2.13.13</lib-scala-version>
<lib-sdc-version>1.3.rc2</lib-sdc-version>
<lib-servlet-version>3.1.0</lib-servlet-version>
<lib-slf4j-version>2.0.13</lib-slf4j-version>
<lib-slf4j-version>2.0.16</lib-slf4j-version>
<lib-snakeyaml-version>2.2</lib-snakeyaml-version>
<lib-spring-version>5.3.34</lib-spring-version>
<lib-sun-istack-version>3.0.10</lib-sun-istack-version>
Expand Down
Loading

0 comments on commit a017724

Please sign in to comment.