You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/05/25 12:47:46 UTC
[plc4x] branch feature/code-gen updated (4b3d2be -> 4205a80)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/code-gen
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 4b3d2be Made the parser set the "parentType" property correctly.
add 9246ef7 [Fixed] DefaultPlcWriteRequest returns for the types Byte[] and byte[] the wrong handle function "encodeDateTime" it become changed to "encodeByteArray"
add 7f94d6c fixed typo in S7PlcConnection
add 3d8a7e6 Add initial OPC UA project. This is a raw version of the project without any tests or refactoring in a first fully functional state.
add 2801e63 Added NOTICE entry for the use of Milo
add 98c62d0 Added Author field
add b8c09b5 [Fixed] Failure while Timeout of write request [Added] requestTimeout field for variable timeouts
add 2b98afa Added test class bodies and renamed consistently
add 21da7e6 [Fixed] JavaDoc formatting [Added] Warning messages at exception points with the consideration of adding later some run-time exceptions
add 3c00fa3 [Added] descriptive class comments to ManualPLC4XOpcua
add da9ac33 [Fixed] wrong regex description space
add f832e53 PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
add 03d2469 PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
add 7e19d81 Updated the status of the languages and drivers on the website.
add 1d6985a Started updating the RELEASE_NOTES for the next release
add 42e3d17 Started updating the RELEASE_NOTES for the next release
add 467bd3f Prepared the RELEASE_NOTES for the next release
add 14f22ab [maven-release-plugin] prepare branch rel/0.4
add 614a35e [maven-release-plugin] prepare for next development iteration
add 9b29e84 Revert "[maven-release-plugin] prepare for next development iteration"
add 7c607de Manually undid some changed the revert missed.
add f9c7707 [maven-release-plugin] prepare branch rel/0.4
add 751c931 [maven-release-plugin] prepare for next development iteration
add 3e425b4 Revert "[maven-release-plugin] prepare for next development iteration"
add 52833f7 Fixed some issues with the build that surfaced during the last release attempt.
add d8ecf5d Changed the way the compilation is supressed as this way the pom is updated during a release.
add e84a660 Fixed some issues with the build that surfaced during the last release attempt.
add cedc9a4 Finished resolving the last issues.
add c9041b4 [maven-release-plugin] prepare for next development iteration
add f0b9631 Changed a place the version was not automatically updated.
add 0cb6b11 Initialized the RELEASE_NOTES with a new header for the next version.
add d21ee49 Removed some references to "incubating"
add 18af1a7 Added the TLP Party Meetup.
add bdb447b Moved the definition of the scxml2 dependency into the sandbox.
add 0a03b50 Merged changes from the release branch.
add 90b6f4f Mad sure the thrift generation is executed after the unpacking.
add 485f7d6 Added Björn to the pmc rdf
add 27f8815 PLC4X-126 - Make the asciidoctor generated site reference the dynamic properties
add 434c590 PLC4X-126 - Make the asciidoctor generated site reference the dynamic properties
add 4bfa6f3 Ensured the path is always correct by switching from relative to absolute path.
add f2d3987 Moved the rollup image outside the website, into the media area.
add e568692 Added some missing instructions for linux.
add e2842f5 Added a note for an additional check we need to do.
add a4dc666 PLC4X-128 - Implement some tooling to automatically validate the users environment before starting to build
add 1bdb261 Resolved problems in the thrift python library build packaging.
add 6039c45 PLC4X-128 - Implement some tooling to automatically validate the users environment before starting to build
add 9f9d74d Fixed a wrong title in the result email template
new 4205a80 Merge branches 'develop' and 'feature/code-gen' of github.com:apache/plc4x into feature/code-gen
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 3 +
README | 2 +-
RELEASE_NOTES | 26 +-
.../PLC4X_rollup_83x237cm-final.pdf | 0
plc4cpp/api/pom.xml | 4 +-
plc4cpp/examples/pom.xml | 2 +-
plc4cpp/integrations/apache-mynewt/pom.xml | 2 +-
plc4cpp/integrations/edgex-foundry/pom.xml | 2 +-
plc4cpp/integrations/pom.xml | 2 +-
plc4cpp/libs/boost/pom.xml | 2 +-
plc4cpp/libs/pom.xml | 2 +-
plc4cpp/pom.xml | 4 +-
plc4cpp/protocols/driver-bases/base/pom.xml | 6 +-
plc4cpp/protocols/driver-bases/pom.xml | 2 +-
plc4cpp/protocols/pom.xml | 2 +-
plc4cpp/utils/logger/pom.xml | 15 +-
plc4cpp/utils/pom.xml | 5 +-
plc4j/api/pom.xml | 4 +-
plc4j/drivers/ads/pom.xml | 16 +-
plc4j/drivers/delta-v/pom.xml | 37 --
plc4j/drivers/ethernet-ip/pom.xml | 10 +-
plc4j/drivers/modbus/pom.xml | 14 +-
.../test-utils => plc4j/drivers/opcua}/pom.xml | 50 ++-
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java} | 57 +--
.../opcua/connection/BaseOpcuaPlcConnection.java} | 62 ++-
.../opcua/connection/OpcuaConnectionFactory.java} | 21 +-
.../opcua/connection/OpcuaTcpPlcConnection.java | 464 +++++++++++++++++++++
.../plc4x/java/opcua/protocol/OpcuaField.java | 118 ++++++
.../java/opcua/protocol/OpcuaPlcFieldHandler.java | 151 +++++++
.../opcua/protocol/OpcuaSubsriptionHandle.java | 81 ++++
.../java/opcua/protocol/model/OpcuaDataTypes.java} | 34 +-
.../opcua/protocol/model/OpcuaIdentifierType.java} | 41 +-
.../services/org.apache.plc4x.java.spi.PlcDriver | 2 +-
.../apache/plc4x/java/opcua/ManualPLC4XOpcua.java | 145 +++++++
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 67 +++
.../org/apache/plc4x/java/opcua/UtilsTest.java | 31 +-
.../connection/OpcuaTcpPlcConnectionTest.java} | 25 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java} | 43 +-
.../opcua/protocol/OpcuaPlcFieldHandlerTest.java} | 25 +-
.../protocol/OpcuaSubscriptionHandleTest.java} | 25 +-
plc4j/drivers/pom.xml | 3 +-
plc4j/drivers/s7/pom.xml | 18 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 2 +-
plc4j/drivers/simulated/pom.xml | 6 +-
plc4j/examples/dummy-driver/pom.xml | 8 +-
plc4j/examples/hello-cloud-azure/pom.xml | 6 +-
plc4j/examples/hello-cloud-google/pom.xml | 6 +-
plc4j/examples/hello-connectivity-kafka/pom.xml | 12 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 8 +-
plc4j/examples/hello-integration-edgent/pom.xml | 8 +-
plc4j/examples/hello-opm/pom.xml | 10 +-
plc4j/examples/hello-storage-elasticsearch/pom.xml | 10 +-
.../elasticsearch/ElasticsearchStorage.java | 5 +-
plc4j/examples/hello-webapp/client/pom.xml | 2 +-
plc4j/examples/hello-webapp/pom.xml | 2 +-
plc4j/examples/hello-webapp/service/pom.xml | 9 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 19 +-
plc4j/examples/hello-world-plc4x/pom.xml | 8 +-
plc4j/examples/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 8 +-
plc4j/integrations/apache-camel/pom.xml | 8 +-
plc4j/integrations/apache-edgent/pom.xml | 10 +-
plc4j/integrations/apache-kafka/pom.xml | 2 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 4 +-
.../apache-karaf/karaf-demo-server/pom.xml | 32 +-
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 4 +-
.../apache-karaf/karaf-modbus-feature/pom.xml | 4 +-
.../apache-karaf/karaf-s7-feature/pom.xml | 4 +-
.../apache-karaf/karaf-simulated-feature/pom.xml | 4 +-
plc4j/integrations/apache-karaf/pom.xml | 2 +-
.../apache-nifi/nifi-plc4x-nar/pom.xml | 16 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 4 +-
plc4j/integrations/apache-nifi/pom.xml | 2 +-
plc4j/integrations/pom.xml | 2 +-
plc4j/pom.xml | 2 +-
plc4j/protocols/ads/pom.xml | 8 +-
plc4j/protocols/benchmarks/pom.xml | 4 +-
plc4j/protocols/delta-v/pom.xml | 2 +-
.../java/org/apache/plc4x/java/deltav/PoCES.java | 5 +-
plc4j/protocols/driver-bases/base/pom.xml | 4 +-
.../java/base/messages/DefaultPlcWriteRequest.java | 4 +-
plc4j/protocols/driver-bases/pom.xml | 2 +-
plc4j/protocols/driver-bases/raw-socket/pom.xml | 6 +-
plc4j/protocols/driver-bases/serial/pom.xml | 6 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 6 +-
plc4j/protocols/driver-bases/test/pom.xml | 6 +-
plc4j/protocols/ethernet-ip/pom.xml | 6 +-
plc4j/protocols/iso-on-tcp/pom.xml | 8 +-
plc4j/protocols/iso-tp/pom.xml | 10 +-
plc4j/protocols/modbus/pom.xml | 8 +-
plc4j/protocols/pom.xml | 2 +-
plc4j/protocols/s7/pom.xml | 10 +-
plc4j/utils/connection-pool/pom.xml | 4 +-
plc4j/utils/interop/pom.xml | 45 +-
plc4j/utils/opm/pom.xml | 10 +-
plc4j/utils/pom.xml | 2 +-
plc4j/utils/raw-sockets/pom.xml | 4 +-
plc4j/utils/scraper/pom.xml | 18 +-
plc4j/utils/test-utils/pom.xml | 2 +-
plc4net/api/pom.xml | 2 +-
plc4net/plc4net.driver/pom.xml | 6 +-
plc4net/pom.xml | 4 +-
plc4py/pom.xml | 36 +-
pom.xml | 141 +++++--
protocols/knxnet-ip/pom.xml | 4 +-
protocols/pom.xml | 2 +-
protocols/proxy/pom.xml | 2 +-
protocols/s7/pom.xml | 4 +-
protocols/test-utils/pom.xml | 2 +-
sandbox/dynamic-driver-base/pom.xml | 6 +-
sandbox/dynamic-driver-s7/pom.xml | 10 +-
sandbox/pom.xml | 19 +-
src/main/script/prerequisite-check.groovy | 60 ---
src/main/script/prerequisiteCheck.groovy | 277 ++++++++++++
src/site/asciidoc/developers/conferences.adoc | 1 +
src/site/asciidoc/developers/release.adoc | 146 ++++---
src/site/asciidoc/developers/website.adoc | 21 +
src/site/asciidoc/index.adoc | 9 +-
.../plc4x-doap.rdf | 30 +-
src/site/resources/plc4x-pmc.rdf | 5 +
tools/common.sh | 4 +-
tools/download_staged_release.sh | 6 +-
tools/pom.xml | 2 +-
tools/thrift/pom.xml | 241 +++++------
tools/thrift/src/assembly/python.xml | 28 +-
125 files changed, 2254 insertions(+), 852 deletions(-)
rename {src/site/resources/images => media}/PLC4X_rollup_83x237cm-final.pdf (100%)
delete mode 100644 plc4j/drivers/delta-v/pom.xml
copy {protocols/test-utils => plc4j/drivers/opcua}/pom.xml (61%)
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java => opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java} (54%)
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java => opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java} (51%)
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java => opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java} (63%)
create mode 100644 plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
create mode 100644 plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
create mode 100644 plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
create mode 100644 plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
copy plc4j/{api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java => drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java} (64%)
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusConnectionFactory.java => opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java} (50%)
copy plc4j/drivers/{ads => opcua}/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver (94%)
create mode 100644 plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
create mode 100644 plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
copy sandbox/dynamic-driver-base/src/main/java/org/apache/plc4x/sandbox/java/dynamic/actions/BaseConnectedAction.java => plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java (56%)
copy plc4j/{utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java => drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java} (69%)
copy plc4j/{protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequestTest.java => drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java} (51%)
copy plc4j/{utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java => drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java} (70%)
copy plc4j/{utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java => drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java} (69%)
delete mode 100644 src/main/script/prerequisite-check.groovy
create mode 100644 src/main/script/prerequisiteCheck.groovy
rename src/site/{resources => resources-filtered}/plc4x-doap.rdf (81%)
[plc4x] 01/01: Merge branches 'develop' and 'feature/code-gen' of
github.com:apache/plc4x into feature/code-gen
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/code-gen
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 4205a801312cfcfc18496d1208a231decf971471
Merge: 4b3d2be 9f9d74d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat May 25 14:47:13 2019 +0200
Merge branches 'develop' and 'feature/code-gen' of github.com:apache/plc4x into feature/code-gen
NOTICE | 3 +
README | 2 +-
RELEASE_NOTES | 26 +-
.../PLC4X_rollup_83x237cm-final.pdf | 0
plc4cpp/api/pom.xml | 4 +-
plc4cpp/examples/pom.xml | 2 +-
plc4cpp/integrations/apache-mynewt/pom.xml | 2 +-
plc4cpp/integrations/edgex-foundry/pom.xml | 2 +-
plc4cpp/integrations/pom.xml | 2 +-
plc4cpp/libs/boost/pom.xml | 2 +-
plc4cpp/libs/pom.xml | 2 +-
plc4cpp/pom.xml | 4 +-
plc4cpp/protocols/driver-bases/base/pom.xml | 6 +-
plc4cpp/protocols/driver-bases/pom.xml | 2 +-
plc4cpp/protocols/pom.xml | 2 +-
plc4cpp/utils/logger/pom.xml | 15 +-
plc4cpp/utils/pom.xml | 5 +-
plc4j/api/pom.xml | 4 +-
plc4j/drivers/ads/pom.xml | 16 +-
plc4j/drivers/delta-v/pom.xml | 37 --
plc4j/drivers/ethernet-ip/pom.xml | 10 +-
plc4j/drivers/modbus/pom.xml | 14 +-
.../test-utils => plc4j/drivers/opcua}/pom.xml | 50 ++-
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 94 +++++
.../opcua/connection/BaseOpcuaPlcConnection.java | 95 +++++
.../opcua/connection/OpcuaConnectionFactory.java | 61 +--
.../opcua/connection/OpcuaTcpPlcConnection.java | 464 +++++++++++++++++++++
.../plc4x/java/opcua/protocol/OpcuaField.java | 118 ++++++
.../java/opcua/protocol/OpcuaPlcFieldHandler.java | 151 +++++++
.../opcua/protocol/OpcuaSubsriptionHandle.java | 81 ++++
.../java/opcua/protocol/model/OpcuaDataTypes.java | 68 ++-
.../opcua/protocol/model/OpcuaIdentifierType.java | 49 +++
.../services/org.apache.plc4x.java.spi.PlcDriver | 19 +
.../apache/plc4x/java/opcua/ManualPLC4XOpcua.java | 145 +++++++
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 67 +++
.../org/apache/plc4x/java/opcua/UtilsTest.java | 60 +--
.../connection/OpcuaTcpPlcConnectionTest.java | 56 +--
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 51 +++
.../opcua/protocol/OpcuaPlcFieldHandlerTest.java | 56 +--
.../protocol/OpcuaSubscriptionHandleTest.java | 56 +--
plc4j/drivers/pom.xml | 3 +-
plc4j/drivers/s7/pom.xml | 18 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 2 +-
plc4j/drivers/simulated/pom.xml | 6 +-
plc4j/examples/dummy-driver/pom.xml | 8 +-
plc4j/examples/hello-cloud-azure/pom.xml | 6 +-
plc4j/examples/hello-cloud-google/pom.xml | 6 +-
plc4j/examples/hello-connectivity-kafka/pom.xml | 12 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 8 +-
plc4j/examples/hello-integration-edgent/pom.xml | 8 +-
plc4j/examples/hello-opm/pom.xml | 10 +-
plc4j/examples/hello-storage-elasticsearch/pom.xml | 10 +-
.../elasticsearch/ElasticsearchStorage.java | 5 +-
plc4j/examples/hello-webapp/client/pom.xml | 2 +-
plc4j/examples/hello-webapp/pom.xml | 2 +-
plc4j/examples/hello-webapp/service/pom.xml | 9 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 19 +-
plc4j/examples/hello-world-plc4x/pom.xml | 8 +-
plc4j/examples/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 8 +-
plc4j/integrations/apache-camel/pom.xml | 8 +-
plc4j/integrations/apache-edgent/pom.xml | 10 +-
plc4j/integrations/apache-kafka/pom.xml | 2 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 4 +-
.../apache-karaf/karaf-demo-server/pom.xml | 32 +-
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 4 +-
.../apache-karaf/karaf-modbus-feature/pom.xml | 4 +-
.../apache-karaf/karaf-s7-feature/pom.xml | 4 +-
.../apache-karaf/karaf-simulated-feature/pom.xml | 4 +-
plc4j/integrations/apache-karaf/pom.xml | 2 +-
.../apache-nifi/nifi-plc4x-nar/pom.xml | 16 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 4 +-
plc4j/integrations/apache-nifi/pom.xml | 2 +-
plc4j/integrations/pom.xml | 2 +-
plc4j/pom.xml | 2 +-
plc4j/protocols/ads/pom.xml | 8 +-
plc4j/protocols/benchmarks/pom.xml | 4 +-
plc4j/protocols/delta-v/pom.xml | 2 +-
.../java/org/apache/plc4x/java/deltav/PoCES.java | 5 +-
plc4j/protocols/driver-bases/base/pom.xml | 4 +-
.../java/base/messages/DefaultPlcWriteRequest.java | 4 +-
plc4j/protocols/driver-bases/pom.xml | 2 +-
plc4j/protocols/driver-bases/raw-socket/pom.xml | 6 +-
plc4j/protocols/driver-bases/serial/pom.xml | 6 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 6 +-
plc4j/protocols/driver-bases/test/pom.xml | 6 +-
plc4j/protocols/ethernet-ip/pom.xml | 6 +-
plc4j/protocols/iso-on-tcp/pom.xml | 8 +-
plc4j/protocols/iso-tp/pom.xml | 10 +-
plc4j/protocols/modbus/pom.xml | 8 +-
plc4j/protocols/pom.xml | 2 +-
plc4j/protocols/s7/pom.xml | 10 +-
plc4j/utils/connection-pool/pom.xml | 4 +-
plc4j/utils/interop/pom.xml | 45 +-
plc4j/utils/opm/pom.xml | 10 +-
plc4j/utils/pom.xml | 2 +-
plc4j/utils/raw-sockets/pom.xml | 4 +-
plc4j/utils/scraper/pom.xml | 18 +-
plc4j/utils/test-utils/pom.xml | 2 +-
plc4net/api/pom.xml | 2 +-
plc4net/plc4net.driver/pom.xml | 6 +-
plc4net/pom.xml | 4 +-
plc4py/pom.xml | 36 +-
pom.xml | 141 +++++--
protocols/knxnet-ip/pom.xml | 4 +-
protocols/pom.xml | 2 +-
protocols/proxy/pom.xml | 2 +-
protocols/s7/pom.xml | 4 +-
protocols/test-utils/pom.xml | 2 +-
sandbox/dynamic-driver-base/pom.xml | 6 +-
sandbox/dynamic-driver-s7/pom.xml | 10 +-
sandbox/pom.xml | 19 +-
src/main/script/prerequisiteCheck.groovy | 277 ++++++++++++
src/site/asciidoc/developers/conferences.adoc | 1 +
src/site/asciidoc/developers/release.adoc | 146 ++++---
src/site/asciidoc/developers/website.adoc | 21 +
src/site/asciidoc/index.adoc | 9 +-
.../plc4x-doap.rdf | 30 +-
src/site/resources/plc4x-pmc.rdf | 5 +
tools/common.sh | 4 +-
tools/download_staged_release.sh | 6 +-
tools/pom.xml | 2 +-
tools/thrift/pom.xml | 241 +++++------
tools/thrift/src/assembly/python.xml | 28 +-
124 files changed, 2486 insertions(+), 859 deletions(-)
diff --cc protocols/s7/pom.xml
index bc65cda,600dc87..736c33b
--- a/protocols/s7/pom.xml
+++ b/protocols/s7/pom.xml
@@@ -43,29 -36,10 +43,29 @@@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-test-utils</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.daffodil</groupId>
<artifactId>daffodil-japi_2.12</artifactId>
diff --cc sandbox/pom.xml
index 424d01d,4f5cd3d..30fbe1b
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@@ -36,9 -36,24 +36,26 @@@
<modules>
<module>dynamic-driver-base</module>
+ <module>dynamic-driver-knxnet-ip</module>
<module>dynamic-driver-s7</module>
+ <module>code-gen</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-scxml2</artifactId>
+ <!-- Materialized version -->
+ <version>2.0-20190516.183044-86</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>