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 2011/12/09 15:38:05 UTC
svn commit: r1212446 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Fri Dec 9 14:38:05 2011
New Revision: 1212446
URL: http://svn.apache.org/viewvc?rev=1212446&view=rev
Log:
Merged revisions 1202214 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1202214 | ningjiang | 2011-11-15 22:47:54 +0800 (Tue, 15 Nov 2011) | 1 line
CAMEL-4684 Using commons-io 1.4 across camel components
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
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 Fri Dec 9 14:38:05 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1212446&r1=1212445&r2=1212446&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Fri Dec 9 14:38:05 2011
@@ -39,6 +39,7 @@
<aopalliance-bundle-version>1.0_3</aopalliance-bundle-version>
<asm-bundle-version>3.3_2</asm-bundle-version>
<aws-java-sdk-bundle-version>1.1.1_1</aws-java-sdk-bundle-version>
+ <bcpg-jdk16-bundle-version>1.46_1</bcpg-jdk16-bundle-version>
<bcel-bundle-version>5.2_3</bcel-bundle-version>
<cglib-version>2.1_3_6</cglib-version>
<cometd-java-server-bundle-version>2.3.1_1</cometd-java-server-bundle-version>
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=1212446&r1=1212445&r2=1212446&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 Fri Dec 9 14:38:05 2011
@@ -77,6 +77,8 @@
<feature name='camel-crypto' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcpg-jdk16/${bcpg-jdk16-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${pom.version}</bundle>
</feature>
<feature name='camel-http' version='${pom.version}' resolver='(obr)' start-level='50'>
@@ -223,8 +225,7 @@
<feature name='camel-exec' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle>
- <!-- Force the commons-io version as it's specific to camel-exec -->
- <bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle>mvn:org.apache.camel/camel-exec/${pom.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${pom.version}' resolver='(obr)' start-level='50'>