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/incubator-plc4x.git
commit 6fb54d753960e5f291ef567ca6c8d43311b26ffd
Author: Christofer Dutz <christofer.d...@c-ware.de>
AuthorDate: Thu Jan 17 23:25:58 2019 +0100
- Cleaned up the dependency versions
---
examples/hello-cloud-azure/pom.xml | 2 -
examples/hello-cloud-google/pom.xml | 1 -
examples/hello-storage-elasticsearch/pom.xml | 6 +-
integrations/apache-kafka/pom.xml | 2 -
plc4j/api/pom.xml | 1 -
plc4j/drivers/ads/pom.xml | 1 -
plc4j/drivers/modbus/pom.xml | 1 -
plc4j/drivers/simulated/pom.xml | 2 -
plc4j/protocols/ads/pom.xml | 2 -
plc4j/protocols/benchmarks/pom.xml | 2 -
plc4j/protocols/delta-v/pom.xml | 6 -
plc4j/protocols/driver-bases/base/pom.xml | 2 -
plc4j/protocols/driver-bases/serial/pom.xml | 1 -
plc4j/protocols/s7/pom.xml | 1 -
plc4j/utils/opm/pom.xml | 1 -
plc4j/utils/raw-sockets/pom.xml | 1 +
plc4j/utils/scraper/pom.xml | 9 +-
plc4j/utils/wireshark-utils/pom.xml | 7 -
pom.xml | 310 ++++++++++++++++++---
{plc4j/drivers/simulated => protocols}/pom.xml | 40 +--
.../apache/plc4x/protocols}/cotp-protocol.dfdl.xsd | 0
.../apache/plc4x/protocols}/s7-protocol.dfdl.xsd | 0
.../apache/plc4x/protocols}/tpkt-protocol.dfdl.xsd | 0
23 files changed, 287 insertions(+), 111 deletions(-)
diff --git a/examples/hello-cloud-azure/pom.xml
b/examples/hello-cloud-azure/pom.xml
index 868a5f3..30181ef 100644
--- a/examples/hello-cloud-azure/pom.xml
+++ b/examples/hello-cloud-azure/pom.xml
@@ -66,12 +66,10 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.7</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId>
- <version>1.60</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/hello-cloud-google/pom.xml
b/examples/hello-cloud-google/pom.xml
index 9106c7a..a64c3f0 100644
--- a/examples/hello-cloud-google/pom.xml
+++ b/examples/hello-cloud-google/pom.xml
@@ -48,7 +48,6 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.3</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
diff --git a/examples/hello-storage-elasticsearch/pom.xml
b/examples/hello-storage-elasticsearch/pom.xml
index df1eb16..2ecc99a 100644
--- a/examples/hello-storage-elasticsearch/pom.xml
+++ b/examples/hello-storage-elasticsearch/pom.xml
@@ -67,12 +67,14 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
- <version>6.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch-x-content</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>transport-netty4-client</artifactId>
- <version>6.2.4</version>
</dependency>
<!-- Required driver implementation -->
diff --git a/integrations/apache-kafka/pom.xml
b/integrations/apache-kafka/pom.xml
index 1b8df0f..b9b3eea 100644
--- a/integrations/apache-kafka/pom.xml
+++ b/integrations/apache-kafka/pom.xml
@@ -49,12 +49,10 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
</dependency>
<!-- TODO: Maybe this can be removed (and the exclusion in the dependency
plugin) -->
<dependency>
diff --git a/plc4j/api/pom.xml b/plc4j/api/pom.xml
index 02425de..c796864 100644
--- a/plc4j/api/pom.xml
+++ b/plc4j/api/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>3.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/drivers/ads/pom.xml b/plc4j/drivers/ads/pom.xml
index cc4a1b8..e0cc271 100644
--- a/plc4j/drivers/ads/pom.xml
+++ b/plc4j/drivers/ads/pom.xml
@@ -94,7 +94,6 @@
<dependency>
<groupId>se.koc</groupId>
<artifactId>netty-transport-jserialcomm</artifactId>
- <version>1.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/drivers/modbus/pom.xml b/plc4j/drivers/modbus/pom.xml
index 689a13f..a2d1aa1 100644
--- a/plc4j/drivers/modbus/pom.xml
+++ b/plc4j/drivers/modbus/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>se.koc</groupId>
<artifactId>netty-transport-jserialcomm</artifactId>
- <version>1.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/drivers/simulated/pom.xml b/plc4j/drivers/simulated/pom.xml
index 25f004d..f874c7a 100644
--- a/plc4j/drivers/simulated/pom.xml
+++ b/plc4j/drivers/simulated/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -55,7 +54,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>3.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index 41ec059..ce48e3c 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>com.github.snksoft</groupId>
<artifactId>crc</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
@@ -105,7 +104,6 @@
<dependency>
<groupId>com.athaydes</groupId>
<artifactId>spock-reports</artifactId>
- <version>1.6.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/benchmarks/pom.xml
b/plc4j/protocols/benchmarks/pom.xml
index bfd86c9..77dd466 100644
--- a/plc4j/protocols/benchmarks/pom.xml
+++ b/plc4j/protocols/benchmarks/pom.xml
@@ -54,13 +54,11 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>${jmh.version}</version>
</dependency>
<!-- GNU General Public License (GPL), version 2, with the Classpath
exception see
https://commons.apache.org/proper/commons-lang/dependencies.html-->
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>${jmh.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index c24698c..ecf19de 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -36,25 +36,21 @@
<dependency>
<groupId>org.pcap4j</groupId>
<artifactId>pcap4j-core</artifactId>
- <version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.pcap4j</groupId>
<artifactId>pcap4j-packetfactory-static</artifactId>
- <version>1.7.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.23.Final</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.11</version>
</dependency>
<!-- InfluxDB dependencies -->
@@ -68,13 +64,11 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
- <version>6.4.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>transport-netty4-client</artifactId>
- <version>6.4.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/plc4j/protocols/driver-bases/base/pom.xml
b/plc4j/protocols/driver-bases/base/pom.xml
index fff29fb..1f645b5 100644
--- a/plc4j/protocols/driver-bases/base/pom.xml
+++ b/plc4j/protocols/driver-bases/base/pom.xml
@@ -80,13 +80,11 @@
<dependency>
<groupId>com.athaydes</groupId>
<artifactId>spock-reports</artifactId>
- <version>1.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>3.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/driver-bases/serial/pom.xml
b/plc4j/protocols/driver-bases/serial/pom.xml
index 1013af5..ec3eaeb 100644
--- a/plc4j/protocols/driver-bases/serial/pom.xml
+++ b/plc4j/protocols/driver-bases/serial/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>se.koc</groupId>
<artifactId>netty-transport-jserialcomm</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index 67698d3..2ae856b 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>com.athaydes</groupId>
<artifactId>spock-reports</artifactId>
- <version>1.6.1</version>
<scope>test</scope>
</dependency>
diff --git a/plc4j/utils/opm/pom.xml b/plc4j/utils/opm/pom.xml
index 1ab94d5..d03705f 100644
--- a/plc4j/utils/opm/pom.xml
+++ b/plc4j/utils/opm/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.8.15</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/plc4j/utils/raw-sockets/pom.xml b/plc4j/utils/raw-sockets/pom.xml
index 9754ce3..6c0b648 100644
--- a/plc4j/utils/raw-sockets/pom.xml
+++ b/plc4j/utils/raw-sockets/pom.xml
@@ -42,6 +42,7 @@
<groupId>org.pcap4j</groupId>
<artifactId>pcap4j-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.pcap4j</groupId>
<artifactId>pcap4j-packetfactory-static</artifactId>
diff --git a/plc4j/utils/scraper/pom.xml b/plc4j/utils/scraper/pom.xml
index c32e550..16da41e 100644
--- a/plc4j/utils/scraper/pom.xml
+++ b/plc4j/utils/scraper/pom.xml
@@ -19,12 +19,14 @@
-->
<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>
<artifactId>plc4j-utils</artifactId>
<groupId>org.apache.plc4x</groupId>
<version>0.4.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>plc4j-scraper</artifactId>
@@ -36,27 +38,22 @@
<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-annotations</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
- <version>3.5</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/utils/wireshark-utils/pom.xml
b/plc4j/utils/wireshark-utils/pom.xml
index 1d8ffac..1cefa35 100644
--- a/plc4j/utils/wireshark-utils/pom.xml
+++ b/plc4j/utils/wireshark-utils/pom.xml
@@ -51,13 +51,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index d4a43bf..37afa5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,9 @@
</properties>
<modules>
+ <!-- Definition of the protocol message formats -->
+ <module>protocols</module>
+
<!-- Core PLC4X modules -->
<module>plc4c</module>
<!--module>plc4cpp</module-->
@@ -151,6 +154,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.athaydes</groupId>
+ <artifactId>spock-reports</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
@@ -181,6 +189,11 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -191,14 +204,9 @@
<version>27.0.1-jre</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
+ <groupId>com.tdunning</groupId>
+ <artifactId>t-digest</artifactId>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -206,9 +214,14 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>3.1.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -251,29 +264,217 @@
<version>${netty.version}</version>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.8.21</version>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>1.8.21</version>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>4.5.1</version>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.jupiter.version}</version>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>5.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.daffodil</groupId>
+ <artifactId>daffodil-tdml_2.12</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-grouping</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-join</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial3d</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial-extras</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>1.60</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.60</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.60</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.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>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>6.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch-x-content</artifactId>
+ <version>6.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>transport-netty4-client</artifactId>
+ <version>6.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.snksoft</groupId>
+ <artifactId>crc</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -286,6 +487,26 @@
<version>${hamcrest.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.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
@@ -296,25 +517,19 @@
<version>${mockito.version}</version>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-core</artifactId>
+ <version>${jmh.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.7</version>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-generator-annprocess</artifactId>
+ <version>${jmh.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.2</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0.4</version>
</dependency>
<dependency>
<groupId>org.pcap4j</groupId>
@@ -326,13 +541,10 @@
<artifactId>pcap4j-packetfactory-static</artifactId>
<version>${pcap4j.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>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
@@ -340,6 +552,16 @@
<version>${spock.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.23</version>
+ </dependency>
+ <dependency>
+ <groupId>se.koc</groupId>
+ <artifactId>netty-transport-jserialcomm</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/plc4j/drivers/simulated/pom.xml b/protocols/pom.xml
similarity index 56%
copy from plc4j/drivers/simulated/pom.xml
copy to protocols/pom.xml
index 25f004d..af8745f 100644
--- a/plc4j/drivers/simulated/pom.xml
+++ b/protocols/pom.xml
@@ -23,41 +23,27 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-drivers</artifactId>
+ <artifactId>plc4x-parent</artifactId>
<version>0.4.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-driver-simulated</artifactId>
- <name>PLC4J: Driver: Simulated</name>
- <description>Implementation of a PLC4X driver able to speak a simulated
device.</description>
+ <artifactId>protocols</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
+ <name>Protocols</name>
+ <description>General Protocol Descriptions.</description>
+ <build>
+ <!-- This project should only contain the DFDL definitions for our
protocols -->
+ <sourceDirectory>src/main/dfdl</sourceDirectory>
+ </build>
+
+ <dependencies>
<dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>3.0.2</version>
+ <groupId>org.apache.daffodil</groupId>
+ <artifactId>daffodil-tdml_2.12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
\ No newline at end of file
diff --git a/src/main/dfdl/cotp-protocol.dfdl.xsd
b/protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
similarity index 100%
rename from src/main/dfdl/cotp-protocol.dfdl.xsd
rename to
protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
diff --git a/src/main/dfdl/s7-protocol.dfdl.xsd
b/protocols/src/main/dfdl/org/apache/plc4x/protocols/s7-protocol.dfdl.xsd
similarity index 100%
rename from src/main/dfdl/s7-protocol.dfdl.xsd
rename to
protocols/src/main/dfdl/org/apache/plc4x/protocols/s7-protocol.dfdl.xsd
diff --git a/src/main/dfdl/tpkt-protocol.dfdl.xsd
b/protocols/src/main/dfdl/org/apache/plc4x/protocols/tpkt-protocol.dfdl.xsd
similarity index 100%
rename from src/main/dfdl/tpkt-protocol.dfdl.xsd
rename to
protocols/src/main/dfdl/org/apache/plc4x/protocols/tpkt-protocol.dfdl.xsd
