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 @@
li.strolch
strolch-plc
- 1.2.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
../pom.xml
- strolch-plc-core
- strolch-plc-core
+ plc-core
+ plc-core
jar
https://github.com/4treesCH/strolch-plc
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 @@
plc-gw-client
- strolch-plc-gw-client
+ plc-gw-client
jar
https://github.com/4treesCH/strolch-plc
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 @@
plc-gw-server
- strolch-plc-gw-client
+ plc-gw-server
jar
https://github.com/4treesCH/strolch-plc
@@ -78,7 +78,7 @@
li.strolch
- strolch-plc-core
+ plc-core
diff --git a/pom.xml b/pom.xml
index 8c564f3..63a38d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,72 +204,83 @@
${jserialcomm.version}
-
+
- com.sun.xml.bind
- jaxb-core
- ${jaxb.core.version}
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${jakarta.xml.bind-api.version}
- com.sun.xml.bind
- jaxb-impl
- ${jaxb.impl.version}
+ jakarta.annotation
+ jakarta.annotation-api
+ ${jakarta.annotation.version}
- javax.xml.bind
- jaxb-api
- ${jaxb.api.version}
+ jakarta.activation
+ jakarta.activation-api
+ ${jakarta.activation.version}
- javax.xml
- jaxp-api
- ${jaxp.version}
+ jakarta.servlet
+ jakarta.servlet-api
+ ${jakarta.servlet-api.version}
- javax.servlet
- javax.servlet-api
- ${serverlet.version}
- provided
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api.version}
- javax.ws.rs
- javax.ws.rs-api
- ${jaxrs.api.version}
-
-
- org.glassfish.jersey.bundles
- jaxrs-ri
- ${jaxrs.ri.version}
-
-
- org.glassfish.jersey
- jersey-bom
+ org.glassfish.jersey.containers
+ jersey-container-servlet
${jersey.version}
- pom
- import
- org.glassfish.tyrus
- tyrus-client
- ${tyrus.version}
+ org.glassfish.jersey.containers
+ jersey-container-grizzly2-servlet
+ ${jersey.version}
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${jersey.version}
+
+
+ org.glassfish.jersey.test-framework
+ jersey-test-framework-core
+ ${jersey.version}
+ test
+
+
+ org.glassfish.jersey.test-framework.providers
+ jersey-test-framework-provider-external
+ ${jersey.version}
+ test
+
+
+ org.glassfish.jersey.test-framework.providers
+ jersey-test-framework-provider-grizzly2
+ ${jersey.version}
+ test
+
+
+
org.glassfish.tyrus
tyrus-container-grizzly-client
- ${tyrus.version}
-
-
- org.glassfish.grizzly
- grizzly-framework
- ${grizzly.version}
+ ${tyrus-container-grizzly-client.version}
- javax.websocket
- javax.websocket-api
- ${websocket.version}
- provided
+ jakarta.websocket
+ jakarta.websocket-client-api
+ ${jakarta.websocket.version}
+
+
+ jakarta.websocket
+ jakarta.websocket-api
+ ${jakarta.websocket.version}
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 @@
-
+
li.strolch
- strolch-bom
- pom
- ${strolch.version}
- import
+ plc-model
+ ${project.version}
-
-
li.strolch
plc-core