On Thu, Nov 12, 2009 at 9:23 AM, Willem Jiang <willem.ji...@gmail.com> wrote: > Now we have the problem of SNAPSHOT dependency on the ServiceMix Java > Persistence API spec which will make OpenJPA bundle working in ServiceMix. > > Maybe we can ask SMX to do that spec release before Camel 1.6.x.
We dont really have time for that if it takes 72 hours + more to do a spec release. Is it possible to use a non SNAPSHOT version? Then if the spec has been released we can upgrade. But I would like the source code in 1.x to be ready for a release. > > Willem > > Willem Jiang wrote: >> >> It's because the we added the version range of camel components import >> packages to support deploy camel-1.x and camel 2.x bundle into the same OSGi >> container such as ServiceMix. >> >> I just ran the validation with the karaf plugin on the latest >> features.xml, there are lots import packages can't be resolved. >> So I will revert the change and make sure there is no SNAPSHOT dependency >> on the features file. >> >> Willem >> >> Jon Anstey wrote: >>> >>> I started rolling back some of the 1.x OSGi stuff because we are >>> releasing soon and we didn't want >>> >>> (1) a SNAPSHOT dependency on karaf, and >>> (2) the latest dependencies that we upgraded to on trunk are not the same >>> as what was needed on the 1.x branch. Figured we didn't want to upgrade >>> nearly every 3rd party dependency :) >>> >>> Though, if the newer bundles are absolutely necessary, I guess we can use >>> them... Also, I'm guessing I don''t have the whole story here of why we >>> upgraded them in the first place... >>> >>> Cheers, >>> Jon >>> >>> On Wed, Nov 11, 2009 at 10:08 PM, Willem Jiang <willem.ji...@gmail.com >>> <mailto:willem.ji...@gmail.com>> wrote: >>> >>> Hi Jon, >>> >>> Can you tell me why you rollback the merge of camel-1.x karaf >>> features? >>> >>> As Gnodet did some change on the camel-1.x bundle pulgin, there are >>> some change on the camel bundles, we need to make sure we are using >>> the latest SMX bundles in the feature. >>> >>> Willem >>> >>> >>> jans...@apache.org <mailto:jans...@apache.org> wrote: >>> >>> Author: janstey >>> Date: Wed Nov 11 16:19:37 2009 >>> New Revision: 834943 >>> >>> URL: http://svn.apache.org/viewvc?rev=834943&view=rev >>> <http://svn.apache.org/viewvc?rev=834943&view=rev> >>> Log: >>> Rolled back revisions 830493 via svnmerge from >>> http://svn.apache.org/repos/asf/camel/trunk >>> >>> Modified: >>> camel/branches/camel-1.x/ (props changed) >>> camel/branches/camel-1.x/platforms/karaf/features/pom.xml >>> >>> Propchange: camel/branches/camel-1.x/ >>> >>> ------------------------------------------------------------------------------ >>> --- svn:mergeinfo (original) >>> +++ svn:mergeinfo Wed Nov 11 16:19:37 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,7 >>> >>> 81 >>> >>> >>> 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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,826977,828288,828333,829900,830052,830493,832647,833285,833289,833350,833370,833381,833419 >>> >>> +/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,7 >>> >>> 81 >>> >>> >>> 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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,826977,828288,828333,829900,830052,832647,833285,833289,833350,833370,833381,833419 >>> >>> 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=834943&r1=834942&r2=834943&view=diff >>> >>> <http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=834943&r1=834942&r2=834943&view=diff> >>> >>> ============================================================================== >>> --- camel/branches/camel-1.x/platforms/karaf/features/pom.xml >>> (original) >>> +++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml >>> Wed Nov 11 16:19:37 2009 >>> @@ -41,12 +41,12 @@ >>> <bcel-bundle-version>5.2_2</bcel-bundle-version> >>> <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version> >>> <cglib-version>2.1_3_4</cglib-version> >>> - >>> <commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version> >>> + >>> <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version> >>> >>> <commons-dbcp-bundle-version>1.2.2_5</commons-dbcp-bundle-version> >>> <commons-csv-version>1.0-r706899_3</commons-csv-version> >>> >>> <commons-codec-bundle-version>1.3_2</commons-codec-bundle-version> >>> >>> <commons-httpclient-bundle-version>3.1_4</commons-httpclient-bundle-version> >>> - >>> <commons-io-bundle-version>1.3.2_3</commons-io-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> >>> @@ -61,25 +61,27 @@ >>> >>> <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version> >>> >>> <hamcrest-bundle-version>1.2-dev1_3</hamcrest-bundle-version> >>> <hapi-bundle-version>0.5.1_1</hapi-bundle-version> >>> - <ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version> >>> + <ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version> >>> <jackrabbit-version>1.5.3</jackrabbit-version> >>> - <jaxb-bundle-version>2.1.12_1</jaxb-bundle-version> >>> - >>> <jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version> >>> + <jaxb-bundle-version>2.1.6_1</jaxb-bundle-version> >>> + >>> <jexcelapi-bundle-version>2.4.2_1</jexcelapi-bundle-version> >>> + >>> <jsr311-api-1.0-spec-version>1.3.0</jsr311-api-1.0-spec-version> >>> + <hapi-bundle-version>0.5.1_1</hapi-bundle-version> >>> >>> <httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version> >>> - <irclib-bundle-version>1.10_2</irclib-bundle-version> >>> + <irclib-bundle-version>1.10_1</irclib-bundle-version> >>> >>> <isorelax-bundle-version>20050913_1</isorelax-bundle-version> >>> - <jcr-bundle-version>1.0_2</jcr-bundle-version> >>> - <jdom-bundle-version>1.1_2</jdom-bundle-version> >>> + <jcr-bundle-version>1.0_1</jcr-bundle-version> >>> + <jdom-bundle-version>1.1_1</jdom-bundle-version> >>> <jettison-bundle-version>1.1</jettison-bundle-version> >>> - <jetty-bundle-version>6.1.14_2</jetty-bundle-version> >>> + <jetty-bundle-version>6.1.14_1</jetty-bundle-version> >>> >>> <jetty-cometd-bundle-version>6.1.11_3</jetty-cometd-bundle-version> >>> <jing-bundle-version>20030619_1</jing-bundle-version> >>> - <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version> >>> + <jodatime-bundle-version>1.5.2_1</jodatime-bundle-version> >>> <josql-bundle-version>1.5_3</josql-bundle-version> >>> - <jsch-bundle-version>0.1.31_3</jsch-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_2</juel-bundle-version> >>> - <junit-bundle-version>4.7_1</junit-bundle-version> >>> + <juel-bundle-version>2.1.0_1</juel-bundle-version> >>> + <junit-bundle-version>4.4_1</junit-bundle-version> >>> <mina-bundle-version>1.1.7_3</mina-bundle-version> >>> <neethi-bundle-version>2.0.4_1</neethi-bundle-version> >>> <ognl-bundle-version>2.7.3_3</ognl-bundle-version> >>> @@ -92,6 +94,7 @@ >>> >>> <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_2</serp-bundle-version> >>> + <snmp4j-bundle-version>1.8.1_1</snmp4j-bundle-version> >>> <smack-bundle-version>3.0.4_2</smack-bundle-version> >>> <spring-version>2.5.6.SEC01</spring-version> >>> <spring-osgi-version>1.2.0</spring-osgi-version> >>> @@ -108,9 +111,9 @@ >>> >>> <xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version> >>> <xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version> >>> <xstream-bundle-version>1.3_3</xstream-bundle-version> >>> - >>> <werken-xpath-bundle-version>0.9.4_3</werken-xpath-bundle-version> >>> - <woodstox-bundle-version>3.2.8_1</woodstox-bundle-version> >>> - <wsdl4j-bundle-version>1.6.2_2</wsdl4j-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> >>> </properties> >>> <repositories> >>> >>> >>> >>> >>> >>> >>> >>> -- >>> Cheers, >>> Jon >>> >>> Camel in Action: http://manning.com/ibsen >>> Blog: http://janstey.blogspot.com >> >> > > -- Claus Ibsen Apache Camel Committer Author of Camel in Action: http://www.manning.com/ibsen/ Open Source Integration: http://fusesource.com Blog: http://davsclaus.blogspot.com/ Twitter: http://twitter.com/davsclaus
