You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/02/10 05:34:50 UTC

svn commit: r1242667 - in /camel/branches/camel-2.9.x: ./ parent/pom.xml

Author: hadrian
Date: Fri Feb 10 04:34:49 2012
New Revision: 1242667

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

........
  r1239462 | davsclaus | 2012-02-01 23:53:33 -0500 (Wed, 01 Feb 2012) | 1 line
  
  Upgraded Jetty to 7.5.4
........

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

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

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=1242667&r1=1242666&r2=1242667&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Feb 10 04:34:49 2012
@@ -103,7 +103,7 @@
     <jclouds-version>1.3.1</jclouds-version>
     <jclouds-feature-version>1.3.1</jclouds-feature-version>
     <jdom-version>1.1</jdom-version>
-    <jetty-version>7.5.3.v20111011</jetty-version>
+    <jetty-version>7.5.4.v20111024</jetty-version>
     <jettison-version>1.3</jettison-version>
     <jexcelapi-version>2.4.2</jexcelapi-version>
     <jibx-version>1.2.3</jibx-version>