From 1790269f0fd5b776c33483e6132cd306424e71cf Mon Sep 17 00:00:00 2001 From: Thierry Boileau Date: Tue, 20 Oct 2026 22:31:37 +0200 Subject: [PATCH] Upgraded Jackson and org.json libraries and maven plugins. --- changes.md | 2 + .../engine/connector/HttpClientHelper.java | 11 +++--- pom.xml | 38 +++++++++---------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/changes.md b/changes.md index 64e8191859..a90a868004 100644 --- a/changes.md +++ b/changes.md @@ -4,6 +4,8 @@ Changes log - 2.7.1 (??-??-2026) - Misc - Upgraded Jetty library to version 12.1.14. Issue #1515. + - Upgraded Jackson library to version 2.22.4. + - Upgraded org.json library to version 20260814. - Bugs fixed - Slf4j bridge reports wrong line number and caller class in log4j. Issue #233. - When GET is an allowed method of a server resource, HEAD is now also listed (e.g. in the Allow header of a 405 response). Issue #266. diff --git a/org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java b/org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java index 62efb70208..6506b43823 100644 --- a/org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java +++ b/org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java @@ -238,9 +238,8 @@ public HttpClientHelper(Client client) { getProtocols().add(Protocol.HTTP); getProtocols().add(Protocol.HTTPS); this.authenticationStore = null; - this.cookieStore = isCookieSupported() - ? new HttpCookieStore.Default() - : new HttpCookieStore.Empty(); + this.cookieStore = + isCookieSupported() ? new HttpCookieStore.Default() : new HttpCookieStore.Empty(); this.executor = null; } @@ -252,9 +251,9 @@ public HttpClientHelper(Client client) { */ public ClientCall create(Request request) { return new JettyClientCall( - this, - request.getMethod().toString(), - ReferenceUtils.update(request.getResourceRef(), request).toString()); + this, + request.getMethod().toString(), + ReferenceUtils.update(request.getResourceRef(), request).toString()); } /** diff --git a/pom.xml b/pom.xml index 6a73900d0f..3ca37261d0 100644 --- a/pom.xml +++ b/pom.xml @@ -53,11 +53,11 @@ 2.3.35 2.14.0 - 2.22.3 + 2.22.4 2.22 2.14.2 12.1.14 - 20260522 + 20260814 1.2.17 1.3 4.3.1 @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts @@ -209,7 +209,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.9.0 + 0.12.0 true central @@ -218,7 +218,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.3 enforce @@ -242,7 +242,7 @@ org.kordamp.maven pomchecker-enforcer-rules - 1.14.0 + 1.15.0 @@ -357,7 +357,7 @@ com.diffplug.spotless spotless-maven-plugin - 3.3.0 + 3.10.4 @@ -404,7 +404,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.16.0 UTF-8 ${java.version} @@ -414,7 +414,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.12.0 ${javadoc.opts} @@ -424,47 +424,47 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.22.0 org.apache.maven.plugins maven-source-plugin - 3.3.1 + 3.4.0 org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.5.1 org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.6.0 org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.11.0 org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.5.0 org.apache.maven.plugins maven-resources-plugin - 3.3.1 + 3.5.0 org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.2.0 org.apache.maven.plugins maven-release-plugin - 3.0.1 + 3.3.1 org.apache.felix