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 2021/07/02 13:50:45 UTC
[plc4x] 01/05: Merge branch 'develop' of github.com:apache/plc4x
into feature/profinet-chris
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/profinet-chris
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 60ef1313a6c06b09a8fabb932e3ed077e79ceacd
Merge: 086bccc 4e76b47
Author: cdutz <ch...@c-ware.de>
AuthorDate: Wed Jun 30 12:17:01 2021 +0200
Merge branch 'develop' of github.com:apache/plc4x into feature/profinet-chris
README.md | 4 +-
.../BaseFreemarkerLanguageTemplateHelper.java | 307 +++++++++++----------
.../freemarker/FreemarkerLanguageOutput.java | 144 +++++-----
.../mspec/parser/MessageFormatListener.java | 24 +-
plc4c/pom.xml | 1 +
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 22 +-
.../java/simulated/connection/SimulatedDevice.java | 19 +-
.../connection/SimulatedConnectionTest.java | 2 +-
.../integration/iotdb/IoTDBWriterWithJDBC.java | 39 ++-
.../watertank/service/WaterTankService.java | 41 +--
plc4j/integrations/apache-kafka/pom.xml | 5 -
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 96 +++----
plc4j/integrations/opcua-server/pom.xml | 5 -
.../opcuaserver/context/CertificateGenerator.java | 18 +-
.../netty/config/PcapReplayChannelConfig.java | 8 +-
.../internal/handlers/ApiResponseHandler.java | 11 +-
.../java/org/apache/plc4x/codegen/DFDLUtil.java | 34 ++-
.../watertank/WaterTankSimulationModule.java | 3 +-
.../plc4x/java/df1/protocol/Df1Protocol.java | 80 +++---
19 files changed, 442 insertions(+), 421 deletions(-)