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/04/06 08:17:50 UTC

[plc4x] 01/03: Merge branch 'osgi' of https://github.com/apache/plc4x into develop

This is an automated email from the ASF dual-hosted git repository.

erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 37f8a8e18db59d09a5a2a1d27d2686a59b21d189
Merge: 86e7edb dfe424f
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Fri Apr 3 16:47:40 2020 +0200

    Merge branch 'osgi' of https://github.com/apache/plc4x into develop

 plc4j/karaf-features/camel/pom.xml                 | 67 ++++++++++++++++++++
 plc4j/karaf-features/eip/pom.xml                   | 66 ++++++++++++++++++++
 plc4j/karaf-features/pom.xml                       | 15 +----
 plc4j/karaf-features/s7/pom.xml                    | 72 ++++++----------------
 .../karaf-features/s7/src/main/feature/feature.xml | 44 -------------
 5 files changed, 154 insertions(+), 110 deletions(-)