Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgrade RESTEasy to 7.0.5 and Jakarta REST API to 4.0 (#3431)

Wouter Born92633dd99f58
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4dd4be8ee..4aa40f2cd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ jakartaAnnotationApi = "3.0.0"
jakartaEl = "4.0.2"
jakartaElApi = "6.0.1"
jakartaSecurityEnterpriseApi = "4.0.0"
-jakartaWsRs = "3.1.0"
+jakartaWsRs = "4.0.0"
javaxAnnotationApi = "1.3.2"
jaywayJsonPath = "3.0.0"
jdom = "2.0.6.1"
@@ -62,7 +62,7 @@ protobuf = "3.25.5"
protobufPlugin = "0.10.0"
quartz = "2.5.2"
reflections = "0.10.2"
-resteasy = "6.2.16.Final"
+resteasy = "7.0.5.Final"
resteasyCache = "4.7.10.Final"
saxonHe = "12.9"
slf4j = "2.0.18"
diff --git a/model/src/main/java/org/openremote/model/util/JSONSchemaUtil.java b/model/src/main/java/org/openremote/model/util/JSONSchemaUtil.java
index d7a90fbb2..c6247e091 100644
--- a/model/src/main/java/org/openremote/model/util/JSONSchemaUtil.java
+++ b/model/src/main/java/org/openremote/model/util/JSONSchemaUtil.java
@@ -869,7 +869,14 @@ public class JSONSchemaUtil {
.collect(Collectors.toSet());
return found.stream()
- .map(sub -> context.getTypeContext().resolveSubtype(resolvedType, sub))
+ .map(
+ sub -> {
+ try {
+ return context.getTypeContext().resolveSubtype(resolvedType, sub);
+ } catch (IllegalArgumentException e) {
+ return context.getTypeContext().resolve(sub);
+ }
+ })
.collect(Collectors.toList());
});
}