[karaf] 01/01: Merge pull request #532 from jbonofre/KARAF-5714

[jbonofre]

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

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

commit 6b70c121a1c01a5592c4575c4df6855d84d1b17b
Merge: 00689f1 a474613
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Tue Jun 19 14:49:19 2018 +0200

    Merge pull request #532 from jbonofre/KARAF-5714
    
    [KARAF-5714] Upgrade to ServiceMix Spec Locator 2.10 and prepare individual 
spec update

 .../features/standard/src/main/feature/feature.xml      |  4 ++--
 pom.xml                                                 | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)