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 2008/12/19 07:44:35 UTC

svn commit: r727947 - in /activemq/camel/branches/camel-1.x: ./ components/camel-velocity/pom.xml

Author: davsclaus
Date: Thu Dec 18 22:44:34 2008
New Revision: 727947

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

........
  r727946 | davsclaus | 2008-12-19 07:39:25 +0100 (fr, 19 dec 2008) | 1 line
  
  Upgraded to Velocity 1.6.1
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/components/camel-velocity/pom.xml

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 22:44:34 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946

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

Modified: activemq/camel/branches/camel-1.x/components/camel-velocity/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-velocity/pom.xml?rev=727947&r1=727946&r2=727947&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-velocity/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-velocity/pom.xml Thu Dec 18 22:44:34 2008
@@ -48,9 +48,9 @@
       <artifactId>camel-spring</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.5</version>
+      <version>1.6.1</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>