Strolch
/
strolch-plc
mirror of https://github.com/strolch-li/strolch-plc.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Robert von Burg 2022-12-16 15:44:59 +01:00
parent 00b46cfdf8
commit e103545025
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
5 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plc-core/pom.xml
View File

@ -7,12 +7,12 @@
<parent> <parent>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>strolch-plc</artifactId> <artifactId>strolch-plc</artifactId>
<version>1.2.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>strolch-plc-core</artifactId> <artifactId>plc-core</artifactId>
<name>strolch-plc-core</name> <name>plc-core</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url> <url>https://github.com/4treesCH/strolch-plc</url>

2
plc-gw-client/pom.xml
View File

@ -12,7 +12,7 @@
</parent> </parent>
<artifactId>plc-gw-client</artifactId> <artifactId>plc-gw-client</artifactId>
<name>strolch-plc-gw-client</name> <name>plc-gw-client</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url> <url>https://github.com/4treesCH/strolch-plc</url>

4
plc-gw-server/pom.xml
View File

@ -12,7 +12,7 @@
</parent> </parent>
<artifactId>plc-gw-server</artifactId> <artifactId>plc-gw-server</artifactId>
<name>strolch-plc-gw-client</name> <name>plc-gw-server</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<url>https://github.com/4treesCH/strolch-plc</url> <url>https://github.com/4treesCH/strolch-plc</url>
@ -78,7 +78,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>strolch-plc-core</artifactId> <artifactId>plc-core</artifactId>
</dependency> </dependency>
<!-- REST using Apache Jersey --> <!-- REST using Apache Jersey -->

99
pom.xml
View File

@ -204,72 +204,83 @@
<version>${jserialcomm.version}</version> <version>${jserialcomm.version}</version>
</dependency> </dependency>
<!-- Restful API --> <!-- REST using Apache Jersey -->
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-core</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.core.version}</version> <version>${jakarta.xml.bind-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>${jaxb.impl.version}</version> <version>${jakarta.annotation.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.activation</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.activation-api</artifactId>
<version>${jaxb.api.version}</version> <version>${jakarta.activation.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jaxp-api</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<version>${jaxp.version}</version> <version>${jakarta.servlet-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>${serverlet.version}</version> <version>${jakarta.ws.rs-api.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<artifactId>javax.ws.rs-api</artifactId> <artifactId>jersey-container-servlet</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> <version>${jersey.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.tyrus</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<artifactId>tyrus-client</artifactId> <artifactId>jersey-container-grizzly2-servlet</artifactId>
<version>${tyrus.version}</version> <version>${jersey.version}</version>
</dependency> </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> <dependency>
<groupId>org.glassfish.tyrus</groupId> <groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-container-grizzly-client</artifactId> <artifactId>tyrus-container-grizzly-client</artifactId>
<version>${tyrus.version}</version> <version>${tyrus-container-grizzly-client.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${grizzly.version}</version>
</dependency> </dependency>
<!-- websocket --> <!-- websocket -->
<dependency> <dependency>
<groupId>javax.websocket</groupId> <groupId>jakarta.websocket</groupId>
<artifactId>javax.websocket-api</artifactId> <artifactId>jakarta.websocket-client-api</artifactId>
<version>${websocket.version}</version> <version>${jakarta.websocket.version}</version>
<scope>provided</scope> </dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>${jakarta.websocket.version}</version>
</dependency> </dependency>
<!-- testing --> <!-- testing -->

10
strolch-plc-bom/pom.xml
View File

@ -18,16 +18,12 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Strolch --> <!-- PLC -->
<dependency> <dependency>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>strolch-bom</artifactId> <artifactId>plc-model</artifactId>
<type>pom</type> <version>${project.version}</version>
<version>${strolch.version}</version>
<scope>import</scope>
</dependency> </dependency>
<!-- PLC -->
<dependency> <dependency>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>plc-core</artifactId> <artifactId>plc-core</artifactId>