Update to OSGi Technology REST 1.2.2

This moves sensiNact away from the old Gecko Projects version of the whiteboard to its new home at Eclipse OSGi Technology. Signed-off-by: Tim Ward <timothyjward@apache.org>
DataInMotion · Jan 25, 2024 · 07cf407 · 07cf407
1 parent 0a4ee42
commit 07cf407
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 131 deletions.
diff --git a/distribution/features/jakarta-rest-whiteboard-feature/pom.xml b/distribution/features/jakarta-rest-whiteboard-feature/pom.xml
@@ -22,38 +22,37 @@
   <name>Eclipse sensiNact Jakarta RESTful Web Services Whiteboard Feature</name>
   <description>This project contains a feature providing a Jakarta RESTful Web Services whiteboard</description>
   <properties>
-    <gecko.jersey.version>6.0.0.RC1</gecko.jersey.version>
-    <hk2.version>3.0.3</hk2.version>
+    <osgi.technology.rest.version>1.2.2</osgi.technology.rest.version>
+    <hk2.version>3.0.5</hk2.version>
     <hk2.osgi.version>1.0.3</hk2.osgi.version>
-    <jackson.version>2.13.4</jackson.version>
-    <jersey.version>3.0.8</jersey.version>
+    <jersey.version>3.1.3</jersey.version>
     <asm.version>9.6</asm.version>
     <javassist.version>3.29.2-GA</javassist.version>
   </properties>
 
   <dependencies>
-    <!-- Gecko -->
-    <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey</artifactId>
-      <version>${gecko.jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey.servlet.whiteboard</artifactId>
-      <version>${gecko.jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey.sse</artifactId>
-      <version>${gecko.jersey.version}</version>
-    </dependency>
+    <!-- Jersey based OSGi REST Whiteboard -->
+      <dependency>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest</artifactId>
+        <version>${osgi.technology.rest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest.sse</artifactId>
+        <version>${osgi.technology.rest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest.servlet.whiteboard</artifactId>
+        <version>${osgi.technology.rest.version}</version>
+      </dependency>
 
     <!-- API -->
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.jakartars</artifactId>
-      <version>2.0.0-RC1</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
@@ -83,7 +82,7 @@
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.0</version>
     </dependency>
 
     <!-- Jersey -->

diff --git a/...s/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json b/...s/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json
@@ -1,29 +1,29 @@
 {
   "id":"org.eclipse.sensinact.gateway.distribution.features:jakarta-rest-whiteboard-feature:osgifeature:0.0.2-SNAPSHOT",
   "bundles":[
-    { "id": "org.geckoprojects.jakartars:org.gecko.rest.jersey:6.0.0.RC1" },
-    { "id": "org.geckoprojects.jakartars:org.gecko.rest.jersey.servlet.whiteboard:6.0.0.RC1" },
-    { "id": "org.geckoprojects.jakartars:org.gecko.rest.jersey.sse:6.0.0.RC1" },
-    { "id": "org.osgi:org.osgi.service.jakartars:2.0.0-RC1" },
+    { "id": "org.eclipse.osgi-technology.rest:org.eclipse.osgitech.rest:1.2.2" },
+    { "id": "org.eclipse.osgi-technology.rest:org.eclipse.osgitech.rest.sse:1.2.2" },
+    { "id": "org.eclipse.osgi-technology.rest:org.eclipse.osgitech.rest.servlet.whiteboard:1.2.2" },
+    { "id": "org.osgi:org.osgi.service.jakartars:2.0.0" },
     { "id": "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0" },
     { "id": "jakarta.activation:jakarta.activation-api:2.1.0" },
     { "id": "jakarta.annotation:jakarta.annotation-api:2.1.1" },
     { "id": "jakarta.inject:jakarta.inject-api:2.0.1" },
     { "id": "jakarta.validation:jakarta.validation-api:3.0.2" },
-    { "id": "jakarta.xml.bind:jakarta.xml.bind-api:3.0.0" },
-    { "id": "org.glassfish.jersey.core:jersey-common:3.0.8" },
-    { "id": "org.glassfish.jersey.core:jersey-server:3.0.8" },
-    { "id": "org.glassfish.jersey.core:jersey-client:3.0.8" },
-    { "id": "org.glassfish.jersey.containers:jersey-container-servlet-core:3.0.8" },
-    { "id": "org.glassfish.jersey.containers:jersey-container-servlet:3.0.8" },
-    { "id": "org.glassfish.jersey.inject:jersey-hk2:3.0.8" },
-    { "id": "org.glassfish.jersey.media:jersey-media-jaxb:3.0.8" },
-    { "id": "org.glassfish.jersey.media:jersey-media-sse:3.0.8" },
-    { "id": "org.glassfish.hk2:hk2-api:3.0.3" },
-    { "id": "org.glassfish.hk2.external:aopalliance-repackaged:3.0.3" },
-    { "id": "org.glassfish.hk2:hk2-locator:3.0.3" },
+    { "id": "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" },
+    { "id": "org.glassfish.jersey.core:jersey-common:3.1.3" },
+    { "id": "org.glassfish.jersey.core:jersey-server:3.1.3" },
+    { "id": "org.glassfish.jersey.core:jersey-client:3.1.3" },
+    { "id": "org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.3" },
+    { "id": "org.glassfish.jersey.containers:jersey-container-servlet:3.1.3" },
+    { "id": "org.glassfish.jersey.inject:jersey-hk2:3.1.3" },
+    { "id": "org.glassfish.jersey.media:jersey-media-jaxb:3.1.3" },
+    { "id": "org.glassfish.jersey.media:jersey-media-sse:3.1.3" },
+    { "id": "org.glassfish.hk2:hk2-api:3.0.5" },
+    { "id": "org.glassfish.hk2.external:aopalliance-repackaged:3.0.5" },
+    { "id": "org.glassfish.hk2:hk2-locator:3.0.5" },
     { "id": "org.glassfish.hk2:osgi-resource-locator:1.0.3" },
-    { "id": "org.glassfish.hk2:hk2-utils:3.0.3" },
+    { "id": "org.glassfish.hk2:hk2-utils:3.0.5" },
     { "id": "org.javassist:javassist:3.29.2-GA" },
     { "id": "org.ow2.asm:asm:9.6" }
   ],

diff --git a/northbound/pom.xml b/northbound/pom.xml
@@ -25,9 +25,9 @@
   <description>This reactor contains northbound connectors that are used to interact with sensiNact</description>
 
   <properties>
-    <gecko.jersey.version>6.0.0.RC1</gecko.jersey.version>
-    <hk2.version>3.0.3</hk2.version>
-    <jersey.version>3.0.8</jersey.version>
+    <osgi.technology.rest.version>1.2.2</osgi.technology.rest.version>
+    <hk2.version>3.0.5</hk2.version>
+    <jersey.version>3.1.3</jersey.version>
     <jetty.version>11.0.13</jetty.version>
   </properties>
 
@@ -46,12 +46,12 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.util.promise</artifactId>
-        <version>1.3.0-RC1</version>
+        <version>1.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.service.jakartars</artifactId>
-        <version>2.0.0-RC1</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -100,21 +100,26 @@
         <version>${jersey.version}</version>
       </dependency>
 
-      <!-- Gecko -->
+      <!-- Jersey based OSGi REST Whiteboard -->
+      <dependency>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest</artifactId>
+        <version>${osgi.technology.rest.version}</version>
+      </dependency>
       <dependency>
-        <groupId>org.geckoprojects.jakartars</groupId>
-        <artifactId>org.gecko.rest.jersey.config</artifactId>
-        <version>${gecko.jersey.version}</version>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest.sse</artifactId>
+        <version>${osgi.technology.rest.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.geckoprojects.jakartars</groupId>
-        <artifactId>org.gecko.rest.jersey.sse</artifactId>
-        <version>${gecko.jersey.version}</version>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest.servlet.whiteboard</artifactId>
+        <version>${osgi.technology.rest.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.geckoprojects.jakartars</groupId>
-        <artifactId>org.gecko.rest.jersey.jetty</artifactId>
-        <version>${gecko.jersey.version}</version>
+        <groupId>org.eclipse.osgi-technology.rest</groupId>
+        <artifactId>org.eclipse.osgitech.rest.jetty</artifactId>
+        <version>${osgi.technology.rest.version}</version>
       </dependency>
 
       <!-- ANTLR -->

diff --git a/northbound/rest/integration-test.bndrun b/northbound/rest/integration-test.bndrun
@@ -6,12 +6,8 @@
 	bnd.identity;id='org.apache.felix.configurator',\
 	bnd.identity;id='org.apache.felix.cm.json',\
 	bnd.identity;id='org.glassfish.jersey.core.jersey-common',\
-	bnd.identity;id='org.gecko.rest.jersey.jetty',\
-	bnd.identity;id='org.eclipse.jetty.server',\
-	bnd.identity;id='org.gecko.rest.jersey.config',\
-	bnd.identity;id='org.gecko.rest.jersey.sse',\
+	bnd.identity;id='org.eclipse.osgitech.rest.jetty',\
 	bnd.identity;id='org.eclipse.parsson.jakarta.json',\
-	bnd.identity;id='org.glassfish.jersey.core.jersey-client',\
 	bnd.identity;id='org.eclipse.sensinact.gateway.northbound.filters.ldap'
 -resolve.effective: active
 
@@ -38,10 +34,10 @@
 	jakarta.activation-api;version='[2.1.0,2.1.1)',\
 	jakarta.annotation-api;version='[2.1.1,2.1.2)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
-	jakarta.validation.jakarta.validation-api;version='[3.0.0,3.0.1)',\
+	jakarta.validation.jakarta.validation-api;version='[3.0.2,3.0.3)',\
 	jakarta.ws.rs-api;version='[3.1.0,3.1.1)',\
-	jakarta.xml.bind-api;version='[3.0.1,3.0.2)',\
-	javassist;version='[3.28.0,3.28.1)',\
+	jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
+	javassist;version='[3.29.2,3.29.3)',\
 	junit-jupiter-api;version='[5.9.0,5.9.1)',\
 	junit-jupiter-engine;version='[5.9.0,5.9.1)',\
 	junit-jupiter-params;version='[5.9.0,5.9.1)',\
@@ -60,12 +56,15 @@
 	org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
 	org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
-	org.eclipse.jetty.http;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.io;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.security;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.server;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.servlet;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.util;version='[11.0.12,11.0.13)',\
+	org.eclipse.jetty.http;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.io;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.security;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.server;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.servlet;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.util;version='[11.0.13,11.0.14)',\
+	org.eclipse.osgitech.rest;version='[1.2.2,1.2.3)',\
+	org.eclipse.osgitech.rest.jetty;version='[1.2.2,1.2.3)',\
+	org.eclipse.osgitech.rest.sse;version='[1.2.2,1.2.3)',\
 	org.eclipse.parsson.jakarta.json;version='[1.1.5,1.1.6)',\
 	org.eclipse.sensinact.gateway.core.annotation;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.core.api;version='[0.0.2,0.0.3)',\
@@ -81,24 +80,20 @@
 	org.eclipse.sensinact.gateway.northbound.rest-tests;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.northbound.security.authentication-api;version='[0.0.2,0.0.3)',\
 	org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\
-	org.gecko.rest.jersey;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.config;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.jetty;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.sse;version='[6.0.0,6.0.1)',\
-	org.glassfish.hk2.api;version='[3.0.3,3.0.4)',\
-	org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.3,3.0.4)',\
-	org.glassfish.hk2.locator;version='[3.0.3,3.0.4)',\
+	org.glassfish.hk2.api;version='[3.0.5,3.0.6)',\
+	org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.4,3.0.5)',\
+	org.glassfish.hk2.locator;version='[3.0.4,3.0.5)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	org.glassfish.hk2.utils;version='[3.0.3,3.0.4)',\
-	org.glassfish.jersey.containers.jersey-container-servlet;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-client;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-common;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-server;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.inject.jersey-hk2;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.media.jersey-media-jaxb;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.media.jersey-media-sse;version='[3.0.8,3.0.9)',\
-	org.objectweb.asm;version='[9.3.0,9.3.1)',\
+	org.glassfish.hk2.utils;version='[3.0.4,3.0.5)',\
+	org.glassfish.jersey.containers.jersey-container-servlet;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-client;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-common;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-server;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.inject.jersey-hk2;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.media.jersey-media-jaxb;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.media.jersey-media-sse;version='[3.1.3,3.1.4)',\
+	org.objectweb.asm;version='[9.6.0,9.6.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
 	org.osgi.service.jakartars;version='[2.0.0,2.0.1)',\

diff --git a/northbound/rest/pom.xml b/northbound/rest/pom.xml
@@ -164,20 +164,20 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Gecko -->
+    <!-- Jersey based OSGi REST Whiteboard -->
     <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey.config</artifactId>
+      <groupId>org.eclipse.osgi-technology.rest</groupId>
+      <artifactId>org.eclipse.osgitech.rest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey.sse</artifactId>
+      <groupId>org.eclipse.osgi-technology.rest</groupId>
+      <artifactId>org.eclipse.osgitech.rest.sse</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.geckoprojects.jakartars</groupId>
-      <artifactId>org.gecko.rest.jersey.jetty</artifactId>
+      <groupId>org.eclipse.osgi-technology.rest</groupId>
+      <artifactId>org.eclipse.osgitech.rest.jetty</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/northbound/sensorthings/rest.gateway/integration-test.bndrun b/northbound/sensorthings/rest.gateway/integration-test.bndrun
@@ -5,10 +5,7 @@
 	bnd.identity;id='slf4j.simple',\
 	bnd.identity;id='org.apache.felix.configurator',\
 	bnd.identity;id='org.apache.felix.cm.json',\
-	bnd.identity;id='org.glassfish.jersey.core.jersey-common',\
-	bnd.identity;id='org.gecko.rest.jersey.jetty',\
-	bnd.identity;id='org.eclipse.jetty.server',\
-	bnd.identity;id='org.gecko.rest.jersey.config',\
+	bnd.identity;id='org.eclipse.osgitech.rest.jetty',\
 	bnd.identity;id='org.eclipse.parsson.jakarta.json',\
 	bnd.identity;id='org.eclipse.sensinact.gateway.southbound.history.timescale-provider'
 -resolve.effective: active
@@ -37,10 +34,10 @@
 	jakarta.activation-api;version='[2.1.0,2.1.1)',\
 	jakarta.annotation-api;version='[2.1.1,2.1.2)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
-	jakarta.validation.jakarta.validation-api;version='[3.0.0,3.0.1)',\
+	jakarta.validation.jakarta.validation-api;version='[3.0.2,3.0.3)',\
 	jakarta.ws.rs-api;version='[3.1.0,3.1.1)',\
-	jakarta.xml.bind-api;version='[3.0.1,3.0.2)',\
-	javassist;version='[3.28.0,3.28.1)',\
+	jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
+	javassist;version='[3.29.2,3.29.3)',\
 	junit-jupiter-api;version='[5.9.0,5.9.1)',\
 	junit-jupiter-engine;version='[5.9.0,5.9.1)',\
 	junit-jupiter-params;version='[5.9.0,5.9.1)',\
@@ -61,12 +58,15 @@
 	org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
 	org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
-	org.eclipse.jetty.http;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.io;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.security;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.server;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.servlet;version='[11.0.12,11.0.13)',\
-	org.eclipse.jetty.util;version='[11.0.12,11.0.13)',\
+	org.eclipse.jetty.http;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.io;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.security;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.server;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.servlet;version='[11.0.13,11.0.14)',\
+	org.eclipse.jetty.util;version='[11.0.13,11.0.14)',\
+	org.eclipse.osgitech.rest;version='[1.2.2,1.2.3)',\
+	org.eclipse.osgitech.rest.jetty;version='[1.2.2,1.2.3)',\
+	org.eclipse.osgitech.rest.sse;version='[1.2.2,1.2.3)',\
 	org.eclipse.parsson.jakarta.json;version='[1.1.5,1.1.6)',\
 	org.eclipse.sensinact.gateway.core.annotation;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.core.api;version='[0.0.2,0.0.3)',\
@@ -84,25 +84,21 @@
 	org.eclipse.sensinact.gateway.southbound.history.history-api;version='[0.0.2,0.0.3)',\
 	org.eclipse.sensinact.gateway.southbound.history.timescale-provider;version='[0.0.2,0.0.3)',\
 	org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\
-	org.gecko.rest.jersey;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.config;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.jetty;version='[6.0.0,6.0.1)',\
-	org.gecko.rest.jersey.sse;version='[6.0.0,6.0.1)',\
-	org.glassfish.hk2.api;version='[3.0.3,3.0.4)',\
-	org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.3,3.0.4)',\
-	org.glassfish.hk2.locator;version='[3.0.3,3.0.4)',\
+	org.glassfish.hk2.api;version='[3.0.5,3.0.6)',\
+	org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.4,3.0.5)',\
+	org.glassfish.hk2.locator;version='[3.0.4,3.0.5)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	org.glassfish.hk2.utils;version='[3.0.3,3.0.4)',\
-	org.glassfish.jersey.containers.jersey-container-servlet;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-client;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-common;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.core.jersey-server;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.inject.jersey-hk2;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.media.jersey-media-jaxb;version='[3.0.8,3.0.9)',\
-	org.glassfish.jersey.media.jersey-media-sse;version='[3.0.8,3.0.9)',\
+	org.glassfish.hk2.utils;version='[3.0.4,3.0.5)',\
+	org.glassfish.jersey.containers.jersey-container-servlet;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-client;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-common;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.core.jersey-server;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.inject.jersey-hk2;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.media.jersey-media-jaxb;version='[3.1.3,3.1.4)',\
+	org.glassfish.jersey.media.jersey-media-sse;version='[3.1.3,3.1.4)',\
 	org.locationtech.spatial4j;version='[0.8.0,0.8.1)',\
-	org.objectweb.asm;version='[9.3.0,9.3.1)',\
+	org.objectweb.asm;version='[9.6.0,9.6.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
 	org.osgi.service.jakartars;version='[2.0.0,2.0.1)',\
@@ -118,4 +114,5 @@
 	slf4j.api;version='[1.7.36,1.7.37)',\
 	slf4j.simple;version='[1.7.36,1.7.37)',\
 	tx-control-provider-jdbc-local;version='[1.0.1,1.0.2)',\
-	tx-control-service-local;version='[1.0.1,1.0.2)'
+	tx-control-service-local;version='[1.0.1,1.0.2)'
+	org.objectweb.asm;version='[9.3.0,9.3.1)'