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 2009/09/29 05:31:25 UTC
svn commit: r819821 - in /camel/branches/camel-1.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Tue Sep 29 03:31:24 2009
New Revision: 819821
URL: http://svn.apache.org/viewvc?rev=819821&view=rev
Log:
Merged revisions 819483 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r819483 | gnodet | 2009-09-28 17:22:45 +0800 (Mon, 28 Sep 2009) | 1 line
Use latest servicemix bundles for features
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 29 03:31:24 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=819821&r1=819820&r2=819821&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Sep 29 03:31:24 2009
@@ -34,22 +34,24 @@
<name>Camel :: Platforms :: Apache Karaf :: Features</name>
<properties>
- <abdera-bundle-version>0.4.0-incubating_1</abdera-bundle-version>
- <ant-bundle-version>1.7.0_1</ant-bundle-version>
- <antlr-bundle-version>3.0.1_1</antlr-bundle-version>
- <aopalliance-bundle-version>1.0_1</aopalliance-bundle-version>
- <asm-bundle-version>2.2.3_1</asm-bundle-version>
- <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
- <cglib-version>2.1_3_2</cglib-version>
- <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
- <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
- <commons-csv-version>1.0-r706899_1</commons-csv-version>
- <commons-codec-bundle-version>1.2_1</commons-codec-bundle-version>
- <commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
+ <abdera-bundle-version>0.4.0-incubating_2-SNAPSHOT</abdera-bundle-version>
+ <ant-bundle-version>1.7.0_2-SNAPSHOT</ant-bundle-version>
+ <antlr-bundle-version>3.0.1_2-SNAPSHOT</antlr-bundle-version>
+ <aopalliance-bundle-version>1.0_2-SNAPSHOT</aopalliance-bundle-version>
+ <asm-bundle-version>2.2.3_2-SNAPSHOT</asm-bundle-version>
+ <bcel-bundle-version>5.2_1-SNAPSHOT</bcel-bundle-version>
+ <dom4j-bundle-version>1.6.1_1-SNAPSHOT</dom4j-bundle-version>
+ <cglib-version>2.1_3_3-SNAPSHOT</cglib-version>
+ <commons-beanutils-bundle-version>1.7.0_2-SNAPSHOT</commons-beanutils-bundle-version>
+ <commons-dbcp-bundle-version>1.2.2_4-SNAPSHOT</commons-dbcp-bundle-version>
+ <commons-csv-version>1.0-r706899_2-SNAPSHOT</commons-csv-version>
+ <commons-codec-bundle-version>1.3_1-SNAPSHOT</commons-codec-bundle-version>
+ <commons-httpclient-bundle-version>3.1_2-SNAPSHOT</commons-httpclient-bundle-version>
<commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.4</commons-lang-version>
<commons-net-version>2.0</commons-net-version>
+ <el-api-1.0-version>1.0.1</el-api-1.0-version>
<freemarker-bundle-version>2.3.15_2-SNAPSHOT</freemarker-bundle-version>
<flatpack-bundle-version>3.1.1_2-SNAPSHOT</flatpack-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
@@ -71,23 +73,25 @@
<jdom-bundle-version>1.1_1</jdom-bundle-version>
<jettison-bundle-version>1.0.1_1</jettison-bundle-version>
<jetty-bundle-version>6.1.14_1</jetty-bundle-version>
- <jetty-cometd-bundle-version>6.1.11_1</jetty-cometd-bundle-version>
+ <jetty-cometd-bundle-version>6.1.11_2-SNAPSHOT</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_1</jodatime-bundle-version>
- <josql-bundle-version>1.5_1</josql-bundle-version>
+ <josql-bundle-version>1.5_2-SNAPSHOT</josql-bundle-version>
<jsch-bundle-version>0.1.31_1</jsch-bundle-version>
+ <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.0_1</juel-bundle-version>
<junit-bundle-version>4.4_1</junit-bundle-version>
+ <mvel-bundle-version>2.0.8_2-SNAPSHOT</mvel-bundle-version>
<mina-bundle-version>1.1.7_2-SNAPSHOT</mina-bundle-version>
<mvel-bundle-version>2.0.9_1</mvel-bundle-version>
<neethi-bundle-version>2.0.4_1</neethi-bundle-version>
- <ognl-bundle-version>2.7.3_1</ognl-bundle-version>
- <oro-bundle-version>2.0.8_1</oro-bundle-version>
+ <ognl-bundle-version>2.7.3_2-SNAPSHOT</ognl-bundle-version>
+ <oro-bundle-version>2.0.8_2-SNAPSHOT</oro-bundle-version>
<openjpa-bundle-version>1.2.1_1-SNAPSHOT</openjpa-bundle-version>
- <oscache-bundle-version>2.4_1</oscache-bundle-version>
- <quartz-bundle-version>1.6.1_1</quartz-bundle-version>
- <qpid-bundle-version>1.0-incubating-M2.1_1</qpid-bundle-version>
- <saxon-bundle-version>9.1.0.1_1</saxon-bundle-version>
+ <oscache-bundle-version>2.4_2-SNAPSHOT</oscache-bundle-version>
+ <quartz-bundle-version>1.6.1_2-SNAPSHOT</quartz-bundle-version>
+ <qpid-bundle-version>0.5.0_1-SNAPSHOT</qpid-bundle-version>
+ <saxon-bundle-version>9.1.0.1_2-SNAPSHOT</saxon-bundle-version>
<servicemix-specs-version>1.4-SNAPSHOT</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_1-SNAPSHOT</serp-bundle-version>
@@ -96,16 +100,17 @@
<spring-osgi-version>1.2.0</spring-osgi-version>
<spring-commons-collections-version>3.2.1</spring-commons-collections-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
- <tagsoup-bundle-version>1.2_1</tagsoup-bundle-version>
- <velocity-bundle-version>1.6.2_1</velocity-bundle-version>
- <xerces-bundle-version>2.9.1_1</xerces-bundle-version>
+ <stringtemplate-bundle-version>3.2_2-SNAPSHOT</stringtemplate-bundle-version>
+ <tagsoup-bundle-version>1.2_2-SNAPSHOT</tagsoup-bundle-version>
+ <velocity-bundle-version>1.6.2_2-SNAPSHOT</velocity-bundle-version>
+ <xalan-bundle-version>2.7.1_2-SNAPSHOT</xalan-bundle-version>
+ <xerces-bundle-version>2.9.1_2-SNAPSHOT</xerces-bundle-version>
<xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
<xmlschema-version>1.4.5</xmlschema-version>
<xmlsec-bundle-version>1.4.3_1-SNAPSHOT</xmlsec-bundle-version>
- <xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
- <xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
- <xstream-bundle-version>1.3_1</xstream-bundle-version>
+ <xmlresolver-bundle-version>1.2_2-SNAPSHOT</xmlresolver-bundle-version>
+ <xpp3-bundle-version>1.1.4c_2-SNAPSHOT</xpp3-bundle-version>
+ <xstream-bundle-version>1.3_2-SNAPSHOT</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
<woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
Modified: camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=819821&r1=819820&r2=819821&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml Tue Sep 29 03:31:24 2009
@@ -38,6 +38,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-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.bcel/${bcel-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -47,7 +50,6 @@
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
@@ -95,13 +97,16 @@
<bundle>mvn:org.apache.camel/camel-jms/${pom.version}</bundle>
</feature>
<feature name='camel-amqp' version='${pom.version}'>
+ <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid-bundle-version}</bundle>
<feature version='${pom.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle>
</feature>
<feature name='camel-atom' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
@@ -120,7 +125,7 @@
<bundle>mvn:org.apache.camel/camel-bam/${pom.version}</bundle>
</feature>
<feature name='camel-csv' version='${pom.version}'>
- <bundle>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle>
</feature>
@@ -165,6 +170,7 @@
</feature>
<feature name='camel-hl7' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
@@ -173,6 +179,7 @@
<feature name='camel-ibatis' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
@@ -233,6 +240,12 @@
<bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle>
</feature>
<feature name='camel-jxpath' version='${pom.version}'>
+ <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${el-api-1.0-version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${jsp-api-2.1-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jxpath/${pom.version}</bundle>
@@ -329,7 +342,7 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
</feature>
- <feature name='camel-stringtemplate' version='${pom.version}'>
+ <feature name='camel-string-template' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
@@ -341,6 +354,7 @@
<bundle>mvn:org.apache.camel/camel-tagsoup/${pom.version}</bundle>
</feature>
<feature name='camel-velocity' version='${pom.version}'>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>