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 80767dd24162ca985e8d02003459cb3beae74c9d
Merge: 1a70894 c8748c3
Author: etiennerobinet <61242848+etiennerobi...@users.noreply.github.com>
AuthorDate: Mon May 4 10:25:52 2020 +0200

    Merge branch 'develop' into feature/osgi

 RELEASE_NOTES                                      |  24 +-
 .../knxnetip/protocol/KnxNetIpProtocolLogic.java   |   2 +-
 plc4j/examples/dummy-driver/pom.xml                |   1 -
 plc4j/examples/hello-connectivity-mqtt/pom.xml     |   5 +
 plc4j/examples/hello-storage-elasticsearch/pom.xml |   1 -
 plc4j/examples/hello-webapp/pom.xml                |   1 -
 plc4j/examples/hello-webapp/webapp/README.adoc     |  41 +++
 plc4j/examples/hello-webapp/webapp/pom.xml         |  66 ++++-
 .../src/main/resources/application.properties      |   3 +-
 plc4j/examples/pom.xml                             |   3 +-
 .../spi/configuration/ConfigurationFactory.java    |  19 +-
 .../ConfigurationParameterConverter.java           |  44 ++++
 .../annotations/ParameterConverter.java            |  30 ++-
 plc4j/tools/capture-replay/pom.xml                 |   1 -
 .../rawsockets/netty/RawSocketChannelTest.java     |   2 +
 pom.xml                                            |   4 +-
 .../main/resources/protocols/amsads/amsads.mspec   |  20 +-
 sandbox/plc-simulator/pom.xml                      |   1 -
 sandbox/plc4c/CMakeLists.txt                       |   2 +-
 sandbox/plc4c/api/CMakeLists.txt                   |   3 +-
 sandbox/plc4c/api/src/main/include/plc4c.h         | 280 +++++++++++++++++++++
 .../plc4c/design-guidelines.adoc                   |  16 +-
 sandbox/plc4c/examples/hello-world/CMakeLists.txt  |   9 +-
 .../examples/hello-world/src/main/c/hello_world.c  |  71 ++++++
 sandbox/plc4c/spi/CMakeLists.txt                   |   7 +-
 sandbox/plc4c/spi/src/main/c/plc4c.c               | 100 ++++++++
 .../src/main/c/plc4c_private_types.c}              |  23 +-
 .../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 +-
 src/site/asciidoc/users/protocols/ads.adoc         |  34 +++
 src/site/asciidoc/users/protocols/bacnetip.adoc    |  44 ++++
 src/site/asciidoc/users/protocols/opc-ua.adoc      |  55 ++++
 35 files changed, 898 insertions(+), 72 deletions(-)

Reply via email to