Author: davsclaus
Date: Sun Nov 16 00:07:51 2008
New Revision: 717990
URL: http://svn.apache.org/viewvc?rev=717990&view=rev
Log:
Merged revisions 717989 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r717989 | davsclaus | 2008-11-16 09:04:12 +0100 (so, 16 nov 2008) | 1 line
Upgraded to Jetty 6.1.14
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 16 00:07:51 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
+/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
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=717990&r1=717989&r2=717990&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Sun Nov 16 00:07:51 2008
@@ -48,7 +48,7 @@
<felix-osgi-version>1.2.0</felix-osgi-version>
<httpcore-version>4.0-beta3</httpcore-version>
<httpcore-niossl-version>4.0-alpha6</httpcore-niossl-version>
- <jetty-version>6.1.11</jetty-version>
+ <jetty-version>6.1.14</jetty-version>
<slf4j-version>1.5.5</slf4j-version>
<openjpa-version>1.2.0</openjpa-version>
<spring-version>2.5.6</spring-version>
