You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/05/15 12:32:26 UTC
[plc4x] 01/01: Merge branches 'develop' and 'feature/scraper' of
https://github.com/apache/plc4x into feature/scraper
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch feature/scraper
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 60df1d7a62b8d6446a4d438bcb3a34b17d11a89c
Merge: 6c49278 484726b
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Fri May 15 14:31:28 2020 +0200
Merge branches 'develop' and 'feature/scraper' of https://github.com/apache/plc4x into feature/scraper
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 | 17 +++++++------
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 | 9 ++++---
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 ++--
.../examples/hello-influx-data-collection/pom.xml | 12 +++++-----
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 | 18 +++++++-------
plc4j/integrations/apache-calcite/pom.xml | 8 +++----
plc4j/integrations/apache-camel/pom.xml | 9 ++++---
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 | 10 ++++----
plc4j/pom.xml | 2 +-
plc4j/spi/pom.xml | 8 +++----
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 | 10 ++++----
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 | 13 +++++-----
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 +-
sandbox/plc-simulator/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 | 2 +-
sandbox/test-java-amsads-driver/pom.xml | 18 +++++++-------
sandbox/test-java-bacnetip-driver/pom.xml | 16 ++++++-------
sandbox/test-java-df1-driver/pom.xml | 12 +++++-----
sandbox/test-streampipes-plc4x-adapters/pom.xml | 22 ++++++++---------
sandbox/test-streampipes-plc4x-processors/pom.xml | 12 ++++------
sandbox/test-streampipes-plc4x-shared/pom.xml | 2 +-
tools/boost/pom.xml | 2 +-
tools/logstash/pom.xml | 2 +-
tools/pom.xml | 2 +-
tools/thrift/pom.xml | 2 +-
89 files changed, 302 insertions(+), 316 deletions(-)
diff --cc plc4j/tools/scraper/pom.xml
index 61605f8,9759c6e..d3c8aef
--- a/plc4j/tools/scraper/pom.xml
+++ b/plc4j/tools/scraper/pom.xml
@@@ -98,10 -99,9 +98,10 @@@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-mock</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>