From e1035450258335134ce0e1a1c6b8add2f76cafef Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Fri, 16 Dec 2022 15:44:59 +0100
Subject: [PATCH] [Major] Updated to jakarta and version 2.0.x, renamed modules

---
 plc-core/pom.xml        |  6 +--
 plc-gw-client/pom.xml   |  2 +-
 plc-gw-server/pom.xml   |  4 +-
 pom.xml                 | 99 +++++++++++++++++++++++------------------
 strolch-plc-bom/pom.xml | 10 ++---
 5 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/plc-core/pom.xml b/plc-core/pom.xml
index 3cb0725..475f7bd 100644
--- a/plc-core/pom.xml
+++ b/plc-core/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>li.strolch</groupId>
         <artifactId>strolch-plc</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>strolch-plc-core</artifactId>
-    <name>strolch-plc-core</name>
+    <artifactId>plc-core</artifactId>
+    <name>plc-core</name>
     <packaging>jar</packaging>
     <url>https://github.com/4treesCH/strolch-plc</url>
 
diff --git a/plc-gw-client/pom.xml b/plc-gw-client/pom.xml
index 5ad128f..08e0c34 100644
--- a/plc-gw-client/pom.xml
+++ b/plc-gw-client/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>plc-gw-client</artifactId>
-    <name>strolch-plc-gw-client</name>
+    <name>plc-gw-client</name>
     <packaging>jar</packaging>
     <url>https://github.com/4treesCH/strolch-plc</url>
 
diff --git a/plc-gw-server/pom.xml b/plc-gw-server/pom.xml
index 385d8eb..fd7185a 100644
--- a/plc-gw-server/pom.xml
+++ b/plc-gw-server/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>plc-gw-server</artifactId>
-    <name>strolch-plc-gw-client</name>
+    <name>plc-gw-server</name>
     <packaging>jar</packaging>
     <url>https://github.com/4treesCH/strolch-plc</url>
 
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>strolch-plc-core</artifactId>
+            <artifactId>plc-core</artifactId>
         </dependency>
 
         <!-- REST using Apache Jersey -->
diff --git a/pom.xml b/pom.xml
index 8c564f3..63a38d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,72 +204,83 @@
                 <version>${jserialcomm.version}</version>
             </dependency>
 
-            <!-- Restful API -->
+            <!-- REST using Apache Jersey -->
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.core.version}</version>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.xml.bind-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta.annotation.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.api.version}</version>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${jakarta.activation.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.xml</groupId>
-                <artifactId>jaxp-api</artifactId>
-                <version>${jaxp.version}</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${serverlet.version}</version>
-                <scope>provided</scope>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${jakarta.ws.rs-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>javax.ws.rs-api</artifactId>
-                <version>${jaxrs.api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.bundles</groupId>
-                <artifactId>jaxrs-ri</artifactId>
-                <version>${jaxrs.ri.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey</groupId>
-                <artifactId>jersey-bom</artifactId>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-servlet</artifactId>
                 <version>${jersey.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.tyrus</groupId>
-                <artifactId>tyrus-client</artifactId>
-                <version>${tyrus.version}</version>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-grizzly2-servlet</artifactId>
+                <version>${jersey.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-hk2</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.test-framework</groupId>
+                <artifactId>jersey-test-framework-core</artifactId>
+                <version>${jersey.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+                <artifactId>jersey-test-framework-provider-external</artifactId>
+                <version>${jersey.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+                <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+                <version>${jersey.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Tyrus REST Client -->
             <dependency>
                 <groupId>org.glassfish.tyrus</groupId>
                 <artifactId>tyrus-container-grizzly-client</artifactId>
-                <version>${tyrus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.grizzly</groupId>
-                <artifactId>grizzly-framework</artifactId>
-                <version>${grizzly.version}</version>
+                <version>${tyrus-container-grizzly-client.version}</version>
             </dependency>
 
             <!-- websocket -->
             <dependency>
-                <groupId>javax.websocket</groupId>
-                <artifactId>javax.websocket-api</artifactId>
-                <version>${websocket.version}</version>
-                <scope>provided</scope>
+                <groupId>jakarta.websocket</groupId>
+                <artifactId>jakarta.websocket-client-api</artifactId>
+                <version>${jakarta.websocket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.websocket</groupId>
+                <artifactId>jakarta.websocket-api</artifactId>
+                <version>${jakarta.websocket.version}</version>
             </dependency>
 
             <!-- testing -->
diff --git a/strolch-plc-bom/pom.xml b/strolch-plc-bom/pom.xml
index 58015fe..f15a18e 100644
--- a/strolch-plc-bom/pom.xml
+++ b/strolch-plc-bom/pom.xml
@@ -18,16 +18,12 @@
     <dependencyManagement>
         <dependencies>
 
-            <!-- Strolch -->
+            <!-- PLC -->
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>strolch-bom</artifactId>
-                <type>pom</type>
-                <version>${strolch.version}</version>
-                <scope>import</scope>
+                <artifactId>plc-model</artifactId>
+                <version>${project.version}</version>
             </dependency>
-
-            <!-- PLC -->
             <dependency>
                 <groupId>li.strolch</groupId>
                 <artifactId>plc-core</artifactId>