You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/11/27 13:09:52 UTC
[plc4x] branch develop updated: - Big pom hygene session -- Updated
dependency versions -- Updated plugin versions -- Removed usage of
${project.version} where it is not needed -- Managed dependencies --
Removed unneeded dependency-management -- Removed unneeded properties
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 3197b82 - Big pom hygene session -- Updated dependency versions -- Updated plugin versions -- Removed usage of ${project.version} where it is not needed -- Managed dependencies -- Removed unneeded dependency-management -- Removed unneeded properties
3197b82 is described below
commit 3197b821ae91dbac75e26549353cdb80402457c1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Nov 27 14:09:43 2020 +0100
- Big pom hygene session
-- Updated dependency versions
-- Updated plugin versions
-- Removed usage of ${project.version} where it is not needed
-- Managed dependencies
-- Removed unneeded dependency-management
-- Removed unneeded properties
---
build-utils/language-base-freemarker/pom.xml | 1 -
plc4j/drivers/firmata/pom.xml | 1 -
plc4j/drivers/opcua/pom.xml | 27 +
plc4j/examples/hello-storage-elasticsearch/pom.xml | 20 +
plc4j/examples/replay-test/pom.xml | 2 -
plc4j/integrations/logstash-plugin/pom.xml | 43 +-
plc4j/karaf-features/camel/pom.xml | 2 +-
plc4j/karaf-features/eip/pom.xml | 2 +-
plc4j/karaf-features/s7/pom.xml | 2 +-
.../plc4x/java/spi/generation/WriteBuffer.java | 4 +-
plc4j/tools/interop/pom.xml | 3 -
.../java/org/apache/plc4x/interop/impl/Server.java | 4 +-
plc4j/transports/serial/pom.xml | 1 -
pom.xml | 787 +++++++--------------
sandbox/code-gen/pom.xml | 1 -
sandbox/hello-influx-data-collection/pom.xml | 1 -
sandbox/opcua-server/pom.xml | 152 ++--
sandbox/plc-simulator/pom.xml | 1 +
sandbox/plc4cpp/pom.xml | 1 -
sandbox/test-java-bacnetip-driver/pom.xml | 4 +-
.../apache/plc4x/java/bacnetip/BacNetIpDriver.java | 2 -
sandbox/test-java-df1-driver/pom.xml | 5 +-
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 2 -
tools/thrift/pom.xml | 2 +-
24 files changed, 422 insertions(+), 648 deletions(-)
diff --git a/build-utils/language-base-freemarker/pom.xml b/build-utils/language-base-freemarker/pom.xml
index 423f13b..c6ed0a6 100644
--- a/build-utils/language-base-freemarker/pom.xml
+++ b/build-utils/language-base-freemarker/pom.xml
@@ -54,7 +54,6 @@
<dependency>
<groupId>net.objecthunter</groupId>
<artifactId>exp4j</artifactId>
- <version>0.4.8</version>
</dependency>
</dependencies>
diff --git a/plc4j/drivers/firmata/pom.xml b/plc4j/drivers/firmata/pom.xml
index 3b9643b..89b9ca8 100644
--- a/plc4j/drivers/firmata/pom.xml
+++ b/plc4j/drivers/firmata/pom.xml
@@ -141,7 +141,6 @@
<dependency>
<groupId>com.github.purejavacomm</groupId>
<artifactId>purejavacomm</artifactId>
- <version>1.0.2.RELEASE</version>
</dependency>
<dependency>
diff --git a/plc4j/drivers/opcua/pom.xml b/plc4j/drivers/opcua/pom.xml
index 8793911..f894a18 100644
--- a/plc4j/drivers/opcua/pom.xml
+++ b/plc4j/drivers/opcua/pom.xml
@@ -120,4 +120,31 @@
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>sdk-client</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-core</artifactId>
+ <version>${milo.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-client</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>server-examples</artifactId>
+ <version>${milo.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml b/plc4j/examples/hello-storage-elasticsearch/pom.xml
index a2a2eb4..cf506b1 100644
--- a/plc4j/examples/hello-storage-elasticsearch/pom.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml
@@ -105,6 +105,26 @@
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>${elasticsearch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch-x-content</artifactId>
+ <version>${elasticsearch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>transport-netty4-client</artifactId>
+ <version>${elasticsearch.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<!-- Filter out some resources -->
diff --git a/plc4j/examples/replay-test/pom.xml b/plc4j/examples/replay-test/pom.xml
index 10450fd..1bae2c7 100644
--- a/plc4j/examples/replay-test/pom.xml
+++ b/plc4j/examples/replay-test/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
@@ -55,7 +54,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 01d36fa..e44b270 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -58,7 +59,7 @@
def currentVersion = project.version as String
def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
print "\nCurrent version: " + currentVersion
- if(match.count >= 1) {
+ if (match.count >= 1) {
def majorVersion = match[0][1] as Integer
def minorVersion = match[0][2] as Integer
def bugfixVersion = match[0][3] as Integer
@@ -88,7 +89,9 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jruby.version}/jruby-dist-${jruby.version}-bin.tar.gz</url>
+ <url>
+ https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jruby.version}/jruby-dist-${jruby.version}-bin.tar.gz
+ </url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/jruby</outputDirectory>
</configuration>
@@ -130,7 +133,9 @@
</goals>
<configuration>
<!-- Ignore the error ... this variable is calculated in the "validate" phase -->
- <outputFile>${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/${current-full-version}/logstash-input-plc4x-${current-full-version}.jar</outputFile>
+ <outputFile>
+ ${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/${current-full-version}/logstash-input-plc4x-${current-full-version}.jar
+ </outputFile>
<!-- The output is just an intermediate file, so make sure it's not installed or deployed -->
<shadedArtifactAttached>false</shadedArtifactAttached>
</configuration>
@@ -237,18 +242,24 @@
<version>0.8.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- <!--dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-ads</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-ethernet-ip</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency-->
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-ads</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-eip</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-firmata</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-knxnetip</artifactId>
diff --git a/plc4j/karaf-features/camel/pom.xml b/plc4j/karaf-features/camel/pom.xml
index a4a0df3..584b7f6 100644
--- a/plc4j/karaf-features/camel/pom.xml
+++ b/plc4j/karaf-features/camel/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-apache-camel</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/plc4j/karaf-features/eip/pom.xml b/plc4j/karaf-features/eip/pom.xml
index 3734abd..ca4d460 100644
--- a/plc4j/karaf-features/eip/pom.xml
+++ b/plc4j/karaf-features/eip/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-eip</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/s7/pom.xml
index 1c335dd..9b15440 100644
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/s7/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBuffer.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBuffer.java
index 339e1e7..9891f64 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBuffer.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBuffer.java
@@ -31,7 +31,7 @@ import java.nio.charset.Charset;
public class WriteBuffer {
private final ByteBuffer bb;
- private final BufferByteOutput<ByteBuffer> bbo;
+ private final BufferByteOutput bbo;
private final MyDefaultBitOutput bo;
private final boolean littleEndian;
@@ -41,7 +41,7 @@ public class WriteBuffer {
public WriteBuffer(int size, boolean littleEndian) {
bb = ByteBuffer.allocate(size);
- bbo = new BufferByteOutput<>(bb);
+ bbo = new BufferByteOutput(bb);
bo = new MyDefaultBitOutput(bbo);
this.littleEndian = littleEndian;
}
diff --git a/plc4j/tools/interop/pom.xml b/plc4j/tools/interop/pom.xml
index 98f1a8f..221e737 100644
--- a/plc4j/tools/interop/pom.xml
+++ b/plc4j/tools/interop/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>unpack-protocol-spec</id>
@@ -86,7 +85,6 @@
<plugin>
<groupId>org.apache.thrift.tools</groupId>
<artifactId>maven-thrift-plugin</artifactId>
- <version>0.1.11</version>
<configuration>
<thriftExecutable>${project.build.directory}/thrift-compiler/${thrift.compiler.executable}</thriftExecutable>
<thriftSourceRoot>${project.build.directory}/protocol-spec</thriftSourceRoot>
@@ -116,7 +114,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
<configuration>
<!-- get all project dependencies -->
<!-- <descriptorRefs>-->
diff --git a/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java b/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
index df93d53..e84a122 100644
--- a/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
+++ b/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
@@ -26,7 +26,7 @@ import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.api.value.PlcLong;
+import org.apache.plc4x.java.spi.values.PlcLINT;
import org.apache.plc4x.java.api.value.PlcValue;
import org.apache.plc4x.java.mock.connection.MockConnection;
import org.apache.plc4x.java.mock.connection.MockDevice;
@@ -66,7 +66,7 @@ public class Server {
private static class MyMockDevice implements MockDevice {
@Override
public ResponseItem<PlcValue> read(String fieldQuery) {
- return new ResponseItem<>(PlcResponseCode.OK, new PlcLong(100L));
+ return new ResponseItem<>(PlcResponseCode.OK, new PlcLINT(100L));
}
@Override
diff --git a/plc4j/transports/serial/pom.xml b/plc4j/transports/serial/pom.xml
index 5326f9e..0826534 100644
--- a/plc4j/transports/serial/pom.xml
+++ b/plc4j/transports/serial/pom.xml
@@ -64,7 +64,6 @@
<dependency>
<groupId>com.fazecast</groupId>
<artifactId>jSerialComm</artifactId>
- <version>2.5.1</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index fe63052..7664d43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,70 +103,63 @@
<plc4x-code-generation.version>1.4.0-SNAPSHOT</plc4x-code-generation.version>
- <antlr.version>4.8</antlr.version>
+ <antlr.version>4.9</antlr.version>
<apiguardian.version>1.1.0</apiguardian.version>
- <asm.version>5.0.4</asm.version>
- <assertj.version>3.11.1</assertj.version>
+ <assertj.version>3.18.1</assertj.version>
+ <!-- TODO: the currently available version is 2.0.5 and anything above 1.4.3 is no longer compatible with our code -->
+ <bit-io.version>1.4.3</bit-io.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <boost.version>1.73.0</boost.version>
- <boost.version.underline-short>1_73</boost.version.underline-short>
+ <boost.version>1.74.0</boost.version>
+ <boost.version.underline-short>1_74</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
- <byte-buddy.version>1.9.10</byte-buddy.version>
- <!-- CMake 3.17.0 is already released, but we should keep it in sync with the cmake-maven-plugin -->
- <cmake-version>3.17.3</cmake-version>
+ <byte-buddy.version>1.10.18</byte-buddy.version>
+ <!-- Be sure to keep this version set to the version of the cmake-maven-plugin -->
+ <cmake-version>3.18.4</cmake-version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-cli.version>1.4</commons-cli.version>
- <commons-codec.version>1.12</commons-codec.version>
- <commons-collections4.version>4.1</commons-collections4.version>
+ <commons-codec.version>1.15</commons-codec.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
+ <commons-compress.version>1.20</commons-compress.version>
<commons-configuration2.version>2.7</commons-configuration2.version>
- <commons-io.version>2.6</commons-io.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.9</commons-lang3.version>
+ <commons-io.version>2.8.0</commons-io.version>
+ <commons-lang3.version>3.11</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-math3.version>3.6.1</commons-math3.version>
- <commons-pool2.version>2.8.0</commons-pool2.version>
- <commons-text.version>1.8</commons-text.version>
- <crc.version>1.0.1</crc.version>
- <elasticsearch.version>7.5.2</elasticsearch.version>
- <equalsverifier.version>3.0.2</equalsverifier.version>
- <findbugs.version>3.0.1</findbugs.version>
- <freemarker.version>2.3.28</freemarker.version>
- <groovy.version>3.0.2</groovy.version>
- <gson.version>2.8.5</gson.version>
- <guava.version>27.0.1-jre</guava.version>
+ <commons-pool2.version>2.9.0</commons-pool2.version>
+ <commons-text.version>1.9</commons-text.version>
+ <commons-csv.version>1.8</commons-csv.version>
+ <dom4j.version>2.1.3</dom4j.version>
+ <elasticsearch.version>7.10.0</elasticsearch.version>
+ <equalsverifier.version>3.5</equalsverifier.version>
+ <freemarker.version>2.3.30</freemarker.version>
+ <groovy.version>3.0.6</groovy.version>
+ <gson.version>2.8.6</gson.version>
<hamcrest.version>2.2</hamcrest.version>
- <httpclient.version>4.5.10</httpclient.version>
- <jackson.version>2.10.0</jackson.version>
- <jmh.version>1.21</jmh.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.13</httpcore.version>
+ <jackson.version>2.11.3</jackson.version>
<jna.version>5.3.1</jna.version>
- <joda-time.version>2.10.5</joda-time.version>
- <jopt-simple.version>5.0.2</jopt-simple.version>
- <jserialcom.version>2.5.1</jserialcom.version>
- <junit.jupiter.version>5.6.0</junit.jupiter.version>
- <junit.platform.version>1.6.0</junit.platform.version>
+ <joda-time.version>2.10.8</joda-time.version>
+ <jserialcom.version>2.6.2</jserialcom.version>
+ <junit.jupiter.version>5.7.0</junit.jupiter.version>
+ <junit.platform.version>1.7.0</junit.platform.version>
<log4j.version>2.11.1</log4j.version>
<logback.version>1.2.3</logback.version>
- <logstash.version>7.4.0</logstash.version>
- <lucene.version>8.3.0</lucene.version>
- <metrics-core.version>3.1.2</metrics-core.version>
- <milo.version>0.5.2</milo.version>
- <mockito.version>2.24.5</mockito.version>
- <netty.version>4.1.47.Final</netty.version>
- <owasp-dependency-check.version>6.0.0</owasp-dependency-check.version>
+ <logstash.version>7.10.0</logstash.version>
+ <milo.version>0.5.3</milo.version>
+ <mockito.version>3.6.28</mockito.version>
+ <netty.version>4.1.54.Final</netty.version>
+ <owasp-dependency-check.version>6.0.3</owasp-dependency-check.version>
<pcap4j.version>1.8.2</pcap4j.version>
- <scala.version>2.12.6</scala.version>
- <slf4j.version>1.7.25</slf4j.version>
- <snakeyaml.version>1.24</snakeyaml.version>
- <spock-reports.version>1.6.1</spock-reports.version>
- <spock.version>1.2-groovy-2.5</spock.version>
- <t-digest.version>3.2</t-digest.version>
+ <slf4j.version>1.7.30</slf4j.version>
<thrift.version>0.13.0</thrift.version>
- <xmlunit.version>2.6.3</xmlunit.version>
+ <vavr.version>0.10.3</vavr.version>
+ <xmlunit.version>2.8.1</xmlunit.version>
<!-- Site properties -->
- <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.version>2.0.0</asciidoctorj.version>
- <asciidoctorj.diagram.version>1.5.16</asciidoctorj.diagram.version>
+ <asciidoctor.maven.plugin.version>2.1.0</asciidoctor.maven.plugin.version>
+ <asciidoctorj.version>2.4.2</asciidoctorj.version>
+ <asciidoctorj.diagram.version>2.0.5</asciidoctorj.diagram.version>
</properties>
<modules>
@@ -184,101 +177,54 @@
<dependencyManagement>
<dependencies>
- <!--
- Set to provided to ensure that these jars are never automatically
- included. If required the used still can override it if it is needed. -->
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.athaydes</groupId>
- <artifactId>spock-reports</artifactId>
- <version>${spock-reports.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fazecast</groupId>
- <artifactId>jSerialComm</artifactId>
- <version>${jserialcom.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
+ <!--- Code-Generation related -->
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.apache.plc4x.plugins</groupId>
+ <artifactId>plc4x-code-generation-types-base</artifactId>
+ <version>${plc4x-code-generation.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-csv</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.apache.plc4x.plugins</groupId>
+ <artifactId>plc4x-code-generation-language-base</artifactId>
+ <version>${plc4x-code-generation.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-smile</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.apache.plc4x.plugins</groupId>
+ <artifactId>plc4x-code-generation-protocol-base</artifactId>
+ <version>${plc4x-code-generation.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>${antlr.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
</dependency>
+
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${findbugs.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>com.tdunning</groupId>
- <artifactId>t-digest</artifactId>
- <version>${t-digest.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
</dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -296,138 +242,13 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.19</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics-core.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-rxtx</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.vavr</groupId>
- <artifactId>vavr</artifactId>
- <version>0.10.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.6</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>${byte-buddy.version}</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy-agent</artifactId>
- <version>${byte-buddy.version}</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>${jopt-simple.version}</version>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>${equalsverifier.version}</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-runtime</artifactId>
- <version>${antlr.version}</version>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -435,15 +256,9 @@
<version>${commons-configuration2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl3</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -466,95 +281,59 @@
<version>${commons-text.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-backward-codecs</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-join</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${commons-csv.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <version>${lucene.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>${lucene.version}</version>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda-time.version}</version>
</dependency>
+
+ <!-- For Either types ... -->
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${lucene.version}</version>
+ <groupId>io.vavr</groupId>
+ <artifactId>vavr</artifactId>
+ <version>${vavr.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- <version>${lucene.version}</version>
+ <groupId>com.github.jinahya</groupId>
+ <artifactId>bit-io</artifactId>
+ <version>${bit-io.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial3d</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial-extras</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.pcap4j</groupId>
+ <artifactId>pcap4j-core</artifactId>
+ <version>${pcap4j.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.pcap4j</groupId>
+ <artifactId>pcap4j-packetfactory-static</artifactId>
+ <version>${pcap4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -566,146 +345,154 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.apache.plc4x.plugins</groupId>
- <artifactId>plc4x-code-generation-types-base</artifactId>
- <version>${plc4x-code-generation.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.plugins</groupId>
- <artifactId>plc4x-code-generation-language-base</artifactId>
- <version>${plc4x-code-generation.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.plugins</groupId>
- <artifactId>plc4x-code-generation-protocol-base</artifactId>
- <version>${plc4x-code-generation.version}</version>
+ <groupId>net.objecthunter</groupId>
+ <artifactId>exp4j</artifactId>
+ <version>0.4.8</version>
</dependency>
+
<dependency>
- <groupId>org.apiguardian</groupId>
- <artifactId>apiguardian-api</artifactId>
- <version>${apiguardian.version}</version>
+ <groupId>com.github.purejavacomm</groupId>
+ <artifactId>purejavacomm</artifactId>
+ <version>1.0.2.RELEASE</version>
</dependency>
+
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- <scope>provided</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-csv</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>${groovy.version}</version>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
</dependency>
+
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
</dependency>
+
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test-junit5</artifactId>
- <version>${groovy.version}</version>
- <!-- Ensure we only use this in test -->
- <scope>test</scope>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${byte-buddy.version}</version>
</dependency>
+
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy.version}</version>
+ <groupId>com.fazecast</groupId>
+ <artifactId>jSerialComm</artifactId>
+ <version>${jserialcom.version}</version>
</dependency>
+
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>4.1</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
</dependency>
<dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.1.3</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-server</artifactId>
- <version>${milo.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>dictionary-manager</artifactId>
- <version>${milo.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.jupiter.version}</version>
</dependency>
+
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>server-examples</artifactId>
- <version>${milo.version}</version>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
- <version>${milo.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>stack-core</artifactId>
- <version>${milo.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>stack-client</artifactId>
- <version>${milo.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch-x-content</artifactId>
- <version>${elasticsearch.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.elasticsearch.plugin</groupId>
- <artifactId>transport-netty4-client</artifactId>
- <version>${elasticsearch.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
</dependency>
+
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.github.jinahya</groupId>
- <artifactId>bit-io</artifactId>
- <version>1.4.3</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
<dependency>
- <groupId>com.github.snksoft</groupId>
- <artifactId>crc</artifactId>
- <version>${crc.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
@@ -721,36 +508,7 @@
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-engine</artifactId>
- <version>${junit.platform.version}</version>
- </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -761,72 +519,63 @@
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
</dependency>
+
+ <!-- TODO: Eliminate the usage of AssertJ (OPM and OPC-UA Driver) -->
<dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-core</artifactId>
- <version>${jmh.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-generator-annprocess</artifactId>
- <version>${jmh.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.pcap4j</groupId>
- <artifactId>pcap4j-core</artifactId>
- <version>${pcap4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.pcap4j</groupId>
- <artifactId>pcap4j-packetfactory-static</artifactId>
- <version>${pcap4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>${equalsverifier.version}</version>
</dependency>
+
<dependency>
- <groupId>org.spockframework</groupId>
- <artifactId>spock-core</artifactId>
- <version>${spock.version}</version>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
+ <version>${groovy.version}</version>
+ <!-- Ensure we only use this in test -->
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>${xmlunit.version}</version>
</dependency>
+
+ <!-- *****************************************************************************
+ **********************************************************************************
+ ** Transitive dependencies **
+ **********************************************************************************
+ ****************************************************************************** -->
+
<dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <version>${xmlunit.version}</version>
+ <groupId>org.apiguardian</groupId>
+ <artifactId>apiguardian-api</artifactId>
+ <version>${apiguardian.version}</version>
</dependency>
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ <version>${junit.platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>sdk-server</artifactId>
+ <version>${milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>dictionary-manager</artifactId>
+ <version>${milo.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -869,7 +618,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.10.5</version>
+ <version>${joda-time.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1124,13 +873,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
+ <version>5.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.2.8</version>
+ <version>4.3.0</version>
</plugin>
<plugin>
@@ -1142,19 +891,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.5</version>
+ <version>0.8.6</version>
</plugin>
<plugin>
@@ -1189,7 +938,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1204,7 +953,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<configuration>
<finalName>apache-plc4x-${project.version}</finalName>
</configuration>
@@ -1213,7 +962,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.3</version>
+ <version>3.2.4</version>
<configuration>
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-uber-jar.${project.packaging}</outputFile>
<transformers>
@@ -1241,7 +990,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.8.2</version>
+ <version>3.9.1</version>
<configuration>
<!--templateFile>${session.executionRootDirectory}/src/site/template/site.vm</templateFile-->
<generateReports>true</generateReports>
@@ -1289,7 +1038,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<!--
This will suppress the generation of a hidden timestamp at the top of each generated html page
@@ -1326,13 +1075,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
@@ -1344,7 +1093,7 @@
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
- <version>3.17.3-b1</version>
+ <version>3.18.4-b1</version>
</plugin>
<plugin>
@@ -1658,7 +1407,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version> <!--$NO-MVN-MAN-VER$-->
+ <version>3.0.0-M3</version> <!--$NO-MVN-MAN-VER$-->
<executions>
<!-- Ensure we're not mixing dependency versions -->
<execution>
@@ -1786,7 +1535,7 @@
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
<executions>
<execution>
<goals>
diff --git a/sandbox/code-gen/pom.xml b/sandbox/code-gen/pom.xml
index e37f9e9..7ecdeb5 100644
--- a/sandbox/code-gen/pom.xml
+++ b/sandbox/code-gen/pom.xml
@@ -72,7 +72,6 @@
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>2.1.1</version>
</dependency>
</dependencies>
diff --git a/sandbox/hello-influx-data-collection/pom.xml b/sandbox/hello-influx-data-collection/pom.xml
index 9a3df80..26398bd 100644
--- a/sandbox/hello-influx-data-collection/pom.xml
+++ b/sandbox/hello-influx-data-collection/pom.xml
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/sandbox/opcua-server/pom.xml b/sandbox/opcua-server/pom.xml
index 4e5215a..b267ab2 100644
--- a/sandbox/opcua-server/pom.xml
+++ b/sandbox/opcua-server/pom.xml
@@ -18,7 +18,8 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,7 +38,7 @@
</properties>
<dependencies>
-<!-- Testing Dependencies -->
+ <!-- Testing Dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@@ -48,35 +49,30 @@
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test-junit5</artifactId>
- <scope>test</scope>
- </dependency>
-<!-- Milo OPC UA Dependencies -->
+ <!-- Milo OPC UA Dependencies -->
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-server</artifactId>
- <scope>compile</scope>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>sdk-server</artifactId>
+ <version>${milo.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>stack-core</artifactId>
- <scope>compile</scope>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>stack-core</artifactId>
+ <version>${milo.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>dictionary-manager</artifactId>
- <scope>compile</scope>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>dictionary-manager</artifactId>
+ <version>${milo.version}</version>
</dependency>
-<!-- Parsing Libraries -->
+ <!-- Parsing Libraries -->
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
@@ -90,14 +86,14 @@
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.32.v20200930</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>9.4.32.v20200930</version>
</dependency>
<dependency>
@@ -110,7 +106,7 @@
<artifactId>commons-lang3</artifactId>
</dependency>
-<!-- PLC4X Dependencies -->
+ <!-- PLC4X Dependencies -->
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
@@ -123,7 +119,7 @@
<version>${plc4x.version}</version>
</dependency>
-<!-- Include all drivers -->
+ <!-- Include all drivers -->
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-ab-eth</artifactId>
@@ -173,7 +169,7 @@
<scope>runtime</scope>
</dependency>
-<!-- Logging dependancies -->
+ <!-- Logging dependancies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -199,7 +195,6 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId>
@@ -215,64 +210,51 @@
<artifactId>bcprov-jdk15on</artifactId>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
-
- <!-- Build a fat jar containing all dependencies -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-uber-jar</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers combine.children="append">
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.plc4x.java.opcuaserver.OPCUAServer</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <usedDependencies combine.children="append">
- <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
- <usedDependency>org.eclipse.milo:sdk-server</usedDependency>
- <usedDependency>org.eclipse.milo:stack-core</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-ab-eth</usedDependency>
- <!--usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency-->
- <usedDependency>org.apache.plc4x:plc4j-driver-eip</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-knxnetip</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
- </usedDependencies>
- </configuration>
- </plugin>
-
- </plugins>
+ <plugins>
+ <!-- Build a fat jar containing all dependencies -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-uber-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers combine.children="append">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.apache.plc4x.java.opcuaserver.OPCUAServer</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <usedDependencies combine.children="append">
+ <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
+ <usedDependency>org.eclipse.milo:sdk-server</usedDependency>
+ <usedDependency>org.eclipse.milo:stack-core</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-ab-eth</usedDependency>
+ <!--usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency-->
+ <usedDependency>org.apache.plc4x:plc4j-driver-eip</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-knxnetip</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/sandbox/plc-simulator/pom.xml b/sandbox/plc-simulator/pom.xml
index 0cb55bc..16cebb7 100644
--- a/sandbox/plc-simulator/pom.xml
+++ b/sandbox/plc-simulator/pom.xml
@@ -96,6 +96,7 @@
<!-- Explicitly override the scope to compile to include these -->
+ <!-- TODO: We shouldn't be using this -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
diff --git a/sandbox/plc4cpp/pom.xml b/sandbox/plc4cpp/pom.xml
index 17e4be5..c855f95 100644
--- a/sandbox/plc4cpp/pom.xml
+++ b/sandbox/plc4cpp/pom.xml
@@ -260,7 +260,6 @@
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
- <version>3.16.3-b2</version>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
<execution>
diff --git a/sandbox/test-java-bacnetip-driver/pom.xml b/sandbox/test-java-bacnetip-driver/pom.xml
index f6ec63a..5d49ecc 100644
--- a/sandbox/test-java-bacnetip-driver/pom.xml
+++ b/sandbox/test-java-bacnetip-driver/pom.xml
@@ -87,12 +87,12 @@
<artifactId>commons-csv</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpDriver.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpDriver.java
index b25faf0..ff97be5 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpDriver.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpDriver.java
@@ -31,12 +31,10 @@ import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
import org.apache.plc4x.java.spi.connection.SingleProtocolStackConfigurer;
import org.apache.plc4x.java.spi.values.IEC61131ValueHandler;
-import org.osgi.service.component.annotations.Component;
import java.util.function.Consumer;
import java.util.function.ToIntFunction;
-@Component(service = PlcDriver.class, immediate = true)
public class BacNetIpDriver extends GeneratedDriverBase<BVLC> {
public static final int BACNET_IP_PORT = 47808;
diff --git a/sandbox/test-java-df1-driver/pom.xml b/sandbox/test-java-df1-driver/pom.xml
index f632529..af3fad7 100644
--- a/sandbox/test-java-df1-driver/pom.xml
+++ b/sandbox/test-java-df1-driver/pom.xml
@@ -81,12 +81,12 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<!-- <!– https://mvnrepository.com/artifact/org.rxtx/rxtx –>
<dependency>
@@ -98,7 +98,6 @@
<dependency>
<groupId>com.github.purejavacomm</groupId>
<artifactId>purejavacomm</artifactId>
- <version>1.0.2.RELEASE</version>
</dependency>
<!-- Logging -->
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
index bd3367e..41be49a 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
@@ -30,9 +30,7 @@ import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
import org.apache.plc4x.java.spi.connection.SingleProtocolStackConfigurer;
import org.apache.plc4x.java.spi.values.IEC61131ValueHandler;
-import org.osgi.service.component.annotations.Component;
-@Component(service = PlcDriver.class, immediate = true)
public class DF1PlcDriver extends GeneratedDriverBase<DF1Command> {
@Override
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index e41a9da..a943206 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -397,7 +397,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-boost</artifactId>
- <version>${project.version}</version>
+ <version>0.8.0-SNAPSHOT</version>
<type>zip</type>
<classifier>lib-${os.classifier}</classifier>
<scope>provided</scope>