karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: Use better version range in Spring features
Date Sat, 05 Apr 2014 05:09:02 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 69f1ddcc8 -> 3b3cfaad2


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/3b3cfaad
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3b3cfaad
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3b3cfaad

Branch: refs/heads/master
Commit: 3b3cfaad25d72433994dc9d79e8d224f0a98b33c
Parents: 69f1ddc
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sat Apr 5 07:08:31 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sat Apr 5 07:08:31 2014 +0200

----------------------------------------------------------------------
 .../spring/src/main/feature/feature.xml         | 66 ++++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3b3cfaad/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 530b196..768d9c3 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -54,29 +54,29 @@
     </feature>
 
     <feature name="spring-aspects" description="Spring 3.1.x 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.x 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.x 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.x 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.x 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>
@@ -85,34 +85,34 @@
     </feature>
 
     <feature name="spring-test" description="Spring 3.1.x 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.x 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.x 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.x 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.x Web support" version="${spring31.version}"
resolver="(obr)">
-    	<feature version="${spring31.version}">spring</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.x 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>
@@ -131,29 +131,29 @@
     </feature>
 
     <feature name="spring-aspects" description="Spring 3.2.x 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.x 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.x 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.x 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.x 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>
@@ -162,34 +162,34 @@
     </feature>
 
     <feature name="spring-test" description="Spring 3.2.x 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.x 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.x 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.x 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.x Web support" version="${spring32.version}"
resolver="(obr)">
-        <feature version="${spring32.version}">spring</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.x 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>
@@ -208,62 +208,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="[${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>
 


Mime
View raw message