Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 609AB200C05 for ; Mon, 23 Jan 2017 14:03:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5F299160B3E; Mon, 23 Jan 2017 13:03:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AAAD6160B49 for ; Mon, 23 Jan 2017 14:03:56 +0100 (CET) Received: (qmail 26707 invoked by uid 500); 23 Jan 2017 13:03:53 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 26667 invoked by uid 99); 23 Jan 2017 13:03:43 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2017 13:03:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 804A21A046F for ; Mon, 23 Jan 2017 13:03:42 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id yP_MKdnc0PYV for ; Mon, 23 Jan 2017 13:03:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id AFF4A5F610 for ; Mon, 23 Jan 2017 13:03:40 +0000 (UTC) Received: (qmail 24504 invoked by uid 99); 23 Jan 2017 13:03:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2017 13:03:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30641DFB0E; Mon, 23 Jan 2017 13:03:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Mon, 23 Jan 2017 13:03:38 -0000 Message-Id: <46c7feb0487d4a28a665797636fa0a42@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker-docgen git commit: Log FreeMarker version. Also increased it to 2.3.35. archived-at: Mon, 23 Jan 2017 13:03:57 -0000 Repository: incubator-freemarker-docgen Updated Branches: refs/heads/master 58d83ee4d -> 1a6495999 Log FreeMarker version. Also increased it to 2.3.35. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/f99ec0ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/f99ec0ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/f99ec0ba Branch: refs/heads/master Commit: f99ec0ba90317456b8f48d6596aacb36f6696291 Parents: 58d83ee Author: ddekany Authored: Mon Jan 23 14:01:56 2017 +0100 Committer: ddekany Committed: Mon Jan 23 14:02:29 2017 +0100 ---------------------------------------------------------------------- .classpath | 2 +- src/main/org/freemarker/docgen/Transform.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/.classpath ---------------------------------------------------------------------- diff --git a/.classpath b/.classpath index a3c6ca7..41463ae 100644 --- a/.classpath +++ b/.classpath @@ -8,6 +8,6 @@ - + http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/src/main/org/freemarker/docgen/Transform.java ---------------------------------------------------------------------- diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java index c379bf3..3a21f03 100644 --- a/src/main/org/freemarker/docgen/Transform.java +++ b/src/main/org/freemarker/docgen/Transform.java @@ -1240,7 +1240,8 @@ public final class Transform { throw new BugException(e); } - fmConfig = new Configuration(Configuration.VERSION_2_3_24); + logger.info("Using FreeMarker " + Configuration.getVersion()); + fmConfig = new Configuration(Configuration.VERSION_2_3_25); TemplateLoader templateLoader = new ClassTemplateLoader( Transform.class, "templates");