You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/12/18 12:04:02 UTC

[karaf] 01/01: Merge pull request #391 from apache/KARAF-5447

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

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

commit 6d0e895e918f4eeb373380a0558993563b8d7f1d
Merge: 373ee03 3fb8abc
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Dec 18 13:03:58 2017 +0100

    Merge pull request #391 from apache/KARAF-5447
    
    [KARAF-5447] Support Spring 5.0.x

 .../spring-legacy/src/main/feature/feature.xml     | 77 ++++++++++++++++++++
 .../features/spring/src/main/feature/feature.xml   | 85 ++++++++++------------
 itests/pom.xml                                     |  1 +
 .../org/apache/karaf/itests/KarafTestSupport.java  |  1 +
 .../itests/features/Spring43FeaturesTest.java      | 24 +++++-
 ...FeaturesTest.java => Spring50FeaturesTest.java} | 39 +++++-----
 pom.xml                                            |  1 +
 7 files changed, 163 insertions(+), 65 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.