[Major] Updated to jakarta and version 2.0.x, renamed modules

This commit is contained in:
Robert von Burg 2022-12-16 15:29:02 +01:00
parent 440a5c36ab
commit 00b46cfdf8
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
100 changed files with 134 additions and 130 deletions

View File

@ -41,29 +41,30 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<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>li.strolch.rest</artifactId>
<artifactId>web-rest</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-model</artifactId>
<artifactId>plc-model</artifactId>
<version>${project.version}</version>
</dependency>
<!-- utils -->
@ -86,7 +87,7 @@
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.testbase</artifactId>
<artifactId>test-base</artifactId>
</dependency>
</dependencies>

View File

@ -7,11 +7,11 @@
<parent>
<artifactId>strolch-plc</artifactId>
<groupId>li.strolch</groupId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>strolch-plc-gw-client</artifactId>
<artifactId>plc-gw-client</artifactId>
<name>strolch-plc-gw-client</name>
<packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url>
@ -42,27 +42,33 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<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>li.strolch.rest</artifactId>
<artifactId>web-rest</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.websocket</artifactId>
<artifactId>websocket</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>plc-core</artifactId>
</dependency>
<!-- utils -->
@ -71,11 +77,6 @@
<artifactId>gson</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId>
</dependency>
<!-- REST using Apache Jersey -->
<dependency>

View File

@ -7,11 +7,11 @@
<parent>
<artifactId>strolch-plc</artifactId>
<groupId>li.strolch</groupId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>strolch-plc-gw-server</artifactId>
<artifactId>plc-gw-server</artifactId>
<name>strolch-plc-gw-client</name>
<packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url>
@ -42,33 +42,27 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<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>li.strolch.rest</artifactId>
<artifactId>web-rest</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.websocket</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-model</artifactId>
<artifactId>websocket</artifactId>
</dependency>
<!-- utils -->
@ -77,6 +71,16 @@
<artifactId>gson</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>plc-model</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId>
</dependency>
<!-- REST using Apache Jersey -->
<dependency>
<groupId>jakarta.annotation</groupId>
@ -109,6 +113,8 @@
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<!-- Tyrus REST Client -->
</dependency>
<!-- test -->

View File

@ -6,11 +6,11 @@
<parent>
<artifactId>strolch-plc</artifactId>
<groupId>li.strolch</groupId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>strolch-plc-model</artifactId>
<artifactId>plc-model</artifactId>
<name>strolch-plc-model</name>
<packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url>
@ -40,11 +40,11 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.model</artifactId>
<artifactId>model</artifactId>
</dependency>
<!-- utils -->
@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.testbase</artifactId>
<artifactId>test-base</artifactId>
</dependency>
</dependencies>

View File

@ -7,11 +7,11 @@
<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-rest</artifactId>
<artifactId>plc-rest</artifactId>
<name>strolch-plc-rest</name>
<packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url>
@ -42,27 +42,27 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<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>li.strolch.rest</artifactId>
<artifactId>web-rest</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.websocket</artifactId>
<artifactId>websocket</artifactId>
</dependency>
<!-- utils -->
@ -74,7 +74,7 @@
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId>
<artifactId>plc-core</artifactId>
</dependency>
<!-- REST using Apache Jersey -->

View File

@ -7,11 +7,11 @@
<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-util</artifactId>
<artifactId>plc-util</artifactId>
<name>strolch-plc-util</name>
<packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url>
@ -41,17 +41,18 @@
<!-- Strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.utils</artifactId>
<artifactId>utils</artifactId>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.model</artifactId>
<artifactId>model</artifactId>
</dependency>
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-model</artifactId>
<artifactId>plc-model</artifactId>
<version>${project.version}</version>
</dependency>
<!-- utils -->
@ -72,7 +73,7 @@
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.testbase</artifactId>
<artifactId>test-base</artifactId>
</dependency>
</dependencies>

133
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>li.strolch</groupId>
<artifactId>strolch-plc</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>strolch-plc</name>
<description>Module build to build strolch-plc</description>
@ -63,6 +63,12 @@
<slf4j.version>2.0.5</slf4j.version>
<logback.version>1.4.5</logback.version>
<gson.version>2.10</gson.version>
<hikaricp.version>5.0.1</hikaricp.version>
<postgresql.version>42.5.1</postgresql.version>
<antlr.version>4.9.3</antlr.version>
<javaxmail.version>1.6.2</javaxmail.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>
@ -79,7 +85,7 @@
<javafx.version>17.0.1</javafx.version>
<strolch.version>1.8.0-SNAPSHOT</strolch.version>
<strolch.version>2.0.0-SNAPSHOT</strolch.version>
<!-- test time dependencies -->
<junit.version>4.13.2</junit.version>
@ -119,12 +125,12 @@
<modules>
<module>strolch-plc-bom</module>
<module>strolch-plc-model</module>
<module>strolch-plc-util</module>
<module>strolch-plc-core</module>
<module>strolch-plc-rest</module>
<module>strolch-plc-gw-client</module>
<module>strolch-plc-gw-server</module>
<module>plc-model</module>
<module>plc-util</module>
<module>plc-core</module>
<module>plc-rest</module>
<module>plc-gw-client</module>
<module>plc-gw-server</module>
</modules>
<dependencyManagement>
@ -151,7 +157,7 @@
<!-- strolch -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>li.strolch.bom</artifactId>
<artifactId>strolch-bom</artifactId>
<version>${strolch.version}</version>
<type>pom</type>
<scope>import</scope>
@ -160,27 +166,27 @@
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-model</artifactId>
<artifactId>plc-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId>
<artifactId>plc-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-rest</artifactId>
<artifactId>plc-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-gw-client</artifactId>
<artifactId>plc-gw-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-gw-server</artifactId>
<artifactId>plc-gw-server</artifactId>
<version>${project.version}</version>
</dependency>
@ -198,83 +204,72 @@
<version>${jserialcomm.version}</version>
</dependency>
<!-- REST using Apache Jersey -->
<!-- Restful API -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind-api.version}</version>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb.core.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.impl.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
<groupId>javax.xml</groupId>
<artifactId>jaxp-api</artifactId>
<version>${jaxp.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.version}</version>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${serverlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<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>
<version>${jersey.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-servlet</artifactId>
<version>${jersey.version}</version>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-client</artifactId>
<version>${tyrus.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-container-grizzly-client.version}</version>
<version>${tyrus.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${grizzly.version}</version>
</dependency>
<!-- websocket -->
<dependency>
<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>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>${websocket.version}</version>
<scope>provided</scope>
</dependency>
<!-- testing -->

View File

@ -6,7 +6,7 @@
<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>
@ -21,7 +21,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>
@ -30,27 +30,27 @@
<!-- PLC -->
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId>
<artifactId>plc-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-rest</artifactId>
<artifactId>plc-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-gw-client</artifactId>
<artifactId>plc-gw-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-gw-server</artifactId>
<artifactId>plc-gw-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>li.strolch</groupId>
<artifactId>strolch-plc-util</artifactId>
<artifactId>plc-util</artifactId>
<version>${project.version}</version>
</dependency>