You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/04/05 13:48:34 UTC
git commit: [KARAF-2883] Use better version range in Spring features
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 6118d6d4e -> a8b428941
[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/a8b42894
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a8b42894
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a8b42894
Branch: refs/heads/karaf-3.0.x
Commit: a8b428941aefc3592ce46e63f713571d6b1424d0
Parents: 6118d6d
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Apr 5 13:47:47 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Apr 5 13:47:47 2014 +0200
----------------------------------------------------------------------
.../spring/src/main/feature/feature.xml | 74 ++++++++++----------
.../standard/src/main/feature/feature.xml | 2 +-
pom.xml | 1 -
3 files changed, 38 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8b42894/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 b07a7f5..436b291 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -35,7 +35,7 @@
<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>
@@ -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="${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.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.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.springframework/org.springframework.transaction/${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="${http.feature.version}">http</feature>
+ <feature version="[${spring32.version},3.3)">spring</feature>
+ <feature>http</feature>
<bundle start-level="30">mvn:org.springframework/org.springframework.web/${spring32.version}</bundle>
<bundle start-level="30">mvn:org.springframework/org.springframework.web.servlet/${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.springframework/org.springframework.web.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="${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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8b42894/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 4ada1fd..a785feb 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -132,7 +132,7 @@
<config name="org.apache.karaf.webconsole">
realm=karaf
</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/a8b42894/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e02c9bc..532c026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,6 @@
<xbean.version>3.16</xbean.version>
<xerces.version>2.11.0</xerces.version>
<javax.mail.version>1.4.5</javax.mail.version>
- <http.feature.version>[3,4)</http.feature.version>
<weld.version>2.1.1.Final</weld.version>
<!-- Furter used maven plugin versions; e.g. in the docs -->