Repository: karaf Updated Branches: refs/heads/karaf-2.x 17c207c1e -> 83e2c42a2
[KARAF-2883] Use better version range in Spring features Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/83e2c42a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/83e2c42a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/83e2c42a Branch: refs/heads/karaf-2.x Commit: 83e2c42a2878ba2eb40da25ee54b66112ab709ed Parents: 17c207c Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Apr 6 11:38:24 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Apr 6 11:38:24 2014 +0200 ---------------------------------------------------------------------- .../standard/src/main/resources/features.xml | 104 +++++++++---------- pom.xml | 1 - 2 files changed, 52 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/83e2c42a/assemblies/features/standard/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/resources/features.xml b/assemblies/features/standard/src/main/resources/features.xml index 2a53f7c..593992b 100644 --- a/assemblies/features/standard/src/main/resources/features.xml +++ b/assemblies/features/standard/src/main/resources/features.xml @@ -65,8 +65,8 @@ </feature> <feature name="spring-web" description="Spring 2 Web support" version="${spring2.version}" resolver="(obr)"> - <feature version="${spring2.version}">spring</feature> - <feature version="${http.feature.version}">http</feature> + <feature version="[${spring2.version},2.6)">spring</feature> + <feature>http</feature> <bundle start-level="30">mvn:org.springframework/spring-web/${spring2.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring2.version}</bundle> </feature> @@ -85,7 +85,7 @@ </feature> <feature name="spring-aspects" description="Spring AOP support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> + <feature version="[${spring30.version},3.1)">spring</feature> <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring30.version}</bundle> </feature> @@ -102,22 +102,22 @@ <feature name="spring-dm-web" description="Spring DM Web Support" version="${spring.osgi.version}" resolver="(obr)"> <feature version="${spring.osgi.version}">spring-dm</feature> <feature version="[2.5.6,4)">spring-web</feature> - <feature version="${http.feature.version}">http</feature> + <feature>http</feature> <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle> </feature> <feature name="spring-instrument" description="Spring Instrument support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> + <feature version="[${spring30.version},3.1)">spring</feature> <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring30.version}</bundle> </feature> <feature name="spring-jdbc" description="Spring JDBC support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring-tx</feature> + <feature version="[${spring30.version},3.1)">spring-tx</feature> <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring30.version}</bundle> </feature> <feature name="spring-jms" description="Spring JMS support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring-web</feature> + <feature version="[${spring30.version},3.1)">spring-web</feature> <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle 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/${spring30.version}</bundle> @@ -125,7 +125,7 @@ </feature> <feature name="spring-struts" description="Spring Struts support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring-web</feature> + <feature version="[${spring30.version},3.1)">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> @@ -134,34 +134,34 @@ </feature> <feature name="spring-test" description="Spring Test support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> + <feature version="[${spring30.version},3.1)">spring</feature> <bundle start-level="30">mvn:org.springframework/spring-test/${spring30.version}</bundle> </feature> <feature name="spring-orm" description="Spring ORM support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring-jdbc</feature> + <feature version="[${spring30.version},3.1)">spring-jdbc</feature> <bundle start-level="30">mvn:org.springframework/spring-orm/${spring30.version}</bundle> </feature> <feature name="spring-oxm" description="Spring OXM support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> + <feature version="[${spring30.version},3.1)">spring</feature> <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring30.version}</bundle> </feature> <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> + <feature version="[${spring30.version},3.1)">spring</feature> <bundle start-level="30">mvn:org.springframework/spring-tx/${spring30.version}</bundle> </feature> <feature name="spring-web" description="Spring Web support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring</feature> - <feature version="${http.feature.version}">http</feature> + <feature version="[${spring30.version},3.1)">spring</feature> + <feature>http</feature> <bundle start-level="30">mvn:org.springframework/spring-web/${spring30.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring30.version}</bundle> </feature> <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring30.version}" resolver="(obr)"> - <feature version="${spring30.version}">spring-web</feature> + <feature version="[${spring30.version},3.1)">spring-web</feature> <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring30.version}</bundle> </feature> @@ -180,29 +180,29 @@ </feature> <feature name="spring-aspects" description="Spring 3.1 AOP support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> + <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 Instrument support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> + <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 JDBC support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring-tx</feature> + <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 JMS support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring-tx</feature> + <feature version="[${spring31.version},3.2)">spring-tx</feature> <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle 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 Struts support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring-web</feature> + <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> @@ -211,34 +211,34 @@ </feature> <feature name="spring-test" description="Spring 3.1 Test support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> + <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 ORM support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring-jdbc</feature> + <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 OXM support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> + <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 Transaction (TX) support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> + <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 Web support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring</feature> - <feature version="${http.feature.version}">http</feature> + <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 Web Portlet support" version="${spring31.version}" resolver="(obr)"> - <feature version="${spring31.version}">spring-web</feature> + <feature version="[${spring31.version},3.2)">spring-web</feature> <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle> </feature> @@ -256,29 +256,29 @@ </feature> <feature name="spring-aspects" description="Spring 3.2 AOP support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> + <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 Instrument support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> + <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 JDBC support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring-tx</feature> + <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 JMS support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring-tx</feature> + <feature version="[${spring32.version},3.3)">spring-tx</feature> <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle 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 Struts support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring-web</feature> + <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> @@ -287,34 +287,34 @@ </feature> <feature name="spring-test" description="Spring 3.2 Test support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> + <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 ORM support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring-jdbc</feature> + <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 OXM support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> + <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 Transaction (TX) support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> + <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 Web support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring</feature> - <feature version="${http.feature.version}">http</feature> + <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 Web Portlet support" version="${spring32.version}" resolver="(obr)"> - <feature version="${spring32.version}">spring-web</feature> + <feature version="[${spring32.version},3.3)">spring-web</feature> <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle> </feature> @@ -332,62 +332,62 @@ </feature> <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring-tx</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring-tx</feature> + <feature version="[${spring40.version},4.1)">spring-tx</feature> <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle 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}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring-jdbc</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring</feature> - <feature version="${http.feature.version}">http</feature> + <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}" resolver="(obr)"> - <feature version="${spring40.version}">spring-web</feature> + <feature version="[${spring40.version},4.1)">spring-web</feature> <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</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}" resolver="(obr)"> - <feature version="${spring40.version}">spring-web</feature> + <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> @@ -449,7 +449,7 @@ realm=karaf role=${karaf.admin.role} </config> - <feature version="${http.feature.version}">http</feature> + <feature>http</feature> <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/83e2c42a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 86fd72d..e06c3f5 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,6 @@ <xerces.version>2.11.0</xerces.version> <javax.mail.version>1.4.5</javax.mail.version> <weld.version>2.1.1.Final</weld.version> - <http.feature.version>[2,3)</http.feature.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory> <bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
