You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/12 09:20:19 UTC
svn commit: r1169627 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Mon Sep 12 07:20:18 2011
New Revision: 1169627
URL: http://svn.apache.org/viewvc?rev=1169627&view=rev
Log:
Merged revisions 1169620 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 07:20:18 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1169627&r1=1169626&r2=1169627&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Mon Sep 12 07:20:18 2011
@@ -499,8 +499,8 @@
</feature>
<feature name='camel-restlet' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle dependency="true">mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
- <bundle>mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}</bundle>
</feature>
<feature name='camel-rmi' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>