From dfa9b747b9e892f6f007d7cc0f01b01ad1ba5773 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stataru@talend.com>
Date: Tue, 9 Jan 2024 16:52:28 +0100
Subject: [PATCH 1/3] removal of all event spring-legacy feats

---
 .../src/main/feature/feature.xml              | 638 +-----------------
 pom.xml                                       |   2 +-
 2 files changed, 4 insertions(+), 636 deletions(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index fc454f7bf4d..e60d5dc9259 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -18,638 +18,6 @@
 -->
 <features name="spring-legacy-${upstream.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
-    <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax-web.features.tesb.version}/xml/features</repository>
-    <repository>mvn:org.apache.karaf.features/standard/${upstream.version}/xml/features</repository>
-
-    <!-- Spring DM support -->
-    <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}">
-        <feature version="[2.5.6,4)">spring</feature>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
-        <conditional>
-            <condition>deployer</condition>
-            <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${upstream.version}</bundle>
-        </conditional>
-        <conditional>
-            <condition>bundle</condition>
-            <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${upstream.version}</bundle>
-        </conditional>
-    </feature>
-
-    <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}">
-    </feature>
-    <!-- <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}">
-        <feature>spring-dm</feature>
-        <feature version="[2.5.6,4)">spring-web</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 3.1.x support -->
-
-    <feature name="spring" description="Spring 3.1.x support" version="${spring31.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-core/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-asm/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 3.1.x AOP support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 3.1.x Instrument support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 3.1.x JDBC support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 3.1.x JMS support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}">
-    </feature>
-    <!-- <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring-web</feature>
-        <feature>war</feature>
-        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-test" description="Spring 3.1.x Test support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 3.1.x ORM support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 3.1.x OXM support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 3.1.x Transaction (TX) support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring31.version},3.2)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 3.2.x support -->
-
-    <feature name="spring" description="Spring 3.2.x support" version="${spring32.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 3.2.x AOP support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 3.2.x Instrument support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 3.2.x JDBC support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 3.2.x JMS support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}">
-    </feature>
-    <!-- <feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <feature>war</feature>
-        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-test" description="Spring 3.2.x Test support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 3.2.x ORM support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 3.2.x OXM support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 3.2.x Transaction (TX) support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 4.0.x support -->
-
-    <feature name="spring" description="Spring 4.0.x support" version="${spring40.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 4.0.x Instrument support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 4.0.x JMS support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 4.0.x Test support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 4.0.x ORM support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 4.0.x OXM support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-websocket" description="Spring 4.0.x WebSocket support" version="${spring40.version}">
-    </feature>
-    <!-- <feature name="spring-websocket" description="Spring 4.0.x WebSocket support" version="${spring40.version}">
-        <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring40.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 4.1.x support -->
-
-    <feature name="spring" description="Spring 4.1.x support" version="${spring41.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 4.1.x AOP support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 4.1.x Instrument support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 4.1.x JDBC support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 4.1.x JMS support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 4.1.x Test support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 4.1.x ORM support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 4.1.x OXM support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 4.1.x Transaction (TX) support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring41.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 4.1.x Web support" version="${spring41.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 4.1.x Web support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring41.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring41.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 4.1.x Web Portlet support" version="${spring41.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 4.1.x Web Portlet support" version="${spring41.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring41.version},4.2)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring41.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-websocket" description="Spring 4.1.x WebSocket support" version="${spring41.version}">
-    </feature>
-    <!-- <feature name="spring-websocket" description="Spring 4.1.x WebSocket support" version="${spring41.version}">
-        <feature version="[${spring41.version},4.2)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring41.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 4.2.x support -->
-
-    <feature name="spring" description="Spring 4.2.x support" version="${spring42.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 4.2.x AOP support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 4.2.x Instrument support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 4.2.x JDBC support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 4.2.x JMS support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-messaging" description="Spring 4.2.x Messaging support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 4.2.x ORM support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 4.2.x OXM support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 4.2.x Transaction (TX) support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring42.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 4.2.x Web support" version="${spring42.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 4.2.x Web support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring42.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 4.2.x Web Portlet support" version="${spring42.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 4.2.x Web Portlet support" version="${spring42.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring42.version},4.3)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring42.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-websocket" description="Spring 4.2.x WebSocket support" version="${spring42.version}">
-    </feature>
-    <!-- <feature name="spring-websocket" description="Spring 4.2.x WebSocket support" version="${spring42.version}">
-        <feature version="[${spring42.version},4.3)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 4.3.x support -->
-
-    <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-messaging" description="Spring 4.3.x Messaging support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
-        <feature version="[${spring43.version},4.4)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
-    </feature>
-    <!-- <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
-        <feature prerequisite="true">wrap</feature>
-        <feature version="[${spring43.version},4.4)">spring-web</feature>
-        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
-    </feature>
-    <!-- <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
-        <feature version="[${spring43.version},4.4)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
-    </feature> -->
-
-    <!-- Spring 5.0.x support -->
-
-    <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring-tx</feature>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-messaging" description="Spring 5.0.x Messaging support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
-    </feature>
-    <!-- <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
-        <feature version="[${spring50.version},5.1)">spring</feature>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
-    </feature>
-    <!-- <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
-        <feature version="[${spring50.version},5.1)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
-    </feature> -->
-
-    <!-- Spring Security support -->
-
-    <feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
-    </feature>
-    <!-- <feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
-        <feature>war</feature>
-        <feature version="[3,4)">spring-web</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.security/spring-security-core/${spring.security31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.security/spring-security-config/${spring.security31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.security/spring-security-web/${spring.security31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.security/spring-security-acl/${spring.security31.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
-    </feature> -->
-
-    <feature name="spring-security" description="Spring Security 4.2.x support" version="${spring.security42.version}">
-    </feature>
-    <!-- <feature name="spring-security" description="Spring Security 4.2.x support" version="${spring.security42.version}">
-        <feature>war</feature>
-        <feature version="[4,5)">spring-web</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security42.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security42.version}</bundle>
-    </feature> -->
-
-</features>
+    <!-- Features removed as part of their most recent patch delivery -->
+    
+</features>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ae798fb8996..cbc997735c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
         <framework.features.tesb.version>4.2.7.tesb6</framework.features.tesb.version>
         <static.features.tesb.version>4.2.7.tesb1</static.features.tesb.version>
         <spring.features.tesb.version>4.2.7.tesb9</spring.features.tesb.version>
-        <spring-legacy.features.tesb.version>4.2.7.tesb6</spring-legacy.features.tesb.version>
+        <spring-legacy.features.tesb.version>4.2.7.tesb7</spring-legacy.features.tesb.version>
         <enterprise.features.tesb.version>4.2.7.tesb6</enterprise.features.tesb.version>
         <enterprise-legacy.features.tesb.version>4.2.7.tesb1</enterprise-legacy.features.tesb.version>
         <pax-web.features.tesb.version>7.2.30.tesb4</pax-web.features.tesb.version>

From 1823f6b2cac3a550fe2d9eca4119cf79263da3f2 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stataru@talend.com>
Date: Tue, 9 Jan 2024 17:50:09 +0100
Subject: [PATCH 2/3] TPRUN-7272 empty all spring-legacy feats

---
 .../src/main/feature/feature.xml              | 770 +++++++++++++++++-
 1 file changed, 768 insertions(+), 2 deletions(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index e60d5dc9259..cc5c3acbb92 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -18,6 +18,772 @@
 -->
 <features name="spring-legacy-${upstream.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
-    <!-- Features removed as part of their most recent patch delivery -->
+    <!-- <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax-web.features.tesb.version}/xml/features</repository>  -->
+    <!-- <repository>mvn:org.apache.karaf.features/standard/${upstream.version}/xml/features</repository> -->
+
+    <!-- Spring DM support -->
+    <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}">
+    </feature>
+    <!-- <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}">
+        <feature version="[2.5.6,4)">spring</feature>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
+        <conditional>
+            <condition>deployer</condition>
+            <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${upstream.version}</bundle>
+        </conditional>
+        <conditional>
+            <condition>bundle</condition>
+            <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${upstream.version}</bundle>
+        </conditional>
+    </feature> -->
+
+    <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}">
+    </feature>
+    <!-- <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}">
+        <feature>spring-dm</feature>
+        <feature version="[2.5.6,4)">spring-web</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 3.1.x support -->
+
+    <feature name="spring" description="Spring 3.1.x support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 3.1.x support" version="${spring31.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-core/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-asm/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 3.1.x AOP support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 3.1.x AOP support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 3.1.x Instrument support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 3.1.x Instrument support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 3.1.x JDBC support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 3.1.x JDBC support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 3.1.x JMS support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 3.1.x JMS support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-web</feature>
+        <feature>war</feature>
+        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 3.1.x Test support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 3.1.x Test support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 3.1.x ORM support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 3.1.x ORM support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 3.1.x OXM support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 3.1.x OXM support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 3.1.x Transaction (TX) support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 3.1.x Transaction (TX) support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring31.version},3.2)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 3.2.x support -->
+
+    <feature name="spring" description="Spring 3.2.x support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 3.2.x support" version="${spring32.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 3.2.x AOP support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 3.2.x AOP support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 3.2.x Instrument support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 3.2.x Instrument support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 3.2.x JDBC support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 3.2.x JDBC support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 3.2.x JMS support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 3.2.x JMS support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-web</feature>
+        <feature>war</feature>
+        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 3.2.x Test support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 3.2.x Test support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 3.2.x ORM support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 3.2.x ORM support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 3.2.x OXM support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 3.2.x OXM support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 3.2.x Transaction (TX) support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 3.2.x Transaction (TX) support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring32.version},3.3)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 4.0.x support -->
+
+    <feature name="spring" description="Spring 4.0.x support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 4.0.x support" version="${spring40.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 4.0.x Instrument support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 4.0.x Instrument support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 4.0.x JMS support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 4.0.x JMS support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 4.0.x Test support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 4.0.x Test support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 4.0.x ORM support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 4.0.x ORM support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 4.0.x OXM support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 4.0.x OXM support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 4.0.x Web support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring40.version},4.1)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-websocket" description="Spring 4.0.x WebSocket support" version="${spring40.version}">
+    </feature>
+    <!-- <feature name="spring-websocket" description="Spring 4.0.x WebSocket support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring40.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 4.1.x support -->
+
+    <feature name="spring" description="Spring 4.1.x support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 4.1.x support" version="${spring41.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 4.1.x AOP support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 4.1.x AOP support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 4.1.x Instrument support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 4.1.x Instrument support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 4.1.x JDBC support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 4.1.x JDBC support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 4.1.x JMS support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 4.1.x JMS support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 4.1.x Test support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 4.1.x Test support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 4.1.x ORM support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 4.1.x ORM support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 4.1.x OXM support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 4.1.x OXM support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 4.1.x Transaction (TX) support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 4.1.x Transaction (TX) support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 4.1.x Web support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 4.1.x Web support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring41.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 4.1.x Web Portlet support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 4.1.x Web Portlet support" version="${spring41.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring41.version},4.2)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring41.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-websocket" description="Spring 4.1.x WebSocket support" version="${spring41.version}">
+    </feature>
+    <!-- <feature name="spring-websocket" description="Spring 4.1.x WebSocket support" version="${spring41.version}">
+        <feature version="[${spring41.version},4.2)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring41.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 4.2.x support -->
+
+    <feature name="spring" description="Spring 4.2.x support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 4.2.x support" version="${spring42.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 4.2.x AOP support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 4.2.x AOP support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 4.2.x Instrument support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 4.2.x Instrument support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 4.2.x JDBC support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 4.2.x JDBC support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 4.2.x JMS support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 4.2.x JMS support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-messaging" description="Spring 4.2.x Messaging support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-messaging" description="Spring 4.2.x Messaging support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring42.version}</bundle>
+    </feature> -->
+    
+    <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 4.2.x ORM support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 4.2.x ORM support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 4.2.x OXM support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 4.2.x OXM support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 4.2.x Transaction (TX) support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 4.2.x Transaction (TX) support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 4.2.x Web support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 4.2.x Web support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 4.2.x Web Portlet support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 4.2.x Web Portlet support" version="${spring42.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring42.version},4.3)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring42.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-websocket" description="Spring 4.2.x WebSocket support" version="${spring42.version}">
+    </feature>
+    <!-- <feature name="spring-websocket" description="Spring 4.2.x WebSocket support" version="${spring42.version}">
+        <feature version="[${spring42.version},4.3)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 4.3.x support -->
+
+    <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-messaging" description="Spring 4.3.x Messaging support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-messaging" description="Spring 4.3.x Messaging support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
+    </feature> -->
     
-</features>
\ No newline at end of file
+    <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
+        <feature version="[${spring43.version},4.4)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
+        <feature prerequisite="true">wrap</feature>
+        <feature version="[${spring43.version},4.4)">spring-web</feature>
+        <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+    </feature>
+    <!-- <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <feature version="[${spring43.version},4.4)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
+    </feature> -->
+
+    <!-- Spring 5.0.x support -->
+
+    <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring-tx</feature>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-messaging" description="Spring 5.0.x Messaging support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-messaging" description="Spring 5.0.x Messaging support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
+    </feature> -->
+     
+    <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
+        <feature version="[${spring50.version},5.1)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
+    </feature>
+    <!-- <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
+        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <feature version="[${spring50.version},5.1)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
+    </feature> -->
+
+    <!-- Spring Security support -->
+
+    <feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
+    </feature>
+    <!-- <feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
+        <feature>war</feature>
+        <feature version="[3,4)">spring-web</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.security/spring-security-core/${spring.security31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.security/spring-security-config/${spring.security31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.security/spring-security-web/${spring.security31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.security/spring-security-acl/${spring.security31.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
+    </feature> -->
+
+    <feature name="spring-security" description="Spring Security 4.2.x support" version="${spring.security42.version}">
+    </feature>
+    <!-- <feature name="spring-security" description="Spring Security 4.2.x support" version="${spring.security42.version}">
+        <feature>war</feature>
+        <feature version="[4,5)">spring-web</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security42.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security42.version}</bundle>
+    </feature> -->
+
+</features>

From 22cd3919116714083e7d4d7e6c1ec156086d3942 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stataru@talend.com>
Date: Tue, 9 Jan 2024 18:04:03 +0100
Subject: [PATCH 3/3] TPRUN-7272 cleanup

---
 .../features/spring-legacy/src/main/feature/feature.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index cc5c3acbb92..83d8603c6e6 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -497,7 +497,7 @@
         <feature version="[${spring42.version},4.3)">spring</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring42.version}</bundle>
     </feature> -->
-    
+
     <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
     </feature>
     <!-- <feature name="spring-test" description="Spring 4.2.x Test support" version="${spring42.version}">
@@ -611,7 +611,7 @@
         <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
     </feature> -->
-    
+
     <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
     </feature>
     <!-- <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
@@ -733,7 +733,7 @@
         <feature version="[${spring50.version},5.1)">spring</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
     </feature> -->
-     
+
     <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
     </feature>
     <!-- <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">