You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/08/17 20:16:31 UTC
[freemarker] 02/04: Updated version number to 2.3.30 nightly
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit f7a1013ecf9b5fa098eb8d47128c47ca8e9bf12d
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Aug 17 19:43:07 2019 +0200
Updated version number to 2.3.30 nightly
---
src/main/resources/freemarker/version.properties | 8 +++----
src/manual/en_US/book.xml | 28 +++++++++++++++++++++++-
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 4f58488..121ac78 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -56,11 +56,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.29
+version=2.3.30-nightly_@timestampInVersion@
# This exists as for Maven we use "-SNAPSHOT" for nightly releases,
# and no _nightly_@timestampInVersion@. For final releases it's the
# same as "version".
-mavenVersion=2.3.29
+mavenVersion=2.3.30-SNAPSHOT
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +73,7 @@ mavenVersion=2.3.29
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.29.stable
+versionForOSGi=2.3.30.nightly
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -92,7 +92,7 @@ versionForOSGi=2.3.29.stable
# "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.29
+versionForMf=2.3.29.97
# The date of the build.
# This should be automatically filled by the building tool (Ant).
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index dea0f3f..a49e8ea 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -30,7 +30,7 @@
<titleabbrev>Manual</titleabbrev>
- <productname>Freemarker 2.3.29</productname>
+ <productname>Freemarker 2.3.30</productname>
</info>
<preface role="index.html" xml:id="preface">
@@ -28669,6 +28669,32 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<appendix xml:id="app_versions">
<title>Version history</title>
+ <section xml:id="versions_2_3_30">
+ <title>2.3.30</title>
+
+ <para>Release date: [FIXME]</para>
+
+ <section>
+ <title>Changes on the FTL side</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>[TODO]</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Changes on the Java side</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>[TODO]</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ </section>
+
<section xml:id="versions_2_3_29">
<title>2.3.29</title>