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 2016/01/02 15:02:40 UTC
[1/6] incubator-freemarker git commit: (README adjustments)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 64f2cd19b -> def593738
(README adjustments)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c28febcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c28febcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c28febcc
Branch: refs/heads/2.3-gae
Commit: c28febccf2412b90ac651ce3cb33301b89f6378a
Parents: 64f2cd1
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 11:14:17 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 11:14:17 2016 +0100
----------------------------------------------------------------------
README | 2 +-
RELEASE-NOTES | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c28febcc/README
----------------------------------------------------------------------
diff --git a/README b/README
index 54c5238..d3c373f 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ application already uses the related library.
Change log
----------
-Online:
+Online (for stable releases only):
http://freemarker.org/docs/app_versions.html
Offline:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c28febcc/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 19e8842..dcf7a88 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,8 @@
Where to find the change log:
-- http://freemarker.org/docs/app_versions.html
+- Online (for stable releases only):
+ http://freemarker.org/docs/app_versions.html
-- It's included in the binary release:
- Open documentation/index.html, and you will find the offline link.
+- Offline:
+ In the binary release, open documentation/index.html, and you will find the
+ link.
\ No newline at end of file
[2/6] incubator-freemarker git commit: Added GAE to the binary
artifact name.
Posted by dd...@apache.org.
Added GAE to the binary artifact name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/72d6ac13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/72d6ac13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/72d6ac13
Branch: refs/heads/2.3-gae
Commit: 72d6ac13b136e16fe3e18b1347609e65570b3889
Parents: c28febc
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 11:24:16 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 11:24:16 2016 +0100
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/72d6ac13/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index b36009b..3dcc765 100644
--- a/build.xml
+++ b/build.xml
@@ -728,7 +728,7 @@
</copy>
<!-- Package -->
- <property name="bin.tar" value="build/dist/apache-freemarker-${version}-bin.tar" />
+ <property name="bin.tar" value="build/dist/apache-freemarker-gae-${version}-bin.tar" />
<property name="bin.gzip" value="${bin.tar}.gz" />
<delete file="${bin.tar}" />
<tar tarfile="${bin.tar}" basedir="${dist.dir}/bin" />
[5/6] incubator-freemarker git commit: Version history update
Posted by dd...@apache.org.
Version history update
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d5e34c76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d5e34c76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d5e34c76
Branch: refs/heads/2.3-gae
Commit: d5e34c76b647f54c601373e7c6e378d24896c0ae
Parents: d5de8ad
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 14:34:31 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 14:57:12 2016 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 53 +++++++++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5e34c76/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 56a8cd3..0ea368d 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26412,17 +26412,33 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<section xml:id="versions_2_3_24">
<title>2.3.24 Release Candidate 1</title>
- <para>Date of release for Release Candidate 1: [FIXME]</para>
+ <para>Date of release for Release Candidate 1: 2015-01-12</para>
- <para>Date of release for Preview 1: 2015-09-01</para>
-
- <para>Date of release for final is not yet known (end of
- October?).</para>
+ <para>Planned final release date: around 2016-02-20</para>
<para>Please test for backward compatibility, and help polishing the
new features!</para>
<section>
+ <title>Legal changes</title>
+
+ <para>The owner of FreeMarker is now the Apache Software Foundation.
+ The license is still Apache License Version 2.0, just like earlier,
+ but the owner is different. The official full product name has
+ changed to Apache FreeMarker.</para>
+
+ <para>Disclaimer: Apache FreeMarker is an effort undergoing
+ incubation at The Apache Software Foundation (ASF). Incubation is
+ required of all newly accepted projects until a further review
+ indicates that the infrastructure, communications, and decision
+ making process have stabilized in a manner consistent with other
+ successful ASF projects. While incubation status is not necessarily
+ a reflection of the completeness or stability of the code, it does
+ indicate that the project has yet to be fully endorsed by the ASF.
+ </para>
+ </section>
+
+ <section>
<title>Changes on the FTL side</title>
<itemizedlist>
@@ -26650,9 +26666,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>Changes related to the <link
- linkend="dgui_misc_autoescaping">new auto-escaping
- mechanism</link>:</para>
+ <para>Related to the <link linkend="dgui_misc_autoescaping">new
+ auto-escaping mechanism</link>:</para>
<itemizedlist>
<listitem>
@@ -26966,7 +26981,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>Decrease the stack usage of template execution, which can
+ <para>Decreased the stack usage of template execution, which can
have importance if you have very very deeply nested
templates.</para>
</listitem>
@@ -27104,8 +27119,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>Internal code cleanup: Mostly source code formatting, also
- many parser construction/setup cleanup</para>
+ <para>Internal code cleanup: Mostly for consistent source code
+ formatting, also many parser construction/setup cleanup</para>
</listitem>
<listitem>
@@ -27133,20 +27148,20 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>Internal reworking to simplify the AST (the
- <literal>TemplateElement</literal> structure). The API related
+ <literal>TemplateElement</literal> structure). The related
technically public API was marked as internal for a good while.
For those who still use that API, the visible change is that
<literal>TemplateElement</literal>-s now almost never has a
<literal>MixedContent</literal> parent, instead, the parent is
directly whatever element the child element indeed belongs under
when you look at the source code (like the enclosing
- <literal>#list</literal> for example, no a
- <literal>MixedContent</literal> whose parent is the
- <literal>#list</literal>). Note that when you have moved
- downwards, towards the child elements, these
- <literal>MixedContent</literal> parents weren't visible either
- either, so the tree traversal API was in fact inconsistent. Now
- it's consistent.</para>
+ <literal>#list</literal> for example, while earlier you often
+ had to go through a <literal>MixedContent</literal> first whose
+ parent was the <literal>#list</literal>). Note that when you
+ have moved downwards, i.e., towards the child elements, these
+ <literal>MixedContent</literal> parents weren't visible and were
+ silently skipped, so the tree traversal API was inconsistent.
+ Now it's consistent.</para>
</listitem>
<listitem>
[4/6] incubator-freemarker git commit: Adjusting version number
(which now ends with "-incubating").
Posted by dd...@apache.org.
Adjusting version number (which now ends with "-incubating").
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d5de8ad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d5de8ad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d5de8ad8
Branch: refs/heads/2.3-gae
Commit: d5de8ad896eba7e39d3c3dff08c460c3a7221ef6
Parents: b8e8187
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 12:09:37 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 12:09:37 2016 +0100
----------------------------------------------------------------------
src/main/resources/freemarker/version.properties | 12 +++++++-----
.../java/freemarker/template/VersionTest.java | 18 ++++++++++++++++++
2 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5de8ad8/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 1b7de72..e209196 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -26,6 +26,7 @@
# Qualifier :: = NightlyQualifier
# |
# ( ('pre'|'rc') twoDigitPositiveInteger ('-' NightlyQualifier)? )
+# '-incubating'?
# NightlyQualifier :: = 'nightly_@timestampInVersion@'
#
# This format is compatible both with Maven and JSR 277, and it must
@@ -56,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-pre01
+version=2.3.24-rc01-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.
+# 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-SNAPSHOT
+mavenVersion=2.3.24-rc01-incubating
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +74,8 @@ mavenVersion=2.3.24-SNAPSHOT
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.24.pre01
+# During Apache Incubation, "-incubating" is added to this string.
+versionForOSGi=2.3.24.rc01-incubating
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -91,7 +93,7 @@ versionForOSGi=2.3.24.pre01
# "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.98.1
+versionForMf=2.3.23.99.1
# The date of the build.
# This should be automatically filled by the building tool (Ant).
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5de8ad8/src/test/java/freemarker/template/VersionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/VersionTest.java b/src/test/java/freemarker/template/VersionTest.java
index 3d74cc1..560e428 100644
--- a/src/test/java/freemarker/template/VersionTest.java
+++ b/src/test/java/freemarker/template/VersionTest.java
@@ -58,6 +58,14 @@ public class VersionTest {
assertEquals(3, v.getMicro());
}
+ public void testFromNumberIncubating() {
+ Version v = new Version(2, 3, 24, "rc01-incubating", Boolean.FALSE, new Date(5000));
+ assertEquals("2.3.24-rc01-incubating", v.toString());
+ assertEquals("rc01-incubating", v.getExtraInfo());
+ assertFalse(v.isGAECompliant().booleanValue());
+ assertEquals(new Date(5000), v.getBuildDate());
+ }
+
@Test
public void testFromString() {
Version v = new Version("1.2.3-beta2");
@@ -112,6 +120,16 @@ public class VersionTest {
assertEquals("mod", v.getExtraInfo());
}
+
+ @Test
+ public void testFromStringIncubating() {
+ Version v = new Version("2.3.24-rc01-incubating");
+ assertEquals("2.3.24-rc01-incubating", v.toString());
+ assertEquals(2, v.getMajor());
+ assertEquals(3, v.getMinor());
+ assertEquals(24, v.getMicro());
+ assertEquals("rc01-incubating", v.getExtraInfo());
+ }
@Test
public void testHashAndEquals() {
[6/6] incubator-freemarker git commit: (Missed the "gae" from the src
archive name)
Posted by dd...@apache.org.
(Missed the "gae" from the src archive name)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/def59373
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/def59373
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/def59373
Branch: refs/heads/2.3-gae
Commit: def5937389253d814e0d2b85376da0e5f416f031
Parents: d5e34c7
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 15:02:06 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 15:02:24 2016 +0100
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/def59373/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3dcc765..06dc5eb 100644
--- a/build.xml
+++ b/build.xml
@@ -778,7 +778,7 @@
</copy>
<!-- Package -->
- <property name="src.tar" value="build/dist/apache-freemarker-${version}-src.tar" />
+ <property name="src.tar" value="build/dist/apache-freemarker-gae-${version}-src.tar" />
<property name="src.gzip" value="${src.tar}.gz" />
<delete file="${src.tar}" />
<tar tarfile="${src.tar}" basedir="${dist.dir}/src" />
[3/6] incubator-freemarker git commit: Added disclaimer to more
places. Changed FreeMarker to Apache FreeMarker in Manual book title and
preface.
Posted by dd...@apache.org.
Added disclaimer to more places. Changed FreeMarker to Apache FreeMarker in Manual book title and preface.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b8e81873
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b8e81873
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b8e81873
Branch: refs/heads/2.3-gae
Commit: b8e81873450c3b4da9cabeb51c2389e371acf77e
Parents: 72d6ac1
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 11:45:24 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 11:45:24 2016 +0100
----------------------------------------------------------------------
README | 11 +++++++++++
src/dist/bin/documentation/index.html | 4 +++-
src/manual/en_US/book.xml | 16 ++++++++++++++--
3 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/README
----------------------------------------------------------------------
diff --git a/README b/README
index d3c373f..5f479a4 100644
--- a/README
+++ b/README
@@ -27,6 +27,17 @@
===============================================================================
+ DISCLAIMER
+
+ Apache FreeMarker is an effort undergoing incubation at The Apache
+ Software Foundation (ASF). Incubation is required of all newly accepted
+ projects until a further review indicates that the infrastructure,
+ communications, and decision making process have stabilized in a manner
+ consistent with other successful ASF projects. While incubation status is
+ not necessarily a reflection of the completeness or stability of the
+ code, it does indicate that the project has yet to be fully endorsed by
+ the ASF.
+
What is Apache FreeMarker?
--------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index 6d98acd..5e31bc4 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -30,7 +30,7 @@
padding: 2em;
color: #000000;
font-family: Arial,sans-serif;
- font-size: 20px;
+ font-size: 16px;
}
h1 {
font-size: 166%;
@@ -61,5 +61,7 @@
</ul>
<p><a href="http://freemarker.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>
+
+ <p><i>Disclaimer: Apache FreeMarker is an effort undergoing incubation at The Apache Software Foundation (ASF). Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</i></p>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 26dd513..56a8cd3 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -20,12 +20,13 @@
<book conformance="docgen" version="5.0" xml:lang="en"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title>FreeMarker Manual</title>
+ <title>Apache FreeMarker Manual</title>
<titleabbrev>Manual</titleabbrev>
@@ -33,7 +34,7 @@
</info>
<preface role="index.html" xml:id="preface">
- <title>What is FreeMarker?</title>
+ <title>What is Apache FreeMarker?</title>
<para>FreeMarker is a <emphasis>template engine</emphasis>: a generic tool
to generate text output (HTML web pages, e-mails, configuration files,
@@ -71,6 +72,17 @@
<para>FreeMarker is <link
xlink:href="http://www.fsf.org/philosophy/free-sw.html">Free</link>,
released under the Apache License, Version 2.0.</para>
+
+ <para><emphasis><emphasis><emphasis role="bold">Disclaimer: Apache
+ FreeMarker is an effort undergoing <link
+ xlink:href="http://incubator.apache.org">incubation</link> at The Apache
+ Software Foundation (ASF).</emphasis></emphasis> Incubation is required of
+ all newly accepted projects until a further review indicates that the
+ infrastructure, communications, and decision making process have
+ stabilized in a manner consistent with other successful ASF projects.
+ While incubation status is not necessarily a reflection of the
+ completeness or stability of the code, it does indicate that the project
+ has yet to be fully endorsed by the ASF.</emphasis></para>
</preface>
<part xml:id="dgui">