From b707f5ece3c21d30d4e2831880d29e7704ecbbb8 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Sat, 24 Feb 2024 21:24:32 +0100
Subject: [PATCH] [Project] Updated to latest strolch versions with jakarta

---
 .../resources/archetype-resources/pom.xml     |   2 +-
 .../__rootArtifactId__-plc-web/pom.xml        |  54 +++++---
 .../java/plc/web/web/RestfulApplication.java  |   2 +-
 .../java/plc/web/web/StartupListener.java     |   6 +-
 .../__rootArtifactId__-shared/pom.xml         |   8 +-
 .../__rootArtifactId__-web/pom.xml            |  46 +++++--
 .../server/web/rest/ShopFloorResource.java    |  10 +-
 .../server/web/web/RestfulApplication.java    |   2 +-
 .../java/server/web/web/StartupListener.java  |   6 +-
 .../resources/archetype-resources/pom.xml     | 115 ++++++------------
 .../resources/archetype-resources/pom.xml     |  79 ++++++------
 11 files changed, 167 insertions(+), 163 deletions(-)

diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml
index 5c7c28b..c654426 100644
--- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml
+++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml
@@ -66,7 +66,7 @@
         <dependencies>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.bom</artifactId>
+                <artifactId>strolch-bom</artifactId>
                 <type>pom</type>
                 <version>${strolch.version}</version>
                 <scope>import</scope>
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/pom.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/pom.xml
index eb54254..ac6990f 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/pom.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/pom.xml
@@ -38,46 +38,46 @@
         <!-- strolch -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.rest</artifactId>
+            <artifactId>rest</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.persistence.xml</artifactId>
+            <artifactId>persistence.xml</artifactId>
         </dependency>
 
         <!-- PLC -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-core</artifactId>
+            <artifactId>plc-core</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-rest</artifactId>
+            <artifactId>plc-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-gw-client</artifactId>
+            <artifactId>plc-gw-client</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-util</artifactId>
+            <artifactId>plc-util</artifactId>
         </dependency>
 
         <!-- my-app -->
@@ -86,22 +86,38 @@
             <artifactId>${rootArtifactId}-shared</artifactId>
         </dependency>
 
-        <!-- web -->
+        <!-- REST using Apache Jersey -->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.websocket</groupId>
-            <artifactId>javax.websocket-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.bundles</groupId>
-            <artifactId>jaxrs-ri</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
         </dependency>
 
         <!-- test -->
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/RestfulApplication.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/RestfulApplication.java
index 03b3ed9..87a8df5 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/RestfulApplication.java
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/RestfulApplication.java
@@ -2,7 +2,7 @@ package ${package}.plc.web.web;
 
 import static ${package}.plc.web.web.StartupListener.APP_NAME;
 
-import javax.ws.rs.ApplicationPath;
+import jakarta.ws.rs.ApplicationPath;
 import java.util.logging.Level;
 
 import li.strolch.plc.rest.PlcConnectionsResource;
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java
index eb16526..737bfa7 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java
@@ -2,9 +2,9 @@ package ${package}.plc.web.web;
 
 import static li.strolch.utils.helper.ExceptionHelper.hasCause;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 import java.io.File;
 import java.io.InputStream;
 
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-shared/pom.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-shared/pom.xml
index 74ba52c..e62f966 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-shared/pom.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-shared/pom.xml
@@ -33,19 +33,19 @@
         <!-- strolch -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-model</artifactId>
+            <artifactId>plc-model</artifactId>
         </dependency>
 
         <!-- utils -->
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
index 48a0250..f053bf1 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
@@ -38,30 +38,30 @@
         <!-- strolch -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.rest</artifactId>
+            <artifactId>web-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
         <!-- Strolch PLC -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-gw-server</artifactId>
+            <artifactId>plc-gw-server</artifactId>
         </dependency>
 
         <!-- my-app -->
@@ -70,18 +70,38 @@
             <artifactId>${rootArtifactId}-shared</artifactId>
         </dependency>
 
-        <!-- web -->
+        <!-- REST using Apache Jersey -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.websocket</groupId>
-            <artifactId>javax.websocket-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.bundles</groupId>
-            <artifactId>jaxrs-ri</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
         </dependency>
 
         <!-- testing -->
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/rest/ShopFloorResource.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/rest/ShopFloorResource.java
index 993217b..a421b6f 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/rest/ShopFloorResource.java
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/rest/ShopFloorResource.java
@@ -6,11 +6,11 @@ import static li.strolch.model.Tags.Json.DATA;
 import static li.strolch.plc.model.PlcConstants.PARAM_PLC_ID;
 import static li.strolch.rest.StrolchRestfulConstants.STROLCH_CERTIFICATE;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import ${package}.server.web.service.ShopFloorActionService;
 import com.google.gson.JsonObject;
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/RestfulApplication.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/RestfulApplication.java
index b3fc140..6f31687 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/RestfulApplication.java
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/RestfulApplication.java
@@ -2,7 +2,7 @@ package ${package}.server.web.web;
 
 import static ${package}.server.web.web.StartupListener.APP_NAME;
 
-import javax.ws.rs.ApplicationPath;
+import jakarta.ws.rs.ApplicationPath;
 import java.util.logging.Level;
 
 import ${package}.server.web.rest.ShopFloorResource;
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java
index b791028..e8312fd 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java
@@ -1,8 +1,8 @@
 package ${package}.server.web.web;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 import java.io.InputStream;
 
 import li.strolch.agent.api.LoggingLoader;
diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml
index 7678da3..a07048c 100644
--- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml
+++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml
@@ -29,30 +29,24 @@
         <!-- compile time dependencies -->
         <slf4j.version>2.0.5</slf4j.version>
         <logback.version>1.4.14</logback.version>
-        <jersey.version>3.1.2</jersey.version>
         <gson.version>2.10</gson.version>
         <hikaricp.version>5.0.1</hikaricp.version>
-        <postgresql.version>42.4.1</postgresql.version>
+        <postgresql.version>42.5.1</postgresql.version>
         <antlr.version>4.9.3</antlr.version>
-        <annotation.version>1.3.2</annotation.version>
-        <activation.version>1.1.1</activation.version>
         <javaxmail.version>1.6.2</javaxmail.version>
-        <serverlet.version>4.0.1</serverlet.version>
-        <jaxrs.api.version>2.1.1</jaxrs.api.version>
-        <jaxrs.ri.version>2.35</jaxrs.ri.version>
-        <jaxb.api.version>2.3.1</jaxb.api.version>
-        <jaxb.core.version>2.3.0.1</jaxb.core.version>
-        <jaxb.impl.version>2.3.3</jaxb.impl.version>
-        <jaxws.version>2.3.3</jaxws.version>
-        <jakarta.jws-api.version>2.1.0</jakarta.jws-api.version>
-        <jaxp.version>1.4.2</jaxp.version>
-        <tyrus.version>1.17</tyrus.version>
-        <grizzly.version>2.4.4</grizzly.version>
-        <websocket.version>1.1</websocket.version>
-        <sax.version>2.0.1</sax.version>
         <csv.version>1.9.0</csv.version>
         <cron.version>1.6.2</cron.version>
 
+        <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
+        <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
+        <jakarta.activation.version>2.1.0</jakarta.activation.version>
+        <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
+        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <jakarta.websocket.version>2.1.0</jakarta.websocket.version>
+        <jersey.version>3.1.2</jersey.version>
+        <csrfguard.version>4.3.0-jakarta</csrfguard.version>
+
         <camel.version>3.19.0</camel.version>
 
         <pi4j.version>1.4</pi4j.version>
@@ -131,7 +125,7 @@
             <!-- Strolch -->
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.bom</artifactId>
+                <artifactId>strolch-bom</artifactId>
                 <type>pom</type>
                 <version>${strolch.version}</version>
                 <scope>import</scope>
@@ -140,98 +134,47 @@
             <!-- PLC -->
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-model</artifactId>
+                <artifactId>plc-model</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-core</artifactId>
+                <artifactId>plc-core</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-rest</artifactId>
+                <artifactId>plc-rest</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-gw-server</artifactId>
+                <artifactId>plc-gw-server</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-gw-client</artifactId>
+                <artifactId>plc-gw-client</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-plc-util</artifactId>
+                <artifactId>plc-util</artifactId>
                 <version>${strolch-plc.version}</version>
             </dependency>
 
-            <!-- web -->
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>${gson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
-            </dependency>
+            <!-- Restful API -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>${jaxb.api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>javax.xml</groupId>
-                <artifactId>jaxp-api</artifactId>
-                <version>${jaxp.version}</version>
-            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>${serverlet.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>jakarta.xml.ws</groupId>
-                <artifactId>jakarta.xml.ws-api</artifactId>
-                <version>${jaxws.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.jws</groupId>
-                <artifactId>jakarta.jws-api</artifactId>
-                <version>${jakarta.jws-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-rt</artifactId>
-                <version>${jaxws.version}</version>
-                <scope>runtime</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.woodstox</groupId>
-                        <artifactId>woodstox-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>stax2-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.eclipse.angus</groupId>
-                        <artifactId>angus-activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
@@ -249,6 +192,26 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-client</artifactId>
+                <version>${tyrus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-container-grizzly-client</artifactId>
+                <version>${tyrus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-container-grizzly-server</artifactId>
+                <version>${tyrus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.grizzly</groupId>
+                <artifactId>grizzly-framework</artifactId>
+                <version>${grizzly.version}</version>
+            </dependency>
 
             <!-- websocket -->
             <dependency>
diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml
index 290a5c8..11d415f 100644
--- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml
+++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml
@@ -30,35 +30,32 @@
         <!-- compile time dependencies -->
         <slf4j.version>2.0.5</slf4j.version>
         <logback.version>1.4.14</logback.version>
-        <jersey.version>3.1.2</jersey.version>
         <gson.version>2.10</gson.version>
         <hikaricp.version>5.0.1</hikaricp.version>
-        <postgresql.version>42.4.1</postgresql.version>
+        <postgresql.version>42.5.1</postgresql.version>
         <antlr.version>4.9.3</antlr.version>
-        <annotation.version>1.3.2</annotation.version>
-        <activation.version>1.1.1</activation.version>
         <javaxmail.version>1.6.2</javaxmail.version>
-        <serverlet.version>4.0.1</serverlet.version>
-        <jaxrs.api.version>2.1.1</jaxrs.api.version>
-        <jaxrs.ri.version>2.35</jaxrs.ri.version>
-        <jaxb.api.version>2.3.1</jaxb.api.version>
-        <jaxws.version>2.3.3</jaxws.version>
-        <jakarta.jws-api.version>2.1.0</jakarta.jws-api.version>
-        <jaxp.version>1.4.2</jaxp.version>
-        <tyrus.version>1.17</tyrus.version>
-        <grizzly.version>2.4.4</grizzly.version>
-        <websocket.version>1.1</websocket.version>
-        <sax.version>2.0.1</sax.version>
         <csv.version>1.9.0</csv.version>
         <cron.version>1.6.2</cron.version>
 
+        <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
+        <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
+        <jakarta.activation.version>2.1.0</jakarta.activation.version>
+        <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
+        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <jakarta.websocket.version>2.1.0</jakarta.websocket.version>
+        <jersey.version>3.1.2</jersey.version>
+        <csrfguard.version>4.3.0-jakarta</csrfguard.version>
+
+        <camel.version>3.19.0</camel.version>
+
+        <strolch.version>2.2.3</strolch.version>
+
         <!-- test time dependencies -->
         <junit.version>4.13.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
 
-        <!-- strolch -->
-        <strolch.version>2.2.3</strolch.version>
-
         <!-- maven plug-in dependencies -->
         <maven-scm-plugin.version>1.12.2</maven-scm-plugin.version>
         <buildnumber-maven-plugin.version>3.0.0</buildnumber-maven-plugin.version>
@@ -88,7 +85,7 @@
         <dependencies>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.bom</artifactId>
+                <artifactId>strolch-bom</artifactId>
                 <type>pom</type>
                 <version>${strolch.version}</version>
                 <scope>import</scope>
@@ -212,50 +209,58 @@
         <!-- strolch -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.rest</artifactId>
+            <artifactId>web-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- web -->
+        <!-- REST using Apache Jersey -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.websocket</groupId>
-            <artifactId>javax.websocket-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.bundles</groupId>
-            <artifactId>jaxrs-ri</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.tyrus</groupId>
-            <artifactId>tyrus-client</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.tyrus</groupId>
-            <artifactId>tyrus-container-grizzly-client</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.grizzly</groupId>
-            <artifactId>grizzly-framework</artifactId>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
         </dependency>
 
         <!-- testing -->