karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [2/3] karaf git commit: [KARAF-4957] Move old features into enterprise-legacy and spring-legacy modules
Date Wed, 25 Jan 2017 15:45:17 GMT
http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index f4b12ee..f4d98c7 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -23,332 +23,6 @@
     <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
     <repository>mvn:org.apache.karaf.features/standard/${project.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/${project.version}</bundle>
-        </conditional>
-        <conditional>
-            <condition>bundle</condition>
-            <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${project.version}</bundle>
-        </conditional>
-    </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 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 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 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 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 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 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 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 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 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 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 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 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}">
@@ -422,19 +96,6 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
     </feature>    
 
-    <!-- Spring Security support -->
-
-    <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>
-
     <!-- Aries Blueprint Spring support -->
 
     <feature name="aries-blueprint-spring">

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/demos/profiles/registry/pom.xml
----------------------------------------------------------------------
diff --git a/demos/profiles/registry/pom.xml b/demos/profiles/registry/pom.xml
index 74e030d..b456c06 100644
--- a/demos/profiles/registry/pom.xml
+++ b/demos/profiles/registry/pom.xml
@@ -33,9 +33,9 @@
     <name>Apache Karaf :: Demos :: Profiles :: Registry</name>
 
     <properties>
-        <activemq.version>5.11.1</activemq.version>
-        <camel.version>2.16.2</camel.version>
-        <cxf.version>3.1.0</cxf.version>
+        <activemq.version>5.14.3</activemq.version>
+        <camel.version>2.18.1</camel.version>
+        <cxf.version>3.1.9</cxf.version>
     </properties>
 
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/demos/profiles/registry/src/main/resources/default.profile/profile.cfg
----------------------------------------------------------------------
diff --git a/demos/profiles/registry/src/main/resources/default.profile/profile.cfg b/demos/profiles/registry/src/main/resources/default.profile/profile.cfg
index a4cc652..ab7d49c 100644
--- a/demos/profiles/registry/src/main/resources/default.profile/profile.cfg
+++ b/demos/profiles/registry/src/main/resources/default.profile/profile.cfg
@@ -22,12 +22,6 @@ library.jolokia-agent=mvn\:org.jolokia/jolokia-jvm/1.2.2/jar/agent
 
 org.ops4j.pax.url.mvn.repositories= \
     file:${runtime.home}/${karaf.default.repository}@snapshots@id=karaf-default, \
-    http://repo1.maven.org/maven2@id=central, \
-    https://repo.fusesource.com/nexus/content/groups/public@id=fusepublic, \
-    https://repository.jboss.org/nexus/content/repositories/public@id=jbosspublic, \
-    https://repo.fusesource.com/nexus/content/repositories/releases@id=jbossreleases, \
-    https://repo.fusesource.com/nexus/content/groups/ea@id=jbossearlyaccess, \
-    http://repository.springsource.com/maven/bundles/release@id=ebrreleases, \
-    http://repository.springsource.com/maven/bundles/external@id=ebrexternal
+    http://repo1.maven.org/maven2@id=central
 
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/demos/profiles/registry/src/main/resources/karaf.profile/profile.cfg
----------------------------------------------------------------------
diff --git a/demos/profiles/registry/src/main/resources/karaf.profile/profile.cfg b/demos/profiles/registry/src/main/resources/karaf.profile/profile.cfg
index 1ad1b57..3cd97d5 100644
--- a/demos/profiles/registry/src/main/resources/karaf.profile/profile.cfg
+++ b/demos/profiles/registry/src/main/resources/karaf.profile/profile.cfg
@@ -20,6 +20,7 @@ attribute.parents = default
 repository.karaf-enterprise = mvn\:org.apache.karaf.features/enterprise/${profile:version/karaf}/xml/features
 repository.karaf-standard = mvn\:org.apache.karaf.features/standard/${profile:version/karaf}/xml/features
 repository.karaf-spring = mvn\:org.apache.karaf.features/spring/${profile:version/karaf}/xml/features
+repository.karaf-spring-legacy = mvn\:org.apache.karaf.features/spring-legacy/${profile:version/karaf}/xml/features
 
 # lets include the camel, cxf and activemq features by default so they can be resolved automatically
when deploying projects
 repository.apache-camel = mvn\:org.apache.camel.karaf/apache-camel/${profile:version/camel}/xml/features

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
index a95b0f3..9f58b75 100644
--- a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
@@ -15,6 +15,7 @@ package org.apache.karaf.itests;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -25,17 +26,37 @@ import org.apache.karaf.jaas.boot.principal.RolePrincipal;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
 import java.lang.management.ManagementFactory;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class FeatureTest extends KarafTestSupport {
-    
-    
+
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Test
     public void bootFeatures() throws Exception {
         assertFeaturesInstalled("jaas", "ssh", "management", "bundle", "config", "deployer",
"diagnostic",

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 0bce5d9..e363b70 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -17,12 +17,16 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 
 import javax.jms.ConnectionFactory;
 import javax.management.MBeanServer;
@@ -30,12 +34,28 @@ import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 import java.net.Socket;
 import java.net.URI;
+import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class JmsTest extends KarafTestSupport {
-    
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Before
     public void installJmsFeatureAndActiveMQBroker() throws Exception {
         installAndAssertFeature("jms");

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index 8512d5a..555d521 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -21,18 +21,40 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class EnterpriseFeaturesTest extends KarafTestSupport {
 
     @Rule
     public RunIfRule rule = new RunIfRule();
-    
-    
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Test
     public void installTransaction130Feature() throws Exception {
         installAssertAndUninstallFeature("transaction", "1.3.2");

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
index f091b3d..201d1f9 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
@@ -19,17 +19,39 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class Spring3FeaturesTest extends KarafTestSupport {
 
     // Spring DM
-    
- 
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Test
     public void installSpringDmFeature() throws Exception {
         installAssertAndUninstallFeatures("spring-dm");

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java
index db189ea..a2ac077 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java
@@ -15,17 +15,41 @@ package org.apache.karaf.itests.features;
 
 import org.apache.karaf.itests.KarafTestSupport;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class Spring40FeaturesTest extends KarafTestSupport {
-    
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Test
     public void installSpringFeature() throws Exception {
         installAssertAndUninstallFeature("spring", System.getProperty("spring40.version"));

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java
index a055486..b5a700e 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java
@@ -18,14 +18,37 @@ import org.apache.karaf.itests.KarafTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class Spring41FeaturesTest extends KarafTestSupport {
-    
+
+    @Configuration
+    public Option[] config() {
+        String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+        result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+                        "mvn:org.apache.karaf.features/framework/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
+                        "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+        return result.toArray(new Option[result.size()]);
+    }
+
     @Test
     public void installSpringFeature() throws Exception {
         installAssertAndUninstallFeature("spring", System.getProperty("spring41.version"));

http://git-wip-us.apache.org/repos/asf/karaf/blob/13c7bf86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 971e391..397ec4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,6 +245,7 @@
         <hibernate3.version>3.3.2.GA</hibernate3.version>
         <hibernate42.version>4.2.15.Final</hibernate42.version>
         <hibernate43.version>4.3.6.Final</hibernate43.version>
+        <hibernate.version>5.2.6.Final</hibernate.version>
         <hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
         <jansi.version>1.14</jansi.version>
         <javassist.version>3.9.0.GA</javassist.version>


Mime
View raw message