diff --git a/org.restlet.ext.jackson/pom.xml b/org.restlet.ext.jackson/pom.xml
index dcbaa0908d..bc74b9a8bf 100644
--- a/org.restlet.ext.jackson/pom.xml
+++ b/org.restlet.ext.jackson/pom.xml
@@ -60,6 +60,16 @@
jackson-module-jsonSchema
${lib-jackson-version}
+
+ org.codehaus.woodstox
+ stax2-api
+ 4.2.2
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ 7.1.1
+
org.restlet
org.restlet
diff --git a/org.restlet.ext.openapi/pom.xml b/org.restlet.ext.openapi/pom.xml
index 6f42eb1357..9d32ce128d 100644
--- a/org.restlet.ext.openapi/pom.xml
+++ b/org.restlet.ext.openapi/pom.xml
@@ -21,19 +21,49 @@
swagger-core
${lib-swagger-core-version}
-
io.swagger.core.v3
swagger-annotations
${lib-swagger-core-version}
-
io.swagger.core.v3
swagger-integration
${lib-swagger-core-version}
+
+ io.swagger.core.v3
+ swagger-models
+ ${lib-swagger-core-version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${lib-jackson-version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ ${lib-jackson-annotations-version}
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+ ${lib-jackson-version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${lib-jackson-version}
+
+
+ io.swagger.parser.v3
+ swagger-parser-v3
+ ${lib-swagger-parser-version}
+ test
+
org.restlet
org.restlet
@@ -54,6 +84,13 @@
test
+
+ io.swagger.parser.v3
+ swagger-parser-core
+ ${lib-swagger-parser-version}
+ test
+
+
io.swagger.parser.v3
swagger-parser
diff --git a/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContext.java b/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContext.java
index b18e985c81..1945545d2d 100644
--- a/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContext.java
+++ b/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContext.java
@@ -11,7 +11,7 @@
import io.swagger.v3.oas.integration.GenericOpenApiContext;
import io.swagger.v3.oas.integration.api.OpenAPIConfiguration;
import io.swagger.v3.oas.integration.api.OpenApiReader;
-import org.apache.commons.lang3.StringUtils;
+import org.restlet.engine.util.StringUtils;
import org.restlet.routing.Router;
public class RestletOpenApiContext extends GenericOpenApiContext {
@@ -24,14 +24,14 @@ public RestletOpenApiContext(Router router) {
@Override
protected OpenApiReader buildReader(OpenAPIConfiguration openApiConfiguration)
throws Exception {
- OpenApiReader reader;
+ final OpenApiReader reader;
- if (StringUtils.isNotBlank(openApiConfiguration.getReaderClass())) {
+ if (StringUtils.isNullOrEmpty(openApiConfiguration.getReaderClass())) {
+ reader = new RestletOpenApiReader();
+ } else {
Class> cls =
getClass().getClassLoader().loadClass(openApiConfiguration.getReaderClass());
reader = (OpenApiReader) cls.getDeclaredConstructor().newInstance();
- } else {
- reader = new RestletOpenApiReader();
}
if (reader instanceof RestletOpenApiReader restletOpenApiReader) {
diff --git a/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContextBuilder.java b/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContextBuilder.java
index 1fbe5ca200..d688d0e7f4 100644
--- a/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContextBuilder.java
+++ b/org.restlet.ext.openapi/src/main/java/org/restlet/ext/openapi/internal/RestletOpenApiContextBuilder.java
@@ -12,7 +12,7 @@
import io.swagger.v3.oas.integration.OpenApiConfigurationException;
import io.swagger.v3.oas.integration.OpenApiContextLocator;
import io.swagger.v3.oas.integration.api.OpenApiContext;
-import org.apache.commons.lang3.StringUtils;
+import org.restlet.engine.util.StringUtils;
import org.restlet.routing.Router;
public class RestletOpenApiContextBuilder
@@ -26,7 +26,7 @@ public RestletOpenApiContextBuilder router(Router router) {
@Override
public OpenApiContext buildContext(boolean init) throws OpenApiConfigurationException {
- if (StringUtils.isBlank(ctxId)) {
+ if (StringUtils.isNullOrEmpty(ctxId)) {
ctxId = OpenApiContext.OPENAPI_CONTEXT_ID_DEFAULT;
}
diff --git a/org.restlet.ext.slf4j/pom.xml b/org.restlet.ext.slf4j/pom.xml
index 9a36ecc440..171606f7e9 100644
--- a/org.restlet.ext.slf4j/pom.xml
+++ b/org.restlet.ext.slf4j/pom.xml
@@ -15,11 +15,6 @@
Support for the SLF4J logging bridge.
-
- org.slf4j
- slf4j-api
- ${lib-slf4j-version}
-
org.restlet
org.restlet
@@ -27,9 +22,8 @@
org.slf4j
- slf4j-jdk14
+ slf4j-api
${lib-slf4j-version}
- test
org.junit.jupiter
diff --git a/org.restlet.ext.spring/pom.xml b/org.restlet.ext.spring/pom.xml
index 5a07e7265f..0864e40748 100644
--- a/org.restlet.ext.spring/pom.xml
+++ b/org.restlet.ext.spring/pom.xml
@@ -25,6 +25,11 @@
spring-context
${lib-spring-version}
+
+ org.springframework
+ spring-beans
+ ${lib-spring-version}
+
org.restlet
org.restlet
diff --git a/org.restlet.ext.velocity/pom.xml b/org.restlet.ext.velocity/pom.xml
index 3bd4912387..48f4e92f20 100644
--- a/org.restlet.ext.velocity/pom.xml
+++ b/org.restlet.ext.velocity/pom.xml
@@ -15,6 +15,11 @@
Integration with Apache Velocity.
+
+ org.apache.commons
+ commons-lang3
+ 3.20.0
+
org.apache.velocity
velocity-engine-core
diff --git a/org.restlet/pom.xml b/org.restlet/pom.xml
index 07623512b8..eb51e0c2c9 100644
--- a/org.restlet/pom.xml
+++ b/org.restlet/pom.xml
@@ -15,73 +15,100 @@
Restlet API and Engine
-
- org.eclipse.jetty
- jetty-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http2
- jetty-http2-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty
- jetty-alpn-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty
- jetty-alpn-java-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http3
- jetty-http3-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.quic
- jetty-quic-server
- ${lib-jetty-version}
-
-
- org.eclipse.jetty
- jetty-client
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http2
- jetty-http2-client
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http2
- jetty-http2-client-transport
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http3
- jetty-http3-client
- ${lib-jetty-version}
-
-
- org.eclipse.jetty.http3
- jetty-http3-client-transport
- ${lib-jetty-version}
-
-
- org.eclipse.jetty
- jetty-slf4j-impl
- ${lib-jetty-version}
-
-
+
+ org.eclipse.jetty
+ jetty-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http2
+ jetty-http2-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-alpn-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-alpn-java-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http3
+ jetty-http3-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.quic
+ jetty-quic-server
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-client
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http2
+ jetty-http2-client
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http2
+ jetty-http2-client-transport
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http3
+ jetty-http3-client
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.http3
+ jetty-http3-client-transport
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-slf4j-impl
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-util
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-io
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty
+ jetty-http
+ ${lib-jetty-version}
+
+
+ org.eclipse.jetty.quic
+ jetty-quic-client
+ ${lib-jetty-version}
+
+
org.osgi
org.osgi.core
${lib-osgi-version}
provided
true
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.14.4
+ test
+
org.junit.jupiter
junit-jupiter-params
@@ -110,7 +137,9 @@
Restlet API
- org.restlet:org.restlet.data*:org.restlet.representation*:org.restlet.resource*:org.restlet.routing*:org.restlet.security*:org.restlet.service*:org.restlet.util*
+
+ org.restlet:org.restlet.data*:org.restlet.representation*:org.restlet.resource*:org.restlet.routing*:org.restlet.security*:org.restlet.service*:org.restlet.util*
+
Restlet Engine
diff --git a/pom.xml b/pom.xml
index 61a5d6d781..8003d63e94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,8 @@
2.3.34
2.14.0
- 2.21.4
- 2.21
+ 2.22.0
+ 2.22
2.14.2
12.0.36
20260522
@@ -63,8 +63,8 @@
4.3.1
2.0.18
7.0.8
- 2.2.50
- 2.1.43
+ 2.2.52
+ 2.1.45
3.1.5.RELEASE
2.4.1