This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch feature/c-api in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 43b2ba188f0f0513ca33c2629facd9c68ff48100 Merge: c2a58a0 2dbaa94 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Tue May 12 12:59:30 2020 +0200 Merge branches 'develop' and 'feature/c-api' of https://gitbox.apache.org/repos/asf/plc4x into feature/c-api RELEASE_NOTES | 26 +++- plc4j/api/pom.xml | 3 +- .../org/apache/plc4x/java/PlcDriverManager.java | 2 +- plc4j/drivers/eip/pom.xml | 17 ++- .../apache/plc4x/java/eip/readwrite/EIPDriver.java | 3 - .../java/eip/readwrite/field/EipFieldHandler.java | 2 +- .../eip/readwrite/protocol/EipProtocolLogic.java | 11 +- plc4j/drivers/firmata/pom.xml | 12 ++ plc4j/drivers/knxnetip/pom.xml | 12 ++ .../knxnetip/protocol/KnxNetIpProtocolLogic.java | 2 +- plc4j/drivers/modbus/pom.xml | 12 ++ plc4j/drivers/opcua/pom.xml | 39 +++--- .../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 - plc4j/drivers/s7/pom.xml | 18 ++- .../apache/plc4x/java/s7/readwrite/S7Driver.java | 3 - plc4j/examples/hello-connectivity-mqtt/pom.xml | 5 + plc4j/examples/pom.xml | 2 +- plc4j/integrations/apache-camel/pom.xml | 31 ++--- .../org/apache/plc4x/camel/Plc4XComponent.java | 28 ++-- .../java/org/apache/plc4x/camel/Plc4XConsumer.java | 36 +++-- .../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 35 +---- .../apache/plc4x/camel/Plc4XPollingConsumer.java | 53 ++++---- .../main/java/org/apache/plc4x/camel/TagData.java | 41 ++++++ .../java/org/apache/plc4x/camel/ManualTest.java | 9 -- plc4j/karaf-features/eip/pom.xml | 6 + plc4j/karaf-features/s7/pom.xml | 5 + plc4j/{transports/tcp => osgi}/pom.xml | 36 +++-- .../apache/plc4x/java/osgi/DriverActivator.java | 53 ++++++++ .../apache/plc4x/java/osgi/TransportActivator.java | 54 ++++++++ plc4j/pom.xml | 3 +- plc4j/spi/pom.xml | 15 +++ .../spi/configuration/ConfigurationFactory.java | 19 ++- .../ConfigurationParameterConverter.java | 44 ++++++ .../annotations/ParameterConverter.java | 42 ++++++ plc4j/transports/pcap-replay/pom.xml | 20 ++- plc4j/transports/raw-socket/pom.xml | 19 +++ plc4j/transports/serial/pom.xml | 20 ++- plc4j/transports/tcp/pom.xml | 19 +++ plc4j/transports/udp/pom.xml | 20 +++ pom.xml | 2 + .../main/resources/protocols/amsads/amsads.mspec | 20 +-- .../amsads/configuration/AdsConfiguration.java | 26 ++++ src/main/script/prerequisiteCheck.groovy | 8 +- src/site/asciidoc/developers/preparing/linux.adoc | 2 +- .../asciidoc/developers/release/build-tools.adoc | 9 +- src/site/asciidoc/developers/release/release.adoc | 13 +- .../asciidoc/developers/release/validation.adoc | 5 + src/site/asciidoc/users/protocols/ads.adoc | 34 +++++ src/site/asciidoc/users/protocols/bacnetip.adoc | 44 ++++++ src/site/asciidoc/users/protocols/ethernet-ip.adoc | 78 +++++++++++ src/site/asciidoc/users/protocols/opc-ua.adoc | 149 +++++++++++++++++++++ 51 files changed, 948 insertions(+), 221 deletions(-)