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/12/04 16:06:08 UTC
svn commit: r887221 - in /camel/branches/camel-1.x: ./
components/camel-blueprint/pom.xml components/camel-jpa/pom.xml
components/camel-osgi/pom.xml components/camel-spring/pom.xml
Author: ningjiang
Date: Fri Dec 4 15:06:08 2009
New Revision: 887221
URL: http://svn.apache.org/viewvc?rev=887221&view=rev
Log:
Merged revisions 887196 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r887196 | ningjiang | 2009-12-04 21:51:11 +0800 (Fri, 04 Dec 2009) | 1 line
CAMEL-2256, CAMEL-2257 clean up the OSGi headers
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-blueprint/pom.xml
camel/branches/camel-1.x/components/camel-jpa/pom.xml
camel/branches/camel-1.x/components/camel-osgi/pom.xml
camel/branches/camel-1.x/components/camel-spring/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 4 15:06:08 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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876
+/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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-blueprint/pom.xml?rev=887221&r1=887220&r2=887221&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-blueprint/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-blueprint/pom.xml Fri Dec 4 15:06:08 2009
@@ -34,7 +34,6 @@
<properties>
<camel.osgi.import>
!org.apache.camel.blueprint.*,
- !javax.xml.bind.annotation.adapters,
org.apache.camel.*;${camel.osgi.import.strict.version},
*
</camel.osgi.import>
Modified: camel/branches/camel-1.x/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jpa/pom.xml?rev=887221&r1=887220&r2=887221&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jpa/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-jpa/pom.xml Fri Dec 4 15:06:08 2009
@@ -34,11 +34,10 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.jpa.*,
+ org.apache.camel.component.jpa.*;${camel.osgi.version},
org.apache.camel.processor.idempotent.jpa.*
</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
- !javax.xml.bind.annotation.adapters,
!org.apache.camel.component.jpa.*,
!org.apache.camel.processor.idempotent.jpa.*,
org.apache.camel.*;${camel.osgi.import.camel.version},
Modified: camel/branches/camel-1.x/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/pom.xml?rev=887221&r1=887220&r2=887221&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-osgi/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-osgi/pom.xml Fri Dec 4 15:06:08 2009
@@ -37,7 +37,6 @@
org.apache.camel.osgi.*
</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
- !javax.xml.bind.annotation.adapters,
!org.apache.camel.osgi.*,
org.osgi.framework;version="[1.3,2)",
org.apache.camel.*;${camel.osgi.import.strict.version},
Modified: camel/branches/camel-1.x/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/pom.xml?rev=887221&r1=887220&r2=887221&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-spring/pom.xml Fri Dec 4 15:06:08 2009
@@ -39,7 +39,6 @@
!org.apache.camel.component.event,
!org.apache.camel.component.validator,
!org.apache.camel.component.xslt,
- !javax.xml.bind.annotation.adapters,
org.apache.camel.*;${camel.osgi.import.strict.version},
*
</camel.osgi.import>