You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/12 13:26:22 UTC

[karaf] branch master updated (d03c368 -> c5cd8e5)

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

jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.


    from d03c368  Merge pull request #874 from jbonofre/KARAF-6323
     new 84b217b  [KARAF-6326] Fix instances with JDK 11
     new a230475  Fix javadoc generation
     new c5cd8e5  Merge pull request #875 from jbonofre/KARAF-6326

The 7712 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 instance/pom.xml                                   | 12 ++++++++
 .../core/internal/InstanceServiceImpl.java         | 20 ++++++++++----
 .../org/apache/karaf/instance/main/Execute.java    |  5 ++++
 .../karaf/instance/resources/etc/system.properties |  8 ++----
 main/src/main/java/org/apache/karaf/main/Main.java | 32 +++++++++++-----------
 .../felix/eventadmin/impl/Configuration.java       | 18 ++++++------
 .../impl/adapter/BundleEventAdapter.java           |  6 ++--
 .../eventadmin/impl/handler/EventAdminImpl.java    | 14 +++++-----
 .../apache/karaf/util/config/PropertiesLoader.java | 16 +++++------
 9 files changed, 76 insertions(+), 55 deletions(-)