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/10/18 13:17:32 UTC
[plc4x] 08/15: Merge remote-tracking branch
'jfeinauer/feature/resolve-split-package-osgi' into
feature/resolve-split-package-osgi
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/resolve-split-package-osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 296efd2f2555a33b5f77581357512facb3160ad5
Merge: ac8b7e8 a14fe10
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Oct 18 13:20:23 2019 +0200
Merge remote-tracking branch 'jfeinauer/feature/resolve-split-package-osgi' into feature/resolve-split-package-osgi
plc4j/drivers/ads/pom.xml | 9 ++++-
.../org/apache/plc4x/java/ads/AdsPlcDriver.java | 2 +
plc4j/drivers/ethernet-ip/pom.xml | 7 ++++
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 2 +
plc4j/drivers/modbus/pom.xml | 7 ++++
.../apache/plc4x/java/modbus/ModbusPlcDriver.java | 2 +
plc4j/drivers/opcua/pom.xml | 6 +++
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 +
plc4j/drivers/simulated/pom.xml | 7 ++++
.../plc4x/java/simulated/SimulatedPlcDriver.java | 2 +
.../apache-karaf/karaf-demo-server/pom.xml | 8 ++++
.../pom.xml | 37 ++---------------
.../apache-karaf/karaf-s7-feature/pom.xml | 29 -------------
.../karaf-s7-feature/src/main/feature/feature.xslt | 47 ----------------------
plc4j/integrations/apache-karaf/pom.xml | 2 +-
15 files changed, 58 insertions(+), 111 deletions(-)