Author: dkulp
Date: Fri Jul 8 14:16:36 2011
New Revision: 1144327
URL: http://svn.apache.org/viewvc?rev=1144327&view=rev
Log:
Merged revisions 1144324 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1144324 | dkulp | 2011-07-08 10:13:51 -0400 (Fri, 08 Jul 2011) | 2 lines
[CAMEL-4195] Remove commons-pool from cxf feature
Tighten cxf version range
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 14:16:36 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925
+/camel/trunk:1083696,1083723-1083724,1084150,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1144327&r1=1144326&r2=1144327&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Fri Jul 8 14:16:36 2011
@@ -48,7 +48,6 @@
<bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
</feature>
<feature name='cxf' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle
dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
@@ -90,7 +89,7 @@
<feature name='camel-cxf' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-spring</feature>
<feature>jetty</feature>
- <feature version='[2.3,3)'>cxf</feature>
+ <feature version='[2.3,2.6)'>cxf</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
<feature name='camel-cache' version='${pom.version}' resolver='(obr)'
start-level='50'>
