Skip to content

Upgraded Jackson and org.json libraries and maven plugins. #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thboileau-git merged 1 commit into from
Oct 20, 2026
Merged

Upgraded Jackson and org.json libraries and maven plugins. #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 5 additions & 6 deletions org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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());
}

/**
Expand Down
38 changes: 19 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
<!-- dependencies -->
<lib-freemarker-version>2.3.35</lib-freemarker-version>
<lib-gson-version>2.14.0</lib-gson-version>
<lib-jackson-version>2.22.3</lib-jackson-version>
<lib-jackson-version>2.22.4</lib-jackson-version>
<lib-jackson-annotations-version>2.22</lib-jackson-annotations-version>
<lib-joda-time-version>2.14.2</lib-joda-time-version>
<lib-jetty-version>12.1.14</lib-jetty-version>
<lib-json-version>20260522</lib-json-version>
<lib-json-version>20260814</lib-json-version>
<lib-log4j-version>1.2.17</lib-log4j-version>
<lib-hamcrest-version>1.3</lib-hamcrest-version>
<lib-osgi-version>4.3.1</lib-osgi-version>
Expand Down Expand Up @@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.7</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -188,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.7</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -209,7 +209,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<version>0.12.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
Expand All @@ -218,7 +218,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
<executions>
<execution>
<id>enforce</id>
Expand All @@ -242,7 +242,7 @@
<dependency>
<groupId>org.kordamp.maven</groupId>
<artifactId>pomchecker-enforcer-rules</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -357,7 +357,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.10.4</version>
<configuration>
<java>
<!-- These are the defaults, you can override if you want -->
Expand Down Expand Up @@ -404,7 +404,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.16.0</version>
<configuration>
<encoding>UTF-8</encoding>
<source>${java.version}</source>
Expand All @@ -414,7 +414,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.12.0</version>
<configuration>
<additionalJOptions>
<additionalJOption>${javadoc.opts}</additionalJOption>
Expand All @@ -424,47 +424,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.22.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down
Loading