You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/05/15 10:40:16 UTC
[plc4x] 01/08: Merge branch 'feature/osgi' of
https://github.com/apache/plc4x into feature/scraper
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 597294d6b300e267648a3b71dbadbe5746c8a623
Merge: 2ef6adf f2db740
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Fri May 8 13:01:27 2020 +0200
Merge branch 'feature/osgi' of https://github.com/apache/plc4x into feature/scraper
plc4j/api/pom.xml | 20 +---
.../java/org/apache/plc4x/java/DriverManager.java | 30 ------
.../org/apache/plc4x/java/PlcDriverManager.java | 6 +-
.../org/apache/plc4x/java/osgi/ApiActivator.java | 104 ---------------------
.../apache/plc4x/java/osgi/OsgiDriverManager.java | 81 ----------------
plc4j/drivers/eip/pom.xml | 1 +
plc4j/drivers/s7/pom.xml | 1 +
plc4j/karaf-features/eip/pom.xml | 6 ++
plc4j/karaf-features/s7/pom.xml | 5 +
plc4j/{karaf-features/eip => osgi}/pom.xml | 50 ++++------
.../apache/plc4x/java/osgi/DriverActivator.java | 53 +++++++++++
.../apache/plc4x/java/osgi/TransportActivator.java | 54 +++++++++++
plc4j/pom.xml | 5 +-
plc4j/spi/pom.xml | 8 +-
.../org/apache/plc4x/java/osgi/SpiActivator.java | 89 ------------------
plc4j/transports/tcp/pom.xml | 1 +
16 files changed, 147 insertions(+), 367 deletions(-)