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 2012/01/06 09:43:22 UTC
svn commit: r1228018 - in /camel/branches/camel-2.9.x: ./
components/camel-http/ parent/pom.xml
Author: davsclaus
Date: Fri Jan 6 08:43:21 2012
New Revision: 1228018
URL: http://svn.apache.org/viewvc?rev=1228018&view=rev
Log:
CAMEL-4864: Upgrade to Karaf 2.2.5
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
camel/branches/camel-2.9.x/parent/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 08:43:21 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540
+/camel/trunk:1227209,1227212,1227540,1228015
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 6 08:43:21 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 08:43:21 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015
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=1228018&r1=1228017&r2=1228018&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Jan 6 08:43:21 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.4</karaf-version>
+ <karaf-version>2.2.5</karaf-version>
<krati-version>0.4.1</krati-version>
<log4j-version>1.2.16</log4j-version>
<lucene-version>3.0.3</lucene-version>