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/30 06:30:59 UTC
svn commit: r820171 - in /camel/branches/camel-1.x: ./
components/camel-restlet/pom.xml parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Wed Sep 30 04:30:58 2009
New Revision: 820171
URL: http://svn.apache.org/viewvc?rev=820171&view=rev
Log:
Merged revisions 820152 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r820152 | ningjiang | 2009-09-30 10:37:31 +0800 (Wed, 30 Sep 2009) | 1 line
CAMEL-2046 fixed the camel-restlet features bundle issue
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-restlet/pom.xml
camel/branches/camel-1.x/parent/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 Wed Sep 30 04:30:58 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,819483,819956
+/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,819956,820152
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-restlet/pom.xml?rev=820171&r1=820170&r2=820171&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-restlet/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-restlet/pom.xml Wed Sep 30 04:30:58 2009
@@ -53,8 +53,7 @@
<!-- test artifacts -->
<dependency>
<groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.1.1</version>
+ <artifactId>com.noelios.restlet</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=820171&r1=820170&r2=820171&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Wed Sep 30 04:30:58 2009
@@ -768,6 +768,11 @@
<artifactId>org.restlet</artifactId>
<version>${restlet-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.noelios.restlet</groupId>
+ <artifactId>com.noelios.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
<!-- optional jakarta http core support -->
<dependency>
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=820171&r1=820170&r2=820171&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 Wed Sep 30 04:30:58 2009
@@ -301,6 +301,7 @@
<feature name='camel-restlet' version='${pom.version}'>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
<bundle>mvn:org.restlet/org.restlet/${restlet-version}</bundle>
+ <bundle>mvn:com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>