Author: dkulp Date: Tue Aug 21 20:23:50 2012 New Revision: 1375756 URL: http://svn.apache.org/viewvc?rev=1375756&view=rev Log: Merged revisions 1375731 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1375731 | dkulp | 2012-08-21 15:28:27 -0400 (Tue, 21 Aug 2012) | 10 lines 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.9.x/parent/pom.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1375756&r1=1375755&r2=1375756&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Tue Aug 21 20:23:50 2012 @@ -113,7 +113,7 @@ <jsch-version>0.1.44-1</jsch-version> <juel-version>2.1.2</juel-version> <junit-version>4.8.1</junit-version> - <karaf-version>2.2.7</karaf-version> + <karaf-version>2.2.9</karaf-version> <krati-version>0.4.5</krati-version> <log4j-version>1.2.16</log4j-version> <lucene-version>3.0.3</lucene-version>
