Author: janstey
Date: Thu Aug 25 12:10:06 2011
New Revision: 1161530
URL: http://svn.apache.org/viewvc?rev=1161530&view=rev
Log:
Merged revisions 1161524 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1161524 | janstey | 2011-08-25 09:20:51 -0230 (Thu, 25 Aug 2011) | 1 line
CAMEL-4379 - upgrade jetty to version 7.4.5.v20110725
........
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 Thu Aug 25 12:10:06 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1161010
+/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1161010,1161524
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=1161530&r1=1161529&r2=1161530&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Thu Aug 25 12:10:06 2011
@@ -102,7 +102,7 @@
<javax-mail-version>1.4.4</javax-mail-version>
<jaxen-version>1.1.1</jaxen-version>
<jdom-version>1.1</jdom-version>
- <jetty-version>7.4.2.v20110526</jetty-version>
+ <jetty-version>7.4.5.v20110725</jetty-version>
<jettison-version>1.3</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.2</jibx-version>
