Author: dkulp
Date: Thu Dec 22 15:09:18 2011
New Revision: 1222271
URL: http://svn.apache.org/viewvc?rev=1222271&view=rev
Log:
Merged revisions 1202099 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1202099 | davsclaus | 2011-11-15 04:00:40 -0500 (Tue, 15 Nov 2011) | 1 line
Upgraded to scalate 1.5.3
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-web/pom.xml
Propchange: camel/branches/camel-2.8.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-web/pom.xml?rev=1222271&r1=1222270&r2=1222271&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-web/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-web/pom.xml Thu Dec 22 15:09:18
2011
@@ -30,7 +30,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
- <scalate-version>1.5.0</scalate-version>
+ <scalate-version>1.5.3</scalate-version>
<jersey-version>1.8</jersey-version>
<logback-version>0.9.29</logback-version>
<jetty-port>8080</jetty-port>
