You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:03 UTC
[plc4x] 09/17: Merge branch 'develop' of
https://github.com/apache/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ee5143076d3c13ed12284c90220e1555bd01c258
Merge: c9d0ddf 86e7edb
Author: ottlukas <ot...@gmail.com>
AuthorDate: Fri Apr 3 23:29:53 2020 +0200
Merge branch 'develop' of https://github.com/apache/plc4x into develop
plc4j/integrations/apache-camel/pom.xml | 6 +
.../java/org/apache/plc4x/camel/Constants.java | 2 +-
.../org/apache/plc4x/camel/Plc4XComponent.java | 18 ++
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 40 ++--
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 33 ++-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 54 +++--
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 24 +-
.../main/java/org/apache/plc4x/camel/TagData.java | 65 +++++
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 20 +-
.../org/apache/plc4x/camel/Plc4XConsumerTest.java | 18 --
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 37 ++-
plc4j/integrations/logstash-plugin/pom.xml | 4 -
plc4j/protocols/delta-v/pom.xml | 2 -
plc4j/tools/interop/pom.xml | 33 +--
.../org/apache/plc4x/interop/impl/Handler.java | 2 +-
.../java/org/apache/plc4x/interop/impl/Server.java | 8 +-
pom.xml | 40 +++-
.../eip/src/main/resources/protocols/eip/eip.mspec | 2 +-
protocols/pom.xml | 5 +
sandbox/plc4c/CMakeLists.txt | 78 ++++++
sandbox/plc4c/api/CMakeLists.txt | 32 +++
sandbox/plc4c/api/src/main/c/Adder.c | 25 ++
sandbox/plc4c/api/src/main/include/Adder.h | 25 ++
sandbox/plc4c/api/src/test/c/AdderTest.c | 40 ++++
sandbox/plc4c/drivers/CMakeLists.txt | 21 ++
sandbox/plc4c/drivers/modbus/CMakeLists.txt | 23 ++
sandbox/plc4c/drivers/s7/CMakeLists.txt | 23 ++
sandbox/plc4c/examples/CMakeLists.txt | 20 ++
sandbox/plc4c/examples/hello-world/CMakeLists.txt | 25 ++
.../examples/hello-world/src/main/c/HelloWorld.c | 30 +++
.../hello-world/src/main/include/HelloWorld.h | 25 ++
sandbox/plc4c/integrations/CMakeLists.txt | 20 ++
.../integrations/apache-mynewt/CMakeLists.txt | 23 ++
sandbox/plc4c/pom.xml | 266 +++++++++++++++++++++
sandbox/plc4c/spi/CMakeLists.txt | 23 ++
sandbox/plc4c/transports/CMakeLists.txt | 21 ++
sandbox/plc4c/transports/serial/CMakeLists.txt | 23 ++
sandbox/plc4c/transports/tcp/CMakeLists.txt | 23 ++
sandbox/plc4cpp/pom.xml | 33 +--
sandbox/plc4net/api/pom.xml | 1 -
sandbox/plc4net/plc4net.driver/pom.xml | 1 -
sandbox/plc4py/pom.xml | 1 -
sandbox/pom.xml | 10 +-
src/main/script/prerequisiteCheck.groovy | 60 ++++-
src/site/asciidoc/developers/maturity.adoc | 4 +-
.../asciidoc/users/blogs-videos-and-slides.adoc | 4 +-
src/site/site.xml | 2 +-
tools/boost/pom.xml | 4 +-
tools/logstash/pom.xml | 10 +-
tools/thrift/pom.xml | 100 ++++++--
50 files changed, 1195 insertions(+), 214 deletions(-)