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/07/01 18:41:33 UTC
[1/4] incubator-freemarker git commit: Removed copyright info and
homepage link from CommandLine. The whole thing should be removed anyways.
Modified product name printed to Apache FreeMarker.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3 e6b61c6cf -> dd7a2aa3f
Removed copyright info and homepage link from CommandLine. The whole thing should be removed anyways. Modified product name printed to Apache FreeMarker.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3328b49a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3328b49a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3328b49a
Branch: refs/heads/2.3
Commit: 3328b49a32e054e840fa97495b9356ba8b9cde8f
Parents: 504ec38
Author: ddekany <dd...@apache.org>
Authored: Thu Jun 23 01:29:22 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Jun 23 01:29:22 2016 +0200
----------------------------------------------------------------------
src/main/java/freemarker/core/CommandLine.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3328b49a/src/main/java/freemarker/core/CommandLine.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CommandLine.java b/src/main/java/freemarker/core/CommandLine.java
index 95d0164..6e4e29f 100644
--- a/src/main/java/freemarker/core/CommandLine.java
+++ b/src/main/java/freemarker/core/CommandLine.java
@@ -36,7 +36,7 @@ public class CommandLine {
Version ver = Configuration.getVersion();
System.out.println();
- System.out.print("FreeMarker version ");
+ System.out.print("Apache FreeMarker version ");
System.out.print(ver);
/* If the version number doesn't already contain the build date and it's known, print it: */
@@ -56,13 +56,5 @@ public class CommandLine {
System.out.print("Google App Engine complian variant: ");
System.out.println(ver.isGAECompliant().booleanValue() ? "Yes" : "No");
}
-
- System.out.println();
- System.out.println("Copyright 2015 The Apache Software Foundation.");
- System.out.println("Licensed under the Apache License, Version 2.0");
- System.out.println();
- System.out.println("For more information and for updates visit our Web site:");
- System.out.println("http://freemarker.org/");
- System.out.println();
}
}
\ No newline at end of file
[3/4] incubator-freemarker git commit: The "sponsored by" part was
missing from the incubation disclaimer.
Posted by dd...@apache.org.
The "sponsored by" part was missing from the incubation disclaimer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/32b7be40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/32b7be40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/32b7be40
Branch: refs/heads/2.3
Commit: 32b7be4011a594fdfe064d47765188fa3aefabe2
Parents: c739651
Author: ddekany <dd...@apache.org>
Authored: Fri Jul 1 20:40:30 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Fri Jul 1 20:40:30 2016 +0200
----------------------------------------------------------------------
DISCLAIMER | 16 ++++++------
src/dist/bin/documentation/index.html | 2 +-
src/manual/en_US/book.xml | 41 ++++++++++++++++--------------
3 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/32b7be40/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
index b56f1c4..569ba05 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,8 +1,8 @@
-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.
+Apache FreeMarker is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator. 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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/32b7be40/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index 5e31bc4..cc5ce08 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -62,6 +62,6 @@
<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>
+ <p><i><b>Disclaimer:</b> Apache FreeMarker is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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/32b7be40/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 9190e2a..b58779f 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -73,16 +73,17 @@
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>
+ <para><emphasis role="bold">Disclaimer: </emphasis><emphasis>Apache
+ FreeMarker is an effort undergoing incubation at The Apache Software
+ Foundation (ASF), sponsored by the <link
+ xlink:href="http://incubator.apache.org">Apache Incubator</link>.
+ 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">
@@ -26752,15 +26753,17 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
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>
+ <para><emphasis role="bold">Disclaimer:</emphasis><emphasis> Apache
+ FreeMarker is an effort undergoing incubation at The Apache Software
+ Foundation (ASF), sponsored by the <link
+ xlink:href="http://incubator.apache.org">Apache Incubator</link>.
+ 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>
</section>
<section>
[4/4] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dd7a2aa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dd7a2aa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dd7a2aa3
Branch: refs/heads/2.3
Commit: dd7a2aa3fe443ee0e6b4f9584ae0fe8581fef6e8
Parents: e6b61c6 32b7be4
Author: ddekany <dd...@apache.org>
Authored: Fri Jul 1 20:41:14 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Fri Jul 1 20:41:14 2016 +0200
----------------------------------------------------------------------
DISCLAIMER | 16 ++++----
NOTICE | 16 ++++----
src/dist/bin/NOTICE | 10 ++---
src/dist/bin/documentation/index.html | 2 +-
src/dist/jar/META-INF/NOTICE | 11 +++---
src/main/java/freemarker/core/CommandLine.java | 10 +----
src/manual/en_US/book.xml | 41 +++++++++++----------
7 files changed, 51 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-freemarker git commit: Added missing "Apache" before
"FreeMarker" in NOTICE files.
Posted by dd...@apache.org.
Added missing "Apache" before "FreeMarker" in NOTICE files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c7396518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c7396518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c7396518
Branch: refs/heads/2.3
Commit: c7396518887a2b9a40290427ba17bcca35b49b82
Parents: 3328b49
Author: ddekany <dd...@apache.org>
Authored: Thu Jun 23 01:41:56 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Jun 23 01:41:56 2016 +0200
----------------------------------------------------------------------
NOTICE | 16 ++++++++--------
src/dist/bin/NOTICE | 10 +++++-----
src/dist/jar/META-INF/NOTICE | 11 ++++++-----
3 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9015fd9..7af335c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,11 +6,11 @@ The Apache Software Foundation (http://www.apache.org/).
=========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files are:
+Apache FreeMarker, both in its source code and binary form
+(freemarker.jar) includes files that were developed outside the Apache
+FreeMarker project, and are licensed by the Apache Software Foundation
+under the Apache License, Version 2.0. This is the same license as the
+license of Apache FreeMarker. These files are:
src/main/resources/freemarker/ext/jsp/web-app_2_2.dtd
src/main/resources/freemarker/ext/jsp/web-app_2_3.dtd
@@ -19,9 +19,9 @@ files are:
=========================================================================
-The FreeMarker source code contains the following binaries, which were
-produced by the FreeMarker project itself, and are hence covered by the
-license of the FreeMarker project:
+The Apache FreeMarker source code contains the following binaries, which
+were produced by the Apache FreeMarker project itself, and are hence
+covered by the license of the Apache FreeMarker project:
src/main/misc/overloadedNumberRules/prices.ods
src/manual/en_US/docgen-originals/figures/overview.odg
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/src/dist/bin/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/bin/NOTICE b/src/dist/bin/NOTICE
index 918d7dc..54e5f42 100644
--- a/src/dist/bin/NOTICE
+++ b/src/dist/bin/NOTICE
@@ -36,11 +36,11 @@ The name, license, and attribution of each icon sets (fonts) used follows:
===========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files in the binary distribution are:
+Apache FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the Apache FreeMarker project,
+and are licensed by the Apache Software Foundation under the Apache
+License, Version 2.0. This is the same license as the license of Apache
+FreeMarker. These files in the binary distribution are:
freemarker.jar/freemarker/ext/jsp/web-app_2_2.dtd
freemarker.jar/freemarker/ext/jsp/web-app_2_3.dtd
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/src/dist/jar/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/jar/META-INF/NOTICE b/src/dist/jar/META-INF/NOTICE
index 53915b3..5baf4e3 100644
--- a/src/dist/jar/META-INF/NOTICE
+++ b/src/dist/jar/META-INF/NOTICE
@@ -8,11 +8,12 @@ The Apache Software Foundation (http://www.apache.org/).
===========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files in the FreeMarker binary (inside the jar file) are:
+Apache FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the Apache FreeMarker project,
+and are licensed by the Apache Software Foundation under the Apache
+License, Version 2.0. This is the same license as the license of Apache
+FreeMarker. These files in the Apache FreeMarker binary (inside the jar
+file) are:
freemarker/ext/jsp/web-app_2_2.dtd
freemarker/ext/jsp/web-app_2_3.dtd