Return-Path: 
 <commits-return-15410-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 40B4D4497
	for <apmail-camel-commits-archive@www.apache.org>;
 Thu, 19 May 2011 09:06:05 +0000 (UTC)
Received: (qmail 24636 invoked by uid 500); 19 May 2011 09:06:05 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 24601 invoked by uid 500); 19 May 2011 09:06:05 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 24594 invoked by uid 99); 19 May 2011 09:06:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 09:06:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2011 09:06:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0D29C23889E1; Thu, 19 May 2011 09:05:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1124618 - in /camel/trunk: parent/pom.xml
 platforms/karaf/features/pom.xml
Date: Thu, 19 May 2011 09:05:43 -0000
To: commits@camel.apache.org
From: ningjiang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110519090544.0D29C23889E1@eris.apache.org>

Author: ningjiang
Date: Thu May 19 09:05:43 2011
New Revision: 1124618

URL: http://svn.apache.org/viewvc?rev=1124618&view=rev
Log:
CAMEL-3990 Upgrade FreeMarker to 2.3.17

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1124618&r1=1124617&r2=1124618&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu May 19 09:05:43 2011
@@ -62,7 +62,7 @@
     <flatpack-version>3.2.0_1</flatpack-version>
     <ftpserver-version>1.0.5</ftpserver-version>
     <fuse-commons-management-version>1.0</fuse-commons-management-version>
-    <freemarker-version>2.3.16</freemarker-version>
+    <freemarker-version>2.3.17</freemarker-version>
     <geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>
     <geronimo-j2ee-connector-spec-version>2.0.0</geronimo-j2ee-connector-spec-version>
     <geronimo-j2ee-jacc-spec-version>1.1</geronimo-j2ee-jacc-spec-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1124618&r1=1124617&r2=1124618&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu May 19 09:05:43 2011
@@ -63,7 +63,7 @@
       <flatpack-bundle-version>3.2.0_1</flatpack-bundle-version>
       <felix.configadmin.version>1.2.4</felix.configadmin.version>
       <felix.framework.version>2.0.5</felix.framework.version>
-      <freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
+      <freemarker-bundle-version>2.3.17_1-SNAPSHOT</freemarker-bundle-version>
       <geronimo-el-version>1.0.1</geronimo-el-version>
       <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
       <geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>