[karaf] branch master updated (115c505 -> fe34605)

[jb...@apache.org]

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 115c505  Merge pull request #1229 from jbonofre/KARAF-6884
     new efd7446  [KARAF-6680] Add json support in etc configuration
     new fe34605  Merge pull request #1222 from jbonofre/JSON_CFG

The 8385 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:
 .../resources/etc/config.properties                |   2 +-
 .../framework/src/main/feature/feature.xml         |   6 +
 config/pom.xml                                     |  20 ++-
 .../karaf/config/command/ConfigCommandSupport.java |   1 +
 .../apache/karaf/config/command/EditCommand.java   |   7 +
 .../apache/karaf/config/command/UpdateCommand.java |   6 +-
 .../apache/karaf/config/core/ConfigRepository.java |   6 +
 .../config/core/impl/ConfigRepositoryImpl.java     |  65 +++++--
 .../config/core/impl/JsonConfigInstaller.java      | 194 +++++++++++++++++++++
 .../karaf/config/core/impl/osgi/Activator.java     |  10 +-
 .../karaf/config/command/UpdateCommandTest.java    |   4 +-
 examples/pom.xml                                   |   2 +-
 features/core/pom.xml                              |  11 ++
 .../internal/service/FeatureConfigInstaller.java   | 117 ++++++++-----
 .../java/org/apache/karaf/itests/JaasTest.java     |   2 +-
 pom.xml                                            |  18 ++
 .../{BundleUtilsTest.java => JsonReaderTest.java}  |  26 +--
 17 files changed, 425 insertions(+), 72 deletions(-)
 create mode 100644 config/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java
 copy util/src/test/java/org/apache/karaf/util/{BundleUtilsTest.java => JsonReaderTest.java} (61%)