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 2021/02/09 21:30:26 UTC
[freemarker] branch 2.3-gae updated (1f0b69f -> 8d15d85)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from 1f0b69f Disabled accessing local maven repo from Ivy, as "changing" Maven dependencies aren't updated if it's there.
new fe119a4 Updated version.properties
new 8d15d85 Manual: Updated release date
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/resources/freemarker/version.properties | 8 ++++----
src/manual/en_US/book.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
[freemarker] 02/02: Manual: Updated release date
Posted by dd...@apache.org.
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 8d15d85c70df172e5c8ad64f6ba05d52dcac663c
Author: ddekany <dd...@apache.org>
AuthorDate: Tue Feb 9 22:11:59 2021 +0100
Manual: Updated release date
---
src/manual/en_US/book.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 8ef2763..3465335 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -29416,7 +29416,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<section xml:id="versions_2_3_31">
<title>2.3.31</title>
- <para>Release date: FIXME</para>
+ <para>Release date: 2021-02-09 + release process</para>
<section>
<title>Changes on the FTL side</title>
[freemarker] 01/02: Updated version.properties
Posted by dd...@apache.org.
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 fe119a4df0c9ee2e714d61b7eeab8148151937fe
Author: ddekany <dd...@apache.org>
AuthorDate: Tue Feb 9 22:11:38 2021 +0100
Updated version.properties
---
src/main/resources/freemarker/version.properties | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index dfa4c1b..9c39042 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.31-nightly_@timestampInVersion@
+version=2.3.31
# 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.31-SNAPSHOT
+mavenVersion=2.3.31
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +73,7 @@ mavenVersion=2.3.31-SNAPSHOT
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.31.nightly_@timestampInVersion@
+versionForOSGi=2.3.31.stable
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -92,7 +92,7 @@ versionForOSGi=2.3.31.nightly_@timestampInVersion@
# "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.30.97
+versionForMf=2.3.31
# The date of the build.
# This should be automatically filled by the building tool (Ant).