Skip to content

Commit a017724

Browse files
jlouveljlouvel
committed
Clean-up project in preparation of 2,5 M2 release
 - Updated readme, changes, copyright, license files - Updated POM files, including a few minor dependency revisions - Ported a fix on ResourceException from 2.4 branch,
1 parent 4c70afa commit a017724

File tree

9 files changed

+276
-28
lines changed

9 files changed

+276
-28
lines changed

Diff for: ‎changes.md

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Changes log
2+
===========
3+
4+
- 2.5 Milestone 2 (???/2024)
5+
- Enhancements
6+
- Changed the minimum requirements back to Java 8 like for Restlet Framework 2.4 to facilitate upgrade.
7+
- Transitioned project to native Maven including code base, build and delivery.
8+
- Artifacts are now published in Maven Central and Sonatype OSS repository for snapshots and only there.
9+
- Updated all libraries used as dependency for various extensions.
10+
- RestletFileUpload can now dynamically adapt to Java SE or Java EE environments.
11+
- Bugs fixed
12+
- Ensured that all 2.4.4 fixes have been ported forward to the 2.5 branch.
13+
- Non-serializable internal attributes (status, request, and message) marked as transient,
14+
this is to allow ResourceException to be serialized, passing over the message and stack-trace
15+
(which is typically all that is needed to show the error or print it in the log).
16+
- Misc
17+
- Replaced separate Android, GAE, Java EE and OSGi editions by a single 'Java' edition
18+
(tested to work in those various environments).
19+
- Kept a distinct 'GWT' edition using a forked code base due to many GWT specificities.
20+
- Removed incubator to rely instead on pull requests.
21+
- Renamed extension Inject into Guice as it isn't truly generic.
22+
- Updated the links in all Javadocs file for accuracy.
23+
24+
- 2.5 Milestone 1 (03/09/2020)
25+
- Bugs fixed
26+
- Allow parsing of double values like "2.0" or "4.0" being received in
27+
the Retry-After header. Issue #1355.
28+
Reported by Brett Cooper.
29+
- MemoryRealm.unmap method leads to ArrayOutOfBound exception. Issue #1358.
30+
Reported by j-perrin.
31+
- Misc
32+
- Removed deprecated extensions emf, javamail, jaxrs, jibx, lucene, nio,
33+
oauth, openid, platform, raml, simple, wadl. Issue #1351.
34+
- Removed generation of Eclipse p2 artifacts from the build since the
35+
Eclipse p2 site is no more maintained.
36+
- Refresh copyright headers. Issue #1351.
37+
- Upgraded to JDK 11. Issue #1351.
38+
- Upgraded FileUpload library to version 1.4. Issue #1353.
39+
- Upgraded GSON library to version 2.8.6. Issue #1353.
40+
- Upgraded Guice library to version 4.2.2. Issue #1353.
41+
- Upgraded JaxB library to version 2.4.0-b180830.0438. Issue #1353.
42+
- Upgraded Spring Framework library to version 5.2.2-RELEASE. Issue #1353.
43+
- Upgraded Thymeleaf library to version 3.0.11. Issue #1353.
44+
- Upgraded Velocity library to version 2.1. Issue #1353.
45+
- Upgraded Guava library to version 28.1-jre. Issue #1353.
46+
- Upgraded Jackson library to version 2.10.1. Issue #1353.
47+
- Upgraded Snakeyaml library to version 1.24. Issue #1353.
48+
- Upgraded Jetty library to version 9.4.24.v20191120. Issue #1353.
49+
- Upgraded GWT library to version 2.8.2. Issue #1363.

Diff for: ‎copyright.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Copyright notice
2+
================
3+
4+
Version 5.0, October 2024
5+
6+
Copyright 2005-2024 Qlik
7+
8+
The contents of this open source project are subject to the terms of the Apache 2.0 open
9+
source license available at http://www.opensource.org/licenses/apache-2.0
10+
11+
Restlet is a registered trademark of QlikTech International AB.
12+
13+
All third-party libraries redistributed with this software remain the property
14+
of their respective copyright owners and are subject to separate license
15+
agreements.

Diff for: ‎license.md

+181
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
License agreement
2+
=================
3+
4+
Version 7.0, October 2024
5+
6+
This software distribution, including the "Restlet API", the "Restlet Engine"
7+
and the "Restlet Extensions", together defined as the "Restlet Framework" is
8+
provided to you under the Apache license version 2.0.
9+
10+
Note that this agreement doesn't cover the redistributed third-party libraries.
11+
Those libraries are provided to you for convenience purpose but remain under
12+
their respective license.
13+
14+
_______________________________________________________________________
15+
Apache License, Version 2.0
16+
17+
Apache License
18+
Version 2.0, January 2004
19+
http://www.apache.org/licenses/
20+
21+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
22+
23+
1. Definitions.
24+
25+
"License" shall mean the terms and conditions for use, reproduction,
26+
and distribution as defined by Sections 1 through 9 of this document.
27+
28+
"Licensor" shall mean the copyright owner or entity authorized by the
29+
copyright owner that is granting the License.
30+
31+
"Legal Entity" shall mean the union of the acting entity and all other
32+
entities that control, are controlled by, or are under common control
33+
with that entity. For the purposes of this definition, "control" means
34+
(i) the power, direct or indirect, to cause the direction or management
35+
of such entity, whether by contract or otherwise, or (ii) ownership of
36+
fifty percent (50%) or more of the outstanding shares, or (iii)
37+
beneficial ownership of such entity.
38+
39+
"You" (or "Your") shall mean an individual or Legal Entity exercising
40+
permissions granted by this License.
41+
42+
"Source" form shall mean the preferred form for making modifications,
43+
including but not limited to software source code, documentation source,
44+
and configuration files.
45+
46+
"Object" form shall mean any form resulting from mechanical transformation
47+
or translation of a Source form, including but not limited to compiled
48+
object code, generated documentation, and conversions to other media types.
49+
50+
"Work" shall mean the work of authorship, whether in Source or Object form,
51+
made available under the License, as indicated by a copyright notice that
52+
is included in or attached to the work (an example is provided in the
53+
Appendix below).
54+
55+
"Derivative Works" shall mean any work, whether in Source or Object form,
56+
that is based on (or derived from) the Work and for which the editorial
57+
revisions, annotations, elaborations, or other modifications represent,
58+
as a whole, an original work of authorship. For the purposes of this License,
59+
Derivative Works shall not include works that remain separable from, or merely
60+
link (or bind by name) to the interfaces of, the Work and Derivative Works
61+
thereof.
62+
63+
"Contribution" shall mean any work of authorship, including the original
64+
version of the Work and any modifications or additions to that Work or
65+
Derivative Works thereof, that is intentionally submitted to Licensor for
66+
inclusion in the Work by the copyright owner or by an individual or Legal
67+
Entity authorized to submit on behalf of the copyright owner. For the
68+
purposes of this definition, "submitted" means any form of electronic, verbal,
69+
or written communication sent to the Licensor or its representatives, including
70+
but not limited to communication on electronic mailing lists, source code control
71+
systems, and issue tracking systems that are managed by, or on behalf of, the
72+
Licensor for the purpose of discussing and improving the Work, but excluding
73+
communication that is conspicuously marked or otherwise designated in writing by
74+
the copyright owner as "Not a Contribution."
75+
76+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
77+
whom a Contribution has been received by Licensor and subsequently incorporated
78+
within the Work.
79+
80+
2. Grant of Copyright License.
81+
82+
Subject to the terms and conditions of this License, each Contributor hereby grants
83+
to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
84+
copyright license to reproduce, prepare Derivative Works of, publicly display, publicly
85+
perform, sublicense, and distribute the Work and such Derivative Works in Source or
86+
Object form.
87+
88+
3. Grant of Patent License.
89+
90+
Subject to the terms and conditions of this License, each Contributor hereby grants
91+
to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
92+
(except as stated in this section) patent license to make, have made, use, offer to
93+
sell, sell, import, and otherwise transfer the Work, where such license applies only
94+
to those patent claims licensable by such Contributor that are necessarily infringed
95+
by their Contribution(s) alone or by combination of their Contribution(s) with the Work
96+
to which such Contribution(s) was submitted. If You institute patent litigation against
97+
any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
98+
Work or a Contribution incorporated within the Work constitutes direct or contributory
99+
patent infringement, then any patent licenses granted to You under this License for
100+
that Work shall terminate as of the date such litigation is filed.
101+
102+
4. Redistribution.
103+
104+
You may reproduce and distribute copies of the Work or Derivative Works thereof in
105+
any medium, with or without modifications, and in Source or Object form, provided
106+
that You meet the following conditions:
107+
108+
You must give any other recipients of the Work or Derivative Works a copy of
109+
this License; and
110+
You must cause any modified files to carry prominent notices stating that You
111+
changed the files; and
112+
You must retain, in the Source form of any Derivative Works that You distribute,
113+
all copyright, patent, trademark, and attribution notices from the Source form
114+
of the Work, excluding those notices that do not pertain to any part of the
115+
Derivative Works; and
116+
If the Work includes a "NOTICE" text file as part of its distribution, then
117+
any Derivative Works that You distribute must include a readable copy of the
118+
attribution notices contained within such NOTICE file, excluding those notices
119+
that do not pertain to any part of the Derivative Works, in at least one of the
120+
following places: within a NOTICE text file distributed as part of the Derivative
121+
Works; within the Source form or documentation, if provided along with the Derivative
122+
Works; or, within a display generated by the Derivative Works, if and wherever such
123+
third-party notices normally appear. The contents of the NOTICE file are for
124+
informational purposes only and do not modify the License. You may add Your own
125+
attribution notices within Derivative Works that You distribute, alongside or as
126+
an addendum to the NOTICE text from the Work, provided that such additional attribution
127+
notices cannot be construed as modifying the License.
128+
129+
You may add Your own copyright statement to Your modifications and may provide
130+
additional or different license terms and conditions for use, reproduction, or
131+
distribution of Your modifications, or for any such Derivative Works as a whole,
132+
provided Your use, reproduction, and distribution of the Work otherwise complies
133+
with the conditions stated in this License.
134+
135+
5. Submission of Contributions.
136+
137+
Unless You explicitly state otherwise, any Contribution intentionally submitted
138+
for inclusion in the Work by You to the Licensor shall be under the terms and
139+
conditions of this License, without any additional terms or conditions. Notwithstanding
140+
the above, nothing herein shall supersede or modify the terms of any separate license
141+
agreement you may have executed with Licensor regarding such Contributions.
142+
143+
6. Trademarks.
144+
145+
This License does not grant permission to use the trade names, trademarks, service
146+
marks, or product names of the Licensor, except as required for reasonable and
147+
customary use in describing the origin of the Work and reproducing the content of
148+
the NOTICE file.
149+
150+
7. Disclaimer of Warranty.
151+
152+
Unless required by applicable law or agreed to in writing, Licensor provides the
153+
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
154+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without
155+
limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
156+
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
157+
appropriateness of using or redistributing the Work and assume any risks associated
158+
with Your exercise of permissions under this License.
159+
160+
8. Limitation of Liability.
161+
162+
In no event and under no legal theory, whether in tort (including negligence),
163+
contract, or otherwise, unless required by applicable law (such as deliberate
164+
and grossly negligent acts) or agreed to in writing, shall any Contributor be
165+
liable to You for damages, including any direct, indirect, special, incidental,
166+
or consequential damages of any character arising as a result of this License or
167+
out of the use or inability to use the Work (including but not limited to damages
168+
for loss of goodwill, work stoppage, computer failure or malfunction, or any and
169+
all other commercial damages or losses), even if such Contributor has been advised
170+
of the possibility of such damages.
171+
172+
9. Accepting Warranty or Additional Liability.
173+
174+
While redistributing the Work or Derivative Works thereof, You may choose to offer,
175+
and charge a fee for, acceptance of support, warranty, indemnity, or other liability
176+
obligations and/or rights consistent with this License. However, in accepting such
177+
obligations, You may act only on Your own behalf and on Your sole responsibility,
178+
not on behalf of any other Contributor, and only if You agree to indemnify, defend,
179+
and hold each Contributor harmless for any liability incurred by, or claims asserted
180+
against, such Contributor by reason of your accepting any such warranty or additional
181+
liability.

Diff for: ‎org.restlet.java/org.restlet.ext.fileupload/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>commons-fileupload</groupId>
2626
<artifactId>commons-fileupload</artifactId>
27-
<version>${lib-fileupload-version}</version>
27+
<version>${lib-commons-fileupload-version}</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.restlet</groupId>

Diff for: ‎org.restlet.java/org.restlet.ext.httpclient/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
<dependency>
1919
<groupId>commons-codec</groupId>
2020
<artifactId>commons-codec</artifactId>
21-
<version>${lib-codec-version}</version>
21+
<version>${lib-commons-codec-version}</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.apache.httpcomponents</groupId>
2525
<artifactId>httpclient</artifactId>
26-
<version>${lib-httpclient-version}</version>
26+
<version>${lib-commons-httpclient-version}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.apache.httpcomponents</groupId>
3030
<artifactId>httpcore</artifactId>
31-
<version>${lib-httpcore-version}</version>
31+
<version>${lib-commons-httpcore-version}</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.apache.httpcomponents</groupId>
3535
<artifactId>httpmime</artifactId>
36-
<version>${lib-httpmime-version}</version>
36+
<version>${lib-commons-httpmime-version}</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>net.jcip</groupId>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>commons-logging</groupId>
4545
<artifactId>commons-logging</artifactId>
46-
<version>${lib-logging-version}</version>
46+
<version>${lib-commons-logging-version}</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.apache.james</groupId>

Diff for: ‎org.restlet.java/org.restlet.ext.spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>commons-logging</groupId>
2525
<artifactId>commons-logging</artifactId>
26-
<version>${lib-logging-version}</version>
26+
<version>${lib-commons-logging-version}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springframework</groupId>

Diff for: ‎org.restlet.java/org.restlet/src/main/java/org/restlet/resource/ResourceException.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public class ResourceException extends RuntimeException {
2323
private static final long serialVersionUID = 1L;
2424

2525
/** The status associated to this exception. */
26-
private final Status status;
26+
private transient Status status;
2727

2828
/** The request associated to this exception. Could be null. */
29-
private final Request request;
29+
private transient Request request;
3030

3131
/** The response associated to this exception. Could be null. */
32-
private final Response response;
32+
private transient Response response;
3333

3434
/**
3535
* Constructor.

Diff for: ‎pom.xml

+12-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.5-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

11-
<name>Restlet project</name>
11+
<name>Restlet Framework project</name>
1212
<description>Lightweight REST framework</description>
1313
<url>https://restlet.talend.com/</url>
1414
<inceptionYear>2005</inceptionYear>
@@ -32,10 +32,17 @@
3232
<lib-aopalliance-version>1.0</lib-aopalliance-version>
3333
<lib-bloat-version>1.0</lib-bloat-version>
3434
<lib-cglib-version>3.3.0</lib-cglib-version>
35-
<lib-codec-version>1.17.0</lib-codec-version>
35+
<lib-commons-codec-version>1.17.0</lib-commons-codec-version>
3636
<lib-commons-collections-version>3.2.2</lib-commons-collections-version>
37+
<lib-commons-fileupload-version>1.5</lib-commons-fileupload-version>
38+
<lib-commons-httpclient-version>4.5.14</lib-commons-httpclient-version>
39+
<lib-commons-httpcore-version>4.4.16</lib-commons-httpcore-version>
40+
<lib-commons-httpmime-version>4.5.14</lib-commons-httpmime-version>
41+
<lib-commons-io-version>2.16.1</lib-commons-io-version>
42+
<lib-commons-lang-version>3.14.0</lib-commons-lang-version>
43+
<lib-commons-logging-version>1.3.1</lib-commons-logging-version>
44+
<lib-commons-pool-version>1.6</lib-commons-pool-version>
3745
<lib-e4-version>1.7.500</lib-e4-version>
38-
<lib-fileupload-version>1.5</lib-fileupload-version>
3946
<lib-freemarker-version>2.3.32</lib-freemarker-version>
4047
<lib-gae-version>1.9.98</lib-gae-version>
4148
<lib-gcollections-version>1.0</lib-gcollections-version>
@@ -46,35 +53,27 @@
4653
<lib-gwt-version>2.11.0</lib-gwt-version>
4754
<lib-gwt-server-version>2.10.0</lib-gwt-server-version>
4855
<lib-hamcrest-version>1.3</lib-hamcrest-version>
49-
<lib-httpclient-version>4.5.14</lib-httpclient-version>
50-
<lib-httpcore-version>4.4.16</lib-httpcore-version>
51-
<lib-httpmime-version>4.5.14</lib-httpmime-version>
52-
<lib-io-version>2.16.1</lib-io-version>
5356
<lib-jackson-version>2.17.0</lib-jackson-version>
5457
<lib-jaxb-ri-version>2.4.0-b180830.0438</lib-jaxb-ri-version>
5558
<lib-jaxb-api-version>2.4.0-b180830.0359</lib-jaxb-api-version>
56-
<lib-jaxrs-api-version>2.0</lib-jaxrs-api-version>
5759
<lib-javax-inject-version>1</lib-javax-inject-version>
5860
<lib-jcip-annotations-version>1.0</lib-jcip-annotations-version>
59-
<lib-jetty-version>9.4.54.v20240208</lib-jetty-version>
61+
<lib-jetty-version>9.4.56.v20240826</lib-jetty-version>
6062
<lib-joda-time-version>2.12.7</lib-joda-time-version>
6163
<lib-json4s-version>3.2.4</lib-json4s-version>
6264
<lib-json-version>20240303</lib-json-version>
6365
<lib-jsslutils-version>1.0.5</lib-jsslutils-version>
6466
<lib-junit-version>5.10.2</lib-junit-version>
65-
<lib-lang-version>3.14.0</lib-lang-version>
6667
<lib-log4j-version>1.2.17</lib-log4j-version>
67-
<lib-logging-version>1.3.1</lib-logging-version>
6868
<lib-mime4j-version>0.8.11</lib-mime4j-version>
6969
<lib-mongodb-version>2.14.3</lib-mongodb-version>
7070
<lib-osgi-version>4.0.0</lib-osgi-version>
71-
<lib-pool-version>1.6</lib-pool-version>
7271
<lib-protobuf-version>2.2.0</lib-protobuf-version>
7372
<lib-raml-version>0.8.40</lib-raml-version>
7473
<lib-scala-version>2.13.13</lib-scala-version>
7574
<lib-sdc-version>1.3.rc2</lib-sdc-version>
7675
<lib-servlet-version>3.1.0</lib-servlet-version>
77-
<lib-slf4j-version>2.0.13</lib-slf4j-version>
76+
<lib-slf4j-version>2.0.16</lib-slf4j-version>
7877
<lib-snakeyaml-version>2.2</lib-snakeyaml-version>
7978
<lib-spring-version>5.3.34</lib-spring-version>
8079
<lib-sun-istack-version>3.0.10</lib-sun-istack-version>

0 commit comments

Comments
 (0)