This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch rel/0.7 in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/rel/0.7 by this push: new 84f66b3 - Reset the version back to 0.7.0-SNAPSHOT - Cherry picked some changes from develop 84f66b3 is described below commit 84f66b3b12d1659525e0186f9f5805ef2b66ec88 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Tue May 19 18:15:08 2020 +0200 - Reset the version back to 0.7.0-SNAPSHOT - Cherry picked some changes from develop --- build-utils/language-base-freemarker/pom.xml | 2 +- build-utils/language-c/pom.xml | 4 +- build-utils/language-java/pom.xml | 4 +- build-utils/pom.xml | 2 +- build-utils/protocol-base-mspec/pom.xml | 2 +- build-utils/protocol-test/pom.xml | 6 +-- plc4j/api/pom.xml | 2 +- plc4j/drivers/ab-eth/pom.xml | 14 +++---- plc4j/drivers/eip/pom.xml | 14 +++---- plc4j/drivers/firmata/pom.xml | 14 +++---- plc4j/drivers/knxnetip/pom.xml | 20 ++++----- plc4j/drivers/mock/pom.xml | 6 +-- plc4j/drivers/modbus/pom.xml | 18 ++++---- plc4j/drivers/opcua/pom.xml | 6 +-- plc4j/drivers/pom.xml | 2 +- plc4j/drivers/s7/pom.xml | 14 +++---- plc4j/drivers/simulated/pom.xml | 6 +-- plc4j/examples/hello-cloud-azure/pom.xml | 4 +- plc4j/examples/hello-cloud-google/pom.xml | 4 +- plc4j/examples/hello-connectivity-kafka/pom.xml | 6 +-- plc4j/examples/hello-connectivity-mqtt/pom.xml | 4 +- plc4j/examples/hello-integration-edgent/pom.xml | 4 +- plc4j/examples/hello-integration-iotdb/pom.xml | 4 +- plc4j/examples/hello-opm/pom.xml | 6 +-- plc4j/examples/hello-storage-elasticsearch/pom.xml | 6 +-- plc4j/examples/hello-world-plc4x/pom.xml | 4 +- plc4j/examples/pom.xml | 21 +++++----- plc4j/integrations/apache-calcite/pom.xml | 8 ++-- plc4j/integrations/apache-camel/pom.xml | 10 ++--- .../java/org/apache/plc4x/camel/Plc4XProducer.java | 2 - plc4j/integrations/apache-edgent/pom.xml | 4 +- plc4j/integrations/apache-kafka/pom.xml | 20 ++++----- .../apache-nifi/nifi-plc4x-nar/pom.xml | 28 ++++++------- .../apache-nifi/nifi-plc4x-processors/pom.xml | 4 +- plc4j/integrations/apache-nifi/pom.xml | 2 +- plc4j/integrations/logstash-plugin/pom.xml | 22 +++++----- plc4j/integrations/pom.xml | 2 +- plc4j/osgi/pom.xml | 6 +-- plc4j/pom.xml | 2 +- plc4j/protocols/ads/pom.xml | 1 - plc4j/spi/pom.xml | 4 +- plc4j/tools/capture-replay/pom.xml | 2 +- plc4j/tools/connection-pool/pom.xml | 4 +- plc4j/tools/interop/pom.xml | 12 +++--- plc4j/tools/opm/pom.xml | 8 ++-- plc4j/tools/pom.xml | 2 +- plc4j/tools/scraper/pom.xml | 13 +++--- .../triggeredscraper/TriggeredScraperImplTest.java | 2 - plc4j/transports/pcap-replay/pom.xml | 12 +++--- plc4j/transports/pcap-shared/pom.xml | 6 +-- plc4j/transports/pom.xml | 2 +- plc4j/transports/raw-socket/pom.xml | 10 ++--- plc4j/transports/serial/pom.xml | 6 +-- plc4j/transports/tcp/pom.xml | 6 +-- plc4j/transports/test/pom.xml | 4 +- plc4j/transports/udp/pom.xml | 6 +-- plc4j/utils/pcap-replay/pom.xml | 4 +- plc4j/utils/pcap-shared/pom.xml | 2 +- plc4j/utils/pom.xml | 2 +- plc4j/utils/raw-sockets/pom.xml | 6 +-- plc4j/utils/test-utils/pom.xml | 8 ++-- pom.xml | 49 +++++++++++++++++----- protocols/ab-eth/pom.xml | 4 +- protocols/amsads/pom.xml | 4 +- protocols/bacnetip/pom.xml | 4 +- protocols/df1/pom.xml | 4 +- protocols/eip/pom.xml | 4 +- protocols/firmata/pom.xml | 4 +- protocols/knxnetip/pom.xml | 4 +- protocols/modbus/pom.xml | 4 +- protocols/pom.xml | 2 +- protocols/proxy/pom.xml | 2 +- protocols/s7/pom.xml | 4 +- sandbox/code-gen/pom.xml | 2 +- .../hello-influx-data-collection/README.adoc | 0 .../example.properties | 0 .../hello-influx-data-collection/pom.xml | 28 ++++++++----- .../java/examples/helloinflux/HelloInflux.java | 0 .../src/main/resources/logback.xml | 0 sandbox/plc-simulator/pom.xml | 8 ++-- sandbox/plc4c/pom.xml | 8 ++-- sandbox/plc4cpp/pom.xml | 4 +- sandbox/plc4net/api/pom.xml | 2 +- sandbox/plc4net/plc4net.driver/pom.xml | 2 +- sandbox/plc4net/pom.xml | 2 +- sandbox/plc4py/pom.xml | 8 ++-- sandbox/pom.xml | 5 ++- sandbox/test-java-amsads-driver/pom.xml | 16 +++---- sandbox/test-java-bacnetip-driver/pom.xml | 16 +++---- sandbox/test-java-df1-driver/pom.xml | 14 +++---- sandbox/test-streampipes-plc4x-adapters/pom.xml | 18 ++++---- sandbox/test-streampipes-plc4x-processors/pom.xml | 8 ++-- sandbox/test-streampipes-plc4x-shared/pom.xml | 2 +- src/site/asciidoc/developers/release/release.adoc | 2 +- tools/boost/pom.xml | 2 +- tools/logstash/pom.xml | 2 +- tools/pom.xml | 2 +- tools/thrift/pom.xml | 2 +- 98 files changed, 352 insertions(+), 321 deletions(-) diff --git a/build-utils/language-base-freemarker/pom.xml b/build-utils/language-base-freemarker/pom.xml index e02d209..ce87043 100644 --- a/build-utils/language-base-freemarker/pom.xml +++ b/build-utils/language-base-freemarker/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils-language-base-freemarker</artifactId> diff --git a/build-utils/language-c/pom.xml b/build-utils/language-c/pom.xml index be9c20e..27b5c5e 100644 --- a/build-utils/language-c/pom.xml +++ b/build-utils/language-c/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils-language-c</artifactId> @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-base-freemarker</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/build-utils/language-java/pom.xml b/build-utils/language-java/pom.xml index f445ac4..2d4225f 100644 --- a/build-utils/language-java/pom.xml +++ b/build-utils/language-java/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils-language-java</artifactId> @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-base-freemarker</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/build-utils/pom.xml b/build-utils/pom.xml index a843ebc..99282dd 100644 --- a/build-utils/pom.xml +++ b/build-utils/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils</artifactId> diff --git a/build-utils/protocol-base-mspec/pom.xml b/build-utils/protocol-base-mspec/pom.xml index a70efd6..c6533ac 100644 --- a/build-utils/protocol-base-mspec/pom.xml +++ b/build-utils/protocol-base-mspec/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> diff --git a/build-utils/protocol-test/pom.xml b/build-utils/protocol-test/pom.xml index 489d50b..cb45b5a 100644 --- a/build-utils/protocol-test/pom.xml +++ b/build-utils/protocol-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-build-utils-protocol-test</artifactId> @@ -71,13 +71,13 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/api/pom.xml b/plc4j/api/pom.xml index 2e914f9..371d847 100644 --- a/plc4j/api/pom.xml +++ b/plc4j/api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-api</artifactId> diff --git a/plc4j/drivers/ab-eth/pom.xml b/plc4j/drivers/ab-eth/pom.xml index 38eb251..e7cdc90 100644 --- a/plc4j/drivers/ab-eth/pom.xml +++ b/plc4j/drivers/ab-eth/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-ab-eth</artifactId> @@ -110,18 +110,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -144,14 +144,14 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -159,7 +159,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-ab-eth</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/eip/pom.xml b/plc4j/drivers/eip/pom.xml index 5100f9f..8f53650 100644 --- a/plc4j/drivers/eip/pom.xml +++ b/plc4j/drivers/eip/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-eip</artifactId> @@ -112,18 +112,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -144,14 +144,14 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -159,7 +159,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-eip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/firmata/pom.xml b/plc4j/drivers/firmata/pom.xml index 9c03d01..3b9368a 100644 --- a/plc4j/drivers/firmata/pom.xml +++ b/plc4j/drivers/firmata/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-firmata</artifactId> @@ -110,18 +110,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -147,21 +147,21 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-firmata</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/knxnetip/pom.xml b/plc4j/drivers/knxnetip/pom.xml index 97556db..d9557d4 100644 --- a/plc4j/drivers/knxnetip/pom.xml +++ b/plc4j/drivers/knxnetip/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-knxnetip</artifactId> @@ -109,28 +109,28 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-udp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -166,13 +166,13 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -195,7 +195,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -203,7 +203,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/mock/pom.xml b/plc4j/drivers/mock/pom.xml index 378cf5c..5659773 100644 --- a/plc4j/drivers/mock/pom.xml +++ b/plc4j/drivers/mock/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-mock</artifactId> @@ -35,12 +35,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/drivers/modbus/pom.xml b/plc4j/drivers/modbus/pom.xml index 8170df4..8718fd1 100644 --- a/plc4j/drivers/modbus/pom.xml +++ b/plc4j/drivers/modbus/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-modbus</artifactId> @@ -112,28 +112,28 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -152,7 +152,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -165,7 +165,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -173,7 +173,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/opcua/pom.xml b/plc4j/drivers/opcua/pom.xml index 7ec9721..8431f6d 100644 --- a/plc4j/drivers/opcua/pom.xml +++ b/plc4j/drivers/opcua/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-opcua</artifactId> @@ -83,12 +83,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml index 5522931..fc383ec 100644 --- a/plc4j/drivers/pom.xml +++ b/plc4j/drivers/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-drivers</artifactId> diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml index c7aac57..151d965 100644 --- a/plc4j/drivers/s7/pom.xml +++ b/plc4j/drivers/s7/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-s7</artifactId> @@ -110,18 +110,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -145,7 +145,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -158,7 +158,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -166,7 +166,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/plc4j/drivers/simulated/pom.xml b/plc4j/drivers/simulated/pom.xml index f91020d..d9e2f2e 100644 --- a/plc4j/drivers/simulated/pom.xml +++ b/plc4j/drivers/simulated/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-drivers</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-driver-simulated</artifactId> @@ -83,7 +83,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/plc4j/examples/hello-cloud-azure/pom.xml b/plc4j/examples/hello-cloud-azure/pom.xml index 55ad163..dacea92 100644 --- a/plc4j/examples/hello-cloud-azure/pom.xml +++ b/plc4j/examples/hello-cloud-azure/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-cloud-azure</artifactId> @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-cloud-google/pom.xml b/plc4j/examples/hello-cloud-google/pom.xml index 2368039..e6cb6d0 100644 --- a/plc4j/examples/hello-cloud-google/pom.xml +++ b/plc4j/examples/hello-cloud-google/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-cloud-google</artifactId> @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml index dd9ed16..765b562 100644 --- a/plc4j/examples/hello-connectivity-kafka/pom.xml +++ b/plc4j/examples/hello-connectivity-kafka/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-connectivity-kafka</artifactId> @@ -39,12 +39,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-edgent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml b/plc4j/examples/hello-connectivity-mqtt/pom.xml index 328e6e9..327c4bd 100644 --- a/plc4j/examples/hello-connectivity-mqtt/pom.xml +++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-connectivity-mqtt</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-integration-edgent/pom.xml b/plc4j/examples/hello-integration-edgent/pom.xml index 9ec7fab..5ed08aa 100644 --- a/plc4j/examples/hello-integration-edgent/pom.xml +++ b/plc4j/examples/hello-integration-edgent/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-integration-edgent</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-edgent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml b/plc4j/examples/hello-integration-iotdb/pom.xml index 319a739..de099ed 100644 --- a/plc4j/examples/hello-integration-iotdb/pom.xml +++ b/plc4j/examples/hello-integration-iotdb/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-integration-iotdb</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-edgent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-opm/pom.xml b/plc4j/examples/hello-opm/pom.xml index 8f7c811..cff357c 100644 --- a/plc4j/examples/hello-opm/pom.xml +++ b/plc4j/examples/hello-opm/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-opm</artifactId> @@ -39,12 +39,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-opm</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-connection-pool</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml b/plc4j/examples/hello-storage-elasticsearch/pom.xml index 6ea9f44..0d2372b 100644 --- a/plc4j/examples/hello-storage-elasticsearch/pom.xml +++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-storage-elasticsearch</artifactId> @@ -39,12 +39,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-edgent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/hello-world-plc4x/pom.xml b/plc4j/examples/hello-world-plc4x/pom.xml index 395e057..84376d5 100644 --- a/plc4j/examples/hello-world-plc4x/pom.xml +++ b/plc4j/examples/hello-world-plc4x/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.examples</groupId> <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-world-plc4x</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml index 026cad3..af8d4b7 100644 --- a/plc4j/examples/pom.xml +++ b/plc4j/examples/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <groupId>org.apache.plc4x.examples</groupId> @@ -44,11 +44,10 @@ <module>hello-cloud-google</module> <module>hello-connectivity-kafka</module> <module>hello-connectivity-mqtt</module> - <module>hello-influx-data-collection</module> <module>hello-integration-edgent</module> <module>hello-opm</module> <module>hello-storage-elasticsearch</module> - <!--module>hello-webapp</module--> + <module>hello-webapp</module> <module>hello-world-plc4x</module> <module>hello-integration-iotdb</module> </modules> @@ -141,13 +140,13 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-ab-eth</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-eip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <!--dependency> @@ -165,37 +164,37 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-firmata</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-opcua</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml index 6cf8721..f7634bb 100644 --- a/plc4j/integrations/apache-calcite/pom.xml +++ b/plc4j/integrations/apache-calcite/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -52,19 +52,19 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-scraper</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!--<scope>test</scope>--> </dependency> </dependencies> diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml index 0dddab9..53c2b05 100644 --- a/plc4j/integrations/apache-camel/pom.xml +++ b/plc4j/integrations/apache-camel/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-apache-camel</artifactId> @@ -131,18 +131,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-connection-pool</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-scraper</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <!--dependency> diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java index 2325d3a..b97277e 100644 --- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java +++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java @@ -22,7 +22,6 @@ import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.support.DefaultAsyncProducer; -import org.apache.commons.math3.util.Pair; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.exceptions.PlcException; import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException; @@ -31,7 +30,6 @@ import org.apache.plc4x.java.api.messages.PlcWriteResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Iterator; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; diff --git a/plc4j/integrations/apache-edgent/pom.xml b/plc4j/integrations/apache-edgent/pom.xml index af9fc9c..6c1b72b 100644 --- a/plc4j/integrations/apache-edgent/pom.xml +++ b/plc4j/integrations/apache-edgent/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-apache-edgent</artifactId> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/integrations/apache-kafka/pom.xml b/plc4j/integrations/apache-kafka/pom.xml index 66ca3b1..47f8d14 100644 --- a/plc4j/integrations/apache-kafka/pom.xml +++ b/plc4j/integrations/apache-kafka/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-apache-kafka</artifactId> @@ -74,17 +74,17 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-scraper</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-connection-pool</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -109,7 +109,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-ab-eth</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <!--dependency> @@ -127,31 +127,31 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-opcua</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml index 2f78272..101561a 100644 --- a/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml +++ b/plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-nifi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-nifi-plc4x-nar</artifactId> @@ -73,19 +73,19 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-nifi-plc4x-processors</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!-- PLC4X --> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!-- Bundle Drivers --> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-ab-eth</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!--dependency> <groupId>org.apache.plc4x</groupId> @@ -100,53 +100,53 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-opcua</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-udp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml index c8a644e..0c614d3 100644 --- a/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml +++ b/plc4j/integrations/apache-nifi/nifi-plc4x-processors/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-apache-nifi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-nifi-plc4x-processors</artifactId> @@ -30,7 +30,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/plc4j/integrations/apache-nifi/pom.xml b/plc4j/integrations/apache-nifi/pom.xml index e844127..e2188e7 100644 --- a/plc4j/integrations/apache-nifi/pom.xml +++ b/plc4j/integrations/apache-nifi/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-apache-nifi</artifactId> diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml index 48a6a38..716da82 100644 --- a/plc4j/integrations/logstash-plugin/pom.xml +++ b/plc4j/integrations/logstash-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-integrations</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-logstash-plugin</artifactId> @@ -211,22 +211,22 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-connection-pool</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-scraper</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools-logstash-core</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <classifier>${logstash.version}</classifier> </dependency> @@ -234,7 +234,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-ab-eth</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <!--dependency> @@ -252,31 +252,31 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-opcua</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml index 0073bfc..ed1cd77 100644 --- a/plc4j/integrations/pom.xml +++ b/plc4j/integrations/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-integrations</artifactId> diff --git a/plc4j/osgi/pom.xml b/plc4j/osgi/pom.xml index 2ae27dc..a46e1db 100644 --- a/plc4j/osgi/pom.xml +++ b/plc4j/osgi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -38,13 +38,13 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/plc4j/pom.xml b/plc4j/pom.xml index 22c3591..2d32cbf 100644 --- a/plc4j/pom.xml +++ b/plc4j/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j</artifactId> diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml index f2e72af..03135e5 100644 --- a/plc4j/protocols/ads/pom.xml +++ b/plc4j/protocols/ads/pom.xml @@ -44,7 +44,6 @@ <version>0.7.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> diff --git a/plc4j/spi/pom.xml b/plc4j/spi/pom.xml index 70e9a84..a7da760 100644 --- a/plc4j/spi/pom.xml +++ b/plc4j/spi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-spi</artifactId> @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --git a/plc4j/tools/capture-replay/pom.xml b/plc4j/tools/capture-replay/pom.xml index f9a443a..64f91e3 100644 --- a/plc4j/tools/capture-replay/pom.xml +++ b/plc4j/tools/capture-replay/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-capture-replay</artifactId> diff --git a/plc4j/tools/connection-pool/pom.xml b/plc4j/tools/connection-pool/pom.xml index 79a8e11..b7de541 100644 --- a/plc4j/tools/connection-pool/pom.xml +++ b/plc4j/tools/connection-pool/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-connection-pool</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/tools/interop/pom.xml b/plc4j/tools/interop/pom.xml index b2ab2d3..55585bf 100644 --- a/plc4j/tools/interop/pom.xml +++ b/plc4j/tools/interop/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>interop-server</artifactId> @@ -149,12 +149,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.annotation</groupId> @@ -180,7 +180,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-mock</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!-- Make sure this is built before this module --> @@ -203,12 +203,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-proxy</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools-thrift</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <type>zip</type> <classifier>compiler-${os.classifier}</classifier> </dependency> diff --git a/plc4j/tools/opm/pom.xml b/plc4j/tools/opm/pom.xml index 66ff07b..87d6767 100644 --- a/plc4j/tools/opm/pom.xml +++ b/plc4j/tools/opm/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-opm</artifactId> @@ -37,12 +37,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!-- Utils --> @@ -68,7 +68,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-mock</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> diff --git a/plc4j/tools/pom.xml b/plc4j/tools/pom.xml index c591e41..d3eb5a2 100644 --- a/plc4j/tools/pom.xml +++ b/plc4j/tools/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-tools</artifactId> diff --git a/plc4j/tools/scraper/pom.xml b/plc4j/tools/scraper/pom.xml index 8e15669..b69bed3 100644 --- a/plc4j/tools/scraper/pom.xml +++ b/plc4j/tools/scraper/pom.xml @@ -25,14 +25,13 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-scraper</artifactId> <name>PLC4J: Tools: Scraper</name> - <description>Utility to efficiently collect a large number of items on multiple devices by different triggers. - </description> + <description>Utility to efficiently collect a large number of items on multiple devices by different triggers.</description> <dependencies> <!--Jackson--> @@ -75,18 +74,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-connection-pool</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -99,7 +98,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-mock</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> diff --git a/plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java b/plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java index 801dc42..691fd7f 100644 --- a/plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java +++ b/plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java @@ -32,7 +32,6 @@ import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.T import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl; import org.apache.plc4x.java.spi.messages.utils.ResponseItem; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -76,7 +75,6 @@ public class TriggeredScraperImplTest { * Test is added because we assume some strange behavior. */ @Test - @Disabled public void scrapeMultipleTargets() throws ScraperException, IOException, InterruptedException { // Prepare the Mocking // Scrate Jobs 1 and 2 diff --git a/plc4j/transports/pcap-replay/pom.xml b/plc4j/transports/pcap-replay/pom.xml index 37a4fa9..41341eb 100644 --- a/plc4j/transports/pcap-replay/pom.xml +++ b/plc4j/transports/pcap-replay/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-pcap-replay</artifactId> @@ -35,27 +35,27 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/transports/pcap-shared/pom.xml b/plc4j/transports/pcap-shared/pom.xml index 45b50f1..4f0a628 100644 --- a/plc4j/transports/pcap-shared/pom.xml +++ b/plc4j/transports/pcap-shared/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-pcap-shared</artifactId> @@ -36,12 +36,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/plc4j/transports/pom.xml b/plc4j/transports/pom.xml index eeb62c8..87e9f66 100644 --- a/plc4j/transports/pom.xml +++ b/plc4j/transports/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transports</artifactId> diff --git a/plc4j/transports/raw-socket/pom.xml b/plc4j/transports/raw-socket/pom.xml index e638da1..fa42c4e 100644 --- a/plc4j/transports/raw-socket/pom.xml +++ b/plc4j/transports/raw-socket/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-raw-socket</artifactId> @@ -35,22 +35,22 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-raw-sockets</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/transports/serial/pom.xml b/plc4j/transports/serial/pom.xml index fda9306..960fb38 100644 --- a/plc4j/transports/serial/pom.xml +++ b/plc4j/transports/serial/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-serial</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/plc4j/transports/tcp/pom.xml b/plc4j/transports/tcp/pom.xml index e51e79c..252fc59 100644 --- a/plc4j/transports/tcp/pom.xml +++ b/plc4j/transports/tcp/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-tcp</artifactId> @@ -35,12 +35,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/transports/test/pom.xml b/plc4j/transports/test/pom.xml index 8280b12..10c961d 100644 --- a/plc4j/transports/test/pom.xml +++ b/plc4j/transports/test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-test</artifactId> @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/transports/udp/pom.xml b/plc4j/transports/udp/pom.xml index 700bf1d..027d173 100644 --- a/plc4j/transports/udp/pom.xml +++ b/plc4j/transports/udp/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transports</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-transport-udp</artifactId> @@ -35,12 +35,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/utils/pcap-replay/pom.xml b/plc4j/utils/pcap-replay/pom.xml index 426055c..54390a3 100644 --- a/plc4j/utils/pcap-replay/pom.xml +++ b/plc4j/utils/pcap-replay/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-utils-pcap-replay</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/plc4j/utils/pcap-shared/pom.xml b/plc4j/utils/pcap-shared/pom.xml index 2a5c867..ef66b6a 100644 --- a/plc4j/utils/pcap-shared/pom.xml +++ b/plc4j/utils/pcap-shared/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-utils-pcap-shared</artifactId> diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml index 5054cd9..cf0c59e 100644 --- a/plc4j/utils/pom.xml +++ b/plc4j/utils/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-utils</artifactId> diff --git a/plc4j/utils/raw-sockets/pom.xml b/plc4j/utils/raw-sockets/pom.xml index 347009e..f1ebce8 100644 --- a/plc4j/utils/raw-sockets/pom.xml +++ b/plc4j/utils/raw-sockets/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-utils-raw-sockets</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-pcap-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -76,7 +76,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> diff --git a/plc4j/utils/test-utils/pom.xml b/plc4j/utils/test-utils/pom.xml index 9a96344..0ab2215 100644 --- a/plc4j/utils/test-utils/pom.xml +++ b/plc4j/utils/test-utils/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-utils-test-utils</artifactId> @@ -49,17 +49,17 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-test</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 36ddb31..91160dc 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>PLC4X</name> @@ -1095,22 +1095,12 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.22.2</version> - <configuration> - <argLine> - --illegal-access=permit - </argLine> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.22.2</version> - <configuration> - <argLine> - --illegal-access=permit - </argLine> - </configuration> </plugin> <plugin> @@ -1452,6 +1442,42 @@ </build> </profile> + <!-- + It seems Java 8 has problems with the "illega-access" setting, + so we need to make this self-activating. + --> + <profile> + <id>_allow_illegal_access_reflection_in_tests</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine> + --illegal-access=permit + </argLine> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <argLine> + --illegal-access=permit + </argLine> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + <!-- Build PLC4X including the Sandbox modules --> <profile> <id>with-sandbox</id> @@ -1737,6 +1763,7 @@ <algorithms> <algorithm>SHA-512</algorithm> </algorithms> + <includeRelativePath>true</includeRelativePath> <fileSets> <fileSet> <directory>${project.build.directory}</directory> diff --git a/protocols/ab-eth/pom.xml b/protocols/ab-eth/pom.xml index 5161bd6..22c96d7 100644 --- a/protocols/ab-eth/pom.xml +++ b/protocols/ab-eth/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-ab-eth</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/amsads/pom.xml b/protocols/amsads/pom.xml index 9ac80fe..c7036d2 100644 --- a/protocols/amsads/pom.xml +++ b/protocols/amsads/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-amsads</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/bacnetip/pom.xml b/protocols/bacnetip/pom.xml index bd95c74..4a0699e 100644 --- a/protocols/bacnetip/pom.xml +++ b/protocols/bacnetip/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-bacnetip</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/df1/pom.xml b/protocols/df1/pom.xml index 612d0eb..282fc15 100644 --- a/protocols/df1/pom.xml +++ b/protocols/df1/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-df1</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/eip/pom.xml b/protocols/eip/pom.xml index 9840f12..a1b40b8 100644 --- a/protocols/eip/pom.xml +++ b/protocols/eip/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-eip</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/firmata/pom.xml b/protocols/firmata/pom.xml index 2772e41..2f9e7e6 100644 --- a/protocols/firmata/pom.xml +++ b/protocols/firmata/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-firmata</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/knxnetip/pom.xml b/protocols/knxnetip/pom.xml index a8d8edf..4d2ccb7 100644 --- a/protocols/knxnetip/pom.xml +++ b/protocols/knxnetip/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-knxnetip</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/modbus/pom.xml b/protocols/modbus/pom.xml index e90b85d..d79335f 100644 --- a/protocols/modbus/pom.xml +++ b/protocols/modbus/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-modbus</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/protocols/pom.xml b/protocols/pom.xml index ed23ca6..ae81b26 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols</artifactId> diff --git a/protocols/proxy/pom.xml b/protocols/proxy/pom.xml index 75f2edb..b831e67 100644 --- a/protocols/proxy/pom.xml +++ b/protocols/proxy/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-proxy</artifactId> diff --git a/protocols/s7/pom.xml b/protocols/s7/pom.xml index 4d86718..9671b76 100644 --- a/protocols/s7/pom.xml +++ b/protocols/s7/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-protocols-s7</artifactId> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-protocol-base-mspec</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/sandbox/code-gen/pom.xml b/sandbox/code-gen/pom.xml index 0ad8c04..a99e6ca 100644 --- a/sandbox/code-gen/pom.xml +++ b/sandbox/code-gen/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>plc4x-sandbox</artifactId> <groupId>org.apache.plc4x.sandbox</groupId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>code-gen</artifactId> diff --git a/plc4j/examples/hello-influx-data-collection/README.adoc b/sandbox/hello-influx-data-collection/README.adoc similarity index 100% rename from plc4j/examples/hello-influx-data-collection/README.adoc rename to sandbox/hello-influx-data-collection/README.adoc diff --git a/plc4j/examples/hello-influx-data-collection/example.properties b/sandbox/hello-influx-data-collection/example.properties similarity index 100% rename from plc4j/examples/hello-influx-data-collection/example.properties rename to sandbox/hello-influx-data-collection/example.properties diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml b/sandbox/hello-influx-data-collection/pom.xml similarity index 82% rename from plc4j/examples/hello-influx-data-collection/pom.xml rename to sandbox/hello-influx-data-collection/pom.xml index 2058fb2..5f7479e 100644 --- a/plc4j/examples/hello-influx-data-collection/pom.xml +++ b/sandbox/hello-influx-data-collection/pom.xml @@ -22,13 +22,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.plc4x.examples</groupId> - <artifactId>plc4j-examples</artifactId> - <version>0.7.1-SNAPSHOT</version> + <groupId>org.apache.plc4x.sandbox</groupId> + <artifactId>plc4x-sandbox</artifactId> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4j-hello-influx-data-collection</artifactId> - <name>PLC4J: Examples: Hello InfluxDB Data Collection</name> + <name>Sandbox: PLC4J: Examples: Hello InfluxDB Data Collection</name> <description>Data Collection with PLC4X and InfluxDB.</description> <properties> @@ -39,12 +39,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <!-- InfluxDB dependencies --> @@ -75,24 +75,32 @@ <dependency> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>test-java-bacnetip-driver</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> <build> <plugins> + <!-- This is just examples including these checks here requires an insane amount of housekeeping. --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!--plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> <usedDependencies combine.children="append"> @@ -102,7 +110,7 @@ <usedDependency>org.apache.plc4x:plc4j-transport-raw-socket</usedDependency> </usedDependencies> </configuration> - </plugin> + </plugin--> </plugins> </build> diff --git a/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java b/sandbox/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java similarity index 100% rename from plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java rename to sandbox/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java diff --git a/plc4j/examples/hello-influx-data-collection/src/main/resources/logback.xml b/sandbox/hello-influx-data-collection/src/main/resources/logback.xml similarity index 100% rename from plc4j/examples/hello-influx-data-collection/src/main/resources/logback.xml rename to sandbox/hello-influx-data-collection/src/main/resources/logback.xml diff --git a/sandbox/plc-simulator/pom.xml b/sandbox/plc-simulator/pom.xml index 28e801f..ada40a5 100644 --- a/sandbox/plc-simulator/pom.xml +++ b/sandbox/plc-simulator/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc-simulator</artifactId> @@ -100,7 +100,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -108,14 +108,14 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/sandbox/plc4c/pom.xml b/sandbox/plc4c/pom.xml index 57c6300..9dc62a1 100644 --- a/sandbox/plc4c/pom.xml +++ b/sandbox/plc4c/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4c</artifactId> @@ -307,7 +307,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-c</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -315,14 +315,14 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-modbus</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-s7</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/sandbox/plc4cpp/pom.xml b/sandbox/plc4cpp/pom.xml index 47d8822..25e432a 100644 --- a/sandbox/plc4cpp/pom.xml +++ b/sandbox/plc4cpp/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4cpp</artifactId> @@ -323,7 +323,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools-boost</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <type>pom</type> <scope>provided</scope> </dependency> diff --git a/sandbox/plc4net/api/pom.xml b/sandbox/plc4net/api/pom.xml index b1ca98a..520706a 100644 --- a/sandbox/plc4net/api/pom.xml +++ b/sandbox/plc4net/api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4net</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4net-api</artifactId> diff --git a/sandbox/plc4net/plc4net.driver/pom.xml b/sandbox/plc4net/plc4net.driver/pom.xml index 9d84f4b..fa86033 100644 --- a/sandbox/plc4net/plc4net.driver/pom.xml +++ b/sandbox/plc4net/plc4net.driver/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4net</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4net-driver</artifactId> diff --git a/sandbox/plc4net/pom.xml b/sandbox/plc4net/pom.xml index f91cbf5..69c6c1b 100644 --- a/sandbox/plc4net/pom.xml +++ b/sandbox/plc4net/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4net</artifactId> diff --git a/sandbox/plc4py/pom.xml b/sandbox/plc4py/pom.xml index f800d02..df18b95 100644 --- a/sandbox/plc4py/pom.xml +++ b/sandbox/plc4py/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4py</artifactId> @@ -197,19 +197,19 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-proxy</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools-thrift</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <type>zip</type> <classifier>compiler-${os.classifier}</classifier> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>interop-server</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <classifier>jar-with-dependencies</classifier> </dependency> </dependencies> diff --git a/sandbox/pom.xml b/sandbox/pom.xml index 882b7f6..52f7dc5 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <groupId>org.apache.plc4x.sandbox</groupId> @@ -45,6 +45,9 @@ <module>test-streampipes-plc4x-adapters</module> <module>test-streampipes-plc4x-processors</module> <module>test-streampipes-plc4x-shared</module> + + <!-- Examples --> + <module>hello-influx-data-collection</module> </modules> <dependencies> diff --git a/sandbox/test-java-amsads-driver/pom.xml b/sandbox/test-java-amsads-driver/pom.xml index 2635cab..9700842 100644 --- a/sandbox/test-java-amsads-driver/pom.xml +++ b/sandbox/test-java-amsads-driver/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-java-amsads-driver</artifactId> @@ -57,18 +57,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -92,7 +92,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -128,13 +128,13 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-spi</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-amsads</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -142,7 +142,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/sandbox/test-java-bacnetip-driver/pom.xml b/sandbox/test-java-bacnetip-driver/pom.xml index fbe6017..ec19998 100644 --- a/sandbox/test-java-bacnetip-driver/pom.xml +++ b/sandbox/test-java-bacnetip-driver/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-java-bacnetip-driver</artifactId> @@ -57,24 +57,24 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-udp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <optional>true</optional> </dependency> @@ -97,7 +97,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -109,7 +109,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -117,7 +117,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-bacnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> diff --git a/sandbox/test-java-df1-driver/pom.xml b/sandbox/test-java-df1-driver/pom.xml index b6da7d7..506f0b0 100644 --- a/sandbox/test-java-df1-driver/pom.xml +++ b/sandbox/test-java-df1-driver/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-java-df1-driver</artifactId> @@ -57,18 +57,18 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-api</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <optional>true</optional> </dependency> @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-build-utils-language-java</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> @@ -127,14 +127,14 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-protocols-df1</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <!-- Scope is 'provided' as this way it's not shipped with the driver --> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-utils-test-utils</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/sandbox/test-streampipes-plc4x-adapters/pom.xml b/sandbox/test-streampipes-plc4x-adapters/pom.xml index 2900aee..b540618 100644 --- a/sandbox/test-streampipes-plc4x-adapters/pom.xml +++ b/sandbox/test-streampipes-plc4x-adapters/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-streampipes-plc4x-adapters</artifactId> @@ -56,44 +56,44 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-udp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-raw-socket</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-pcap-replay</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-serial</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>test-streampipes-plc4x-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>test-java-bacnetip-driver</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/test-streampipes-plc4x-processors/pom.xml b/sandbox/test-streampipes-plc4x-processors/pom.xml index f28de18..60a7c88 100644 --- a/sandbox/test-streampipes-plc4x-processors/pom.xml +++ b/sandbox/test-streampipes-plc4x-processors/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>plc4x-sandbox</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-streampipes-plc4x-processors</artifactId> @@ -55,12 +55,12 @@ <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-transport-tcp</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-knxnetip</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> @@ -174,7 +174,7 @@ <dependency> <groupId>org.apache.plc4x.sandbox</groupId> <artifactId>test-streampipes-plc4x-shared</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/sandbox/test-streampipes-plc4x-shared/pom.xml b/sandbox/test-streampipes-plc4x-shared/pom.xml index bf010c3..b9781e3 100644 --- a/sandbox/test-streampipes-plc4x-shared/pom.xml +++ b/sandbox/test-streampipes-plc4x-shared/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>plc4x-sandbox</artifactId> <groupId>org.apache.plc4x.sandbox</groupId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>test-streampipes-plc4x-shared</artifactId> diff --git a/src/site/asciidoc/developers/release/release.adoc b/src/site/asciidoc/developers/release/release.adoc index fd40636..c868054 100644 --- a/src/site/asciidoc/developers/release/release.adoc +++ b/src/site/asciidoc/developers/release/release.adoc @@ -280,7 +280,7 @@ However it will not delete the tag in GIT (locally and remotely). So you have to This is done by executing another goal of the `maven-release-plugin`: - mvn release:perform -DreleaseProfiles=apache-release,with-boost,with-proxies,with-logstash + mvn release:perform This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared. diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml index 936f0e4..fbf1b30 100644 --- a/tools/boost/pom.xml +++ b/tools/boost/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-tools-boost</artifactId> diff --git a/tools/logstash/pom.xml b/tools/logstash/pom.xml index 25cfefc..a10bdf8 100644 --- a/tools/logstash/pom.xml +++ b/tools/logstash/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-tools-logstash-core</artifactId> diff --git a/tools/pom.xml b/tools/pom.xml index db10aff..de3bf0d 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-tools</artifactId> diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml index 4447c99..bc962e9 100644 --- a/tools/thrift/pom.xml +++ b/tools/thrift/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.plc4x</groupId> <artifactId>plc4x-tools</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.0-SNAPSHOT</version> </parent> <artifactId>plc4x-tools-thrift</artifactId>