Author: dkulp
Date: Tue Aug 21 19:28:27 2012
New Revision: 1375731
URL: http://svn.apache.org/viewvc?rev=1375731&view=rev
Log:
Merged revisions 1374747 via git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk
........
r1374747 | davsclaus | 2012-08-19 08:51:41 -0400 (Sun, 19 Aug 2012) | 2 lines
Upgraded to Karaf 2.2.9
........
Modified:
camel/branches/camel-2.10.x/parent/pom.xml
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1375731&r1=1375730&r2=1375731&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Tue Aug 21 19:28:27 2012
@@ -127,7 +127,7 @@
<junit-version>4.10</junit-version>
<jt400-version>6.0</jt400-version>
<jaxb2-plugin-version>0.8.1</jaxb2-plugin-version>
- <karaf-version>2.2.8</karaf-version>
+ <karaf-version>2.2.9</karaf-version>
<krati-version>0.4.5</krati-version>
<leveldbjni-version>1.2</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>