Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 47EDC197EE for ; Sat, 26 Mar 2016 15:41:21 +0000 (UTC) Received: (qmail 30465 invoked by uid 500); 26 Mar 2016 15:41:21 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 30442 invoked by uid 500); 26 Mar 2016 15:41:21 -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 30398 invoked by uid 99); 26 Mar 2016 15:41:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Mar 2016 15:41:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 789C3C0338 for ; Sat, 26 Mar 2016 15:41:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 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=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id KMRWaYynnnJf for ; Sat, 26 Mar 2016 15:41:19 +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 780635FB61 for ; Sat, 26 Mar 2016 15:41:17 +0000 (UTC) Received: (qmail 29759 invoked by uid 99); 26 Mar 2016 15:41:16 -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; Sat, 26 Mar 2016 15:41:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FBD8E981A; Sat, 26 Mar 2016 15:41:16 +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: Sat, 26 Mar 2016 15:41:38 -0000 Message-Id: In-Reply-To: <8c7376f324c743db965a0b1f464bdb3b@git.apache.org> References: <8c7376f324c743db965a0b1f464bdb3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/32] incubator-freemarker git commit: Updating version number for 2.3.24 Updating version number for 2.3.24 Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3f9de1c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3f9de1c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3f9de1c1 Branch: refs/heads/2.3 Commit: 3f9de1c1918ff447f1f0b86f2f5dfa662b93794b Parents: 9c68f49 Author: ddekany Authored: Sun Mar 20 19:30:44 2016 +0100 Committer: ddekany Committed: Sun Mar 20 19:30:44 2016 +0100 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3f9de1c1/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index e209196..11cca04 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -57,11 +57,11 @@ # continue working without modification or recompilation. # - When the major version number is increased, major backward # compatibility violations are allowed, but still should be avoided. -version=2.3.24-rc01-incubating +version=2.3.24-incubating # This exists as oss.sonatype only allows SNAPSHOT and final releases, # so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT there. # For final releases it's the same as "version". -mavenVersion=2.3.24-rc01-incubating +mavenVersion=2.3.24-incubating # Version string that conforms to OSGi # ------------------------------------ @@ -75,7 +75,7 @@ mavenVersion=2.3.24-rc01-incubating # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ # During Apache Incubation, "-incubating" is added to this string. -versionForOSGi=2.3.24.rc01-incubating +versionForOSGi=2.3.24.stable-incubating # Version string that conforms to legacy MF # ----------------------------------------- @@ -93,7 +93,7 @@ versionForOSGi=2.3.24.rc01-incubating # "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build. # In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is # 2.X-1.(99|98).Y. Note the X-1. -versionForMf=2.3.23.99.1 +versionForMf=2.3.24 # The date of the build. # This should be automatically filled by the building tool (Ant).