You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/03/02 09:21:54 UTC
svn commit: r917912 - in /camel/trunk/platforms/karaf/features: pom.xml
src/main/resources/features.xml
Author: ningjiang
Date: Tue Mar 2 08:21:54 2010
New Revision: 917912
URL: http://svn.apache.org/viewvc?rev=917912&view=rev
Log:
CAMEL-2514 karaf features.xml should use servicemix commons-pool bundle
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=917912&r1=917911&r2=917912&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Mar 2 08:21:54 2010
@@ -52,6 +52,7 @@
<commons-lang-version>2.4</commons-lang-version>
<commons-net-version>2.0</commons-net-version>
<commons-management-version>1.0</commons-management-version>
+ <commons-pool-bundle-version>1.5.4_1</commons-pool-bundle-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
<flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
<freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
@@ -82,7 +83,7 @@
<juel-bundle-version>2.1.2_1</juel-bundle-version>
<junit-bundle-version>4.7_1</junit-bundle-version>
<jsmpp-bundle-version>2.0_2</jsmpp-bundle-version>
- <lucene-bundle-version>3.0.1</lucene-bundle-version>
+ <lucene-bundle-version>3.0.0_1-SNAPSHOT</lucene-bundle-version>
<mvel-bundle-version>2.0.8_3</mvel-bundle-version>
<mina-bundle-version>1.1.7_3</mina-bundle-version>
<neethi-bundle-version>2.0.4_2</neethi-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=917912&r1=917911&r2=917912&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Mar 2 08:21:54 2010
@@ -40,7 +40,7 @@
<bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
</feature>
<feature name='camel-cxf' version='${pom.version}'>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
@@ -127,7 +127,7 @@
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -153,7 +153,7 @@
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -229,7 +229,7 @@
</feature>
<feature name='camel-ibatis' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring-osgi</feature>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
@@ -282,7 +282,7 @@
<bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
@@ -357,7 +357,7 @@
</feature>
<feature name='camel-quartz' version='${pom.version}'>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>