This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 21dca2b3bd3f2146cbba63dbcde7520cdad92d5f Merge: 56b612b204 606dcbf395 Author: JB Onofré <jbono...@apache.org> AuthorDate: Sun Apr 7 18:39:28 2024 +0200 Merge pull request #1840 from jbonofre/KARAF-7747 KARAF-7747: Provide Spring 6.1.x/6.0.x features assemblies/features/spring-legacy/pom.xml | 4 +- .../spring-legacy/src/main/feature/feature.xml | 208 ++++++++++++++++++++- assemblies/features/spring/pom.xml | 2 +- .../features/spring/src/main/feature/feature.xml | 136 +++++++------- itests/test/pom.xml | 6 + .../java/org/apache/karaf/itests/BaseTest.java | 3 + .../itests/features/Spring53FeaturesTest.java | 22 +++ ...FeaturesTest.java => Spring60FeaturesTest.java} | 71 +++---- ...FeaturesTest.java => Spring61FeaturesTest.java} | 49 ++--- pom.xml | 3 + 10 files changed, 352 insertions(+), 152 deletions(-)