camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1185274 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml
Date Mon, 17 Oct 2011 16:08:12 GMT
Author: dkulp
Date: Mon Oct 17 16:08:11 2011
New Revision: 1185274

URL: http://svn.apache.org/viewvc?rev=1185274&view=rev
Log:
Merged revisions 1185026 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1185026 | jbonofre | 2011-10-17 03:12:06 -0400 (Mon, 17 Oct 2011) | 1 line
  
  [CAMEL-4550] Upgrade to Karaf 2.2.4
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/parent/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 16:08:11 2011
@@ -1 +1 @@
-/camel/trunk:1183621,1184812-1184814,1184983-1184987,1185193
+/camel/trunk:1183621,1184812-1184814,1184983-1184987,1185026,1185193

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1185274&r1=1185273&r2=1185274&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Oct 17 16:08:11 2011
@@ -111,7 +111,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-SNAPSHOT</karaf-version>
+    <karaf-version>2.2.4</karaf-version>
     <log4j-version>1.2.16</log4j-version>
     <lucene-version>3.0.3</lucene-version>
     <mina-version>1.1.7</mina-version>



Mime
View raw message