freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [5/5] freemarker git commit: Even more incubation related parts are removed/update
Date Fri, 30 Mar 2018 18:03:03 GMT
Even more incubation related parts are removed/update


Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/ac3c6d2e
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/ac3c6d2e
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/ac3c6d2e

Branch: refs/heads/2.3-gae
Commit: ac3c6d2ed7471845343ff3335185cc533c8f3faa
Parents: d565f72
Author: ddekany <ddekany@apache.org>
Authored: Fri Mar 30 20:02:51 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Fri Mar 30 20:02:51 2018 +0200

----------------------------------------------------------------------
 NOTICE                                |   2 +-
 README.md                             |   2 +-
 rat-excludes                          |   4 ----
 src/dist/bin/LICENSE                  |  16 +++------------
 src/dist/bin/documentation/index.html |   2 --
 src/dist/bin/rat-excludes             |   4 ----
 src/manual/en_US/apache-incubator.png | Bin 7167 -> 0 bytes
 src/manual/en_US/book.xml             |  32 +++++++++++++----------------
 src/manual/en_US/docgen.cjson         |   4 ----
 src/manual/zh_CN/apache-incubator.png | Bin 7167 -> 0 bytes
 src/manual/zh_CN/docgen.cjson         |   4 ----
 11 files changed, 19 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 521d0b4..929539f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache FreeMarker (incubating)
+Apache FreeMarker
 Copyright 2015-2018 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8b0f573..b2f7dd8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Apache FreeMarker {version}
 ===========================
 
-[![Build Status](https://travis-ci.org/apache/incubator-freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/incubator-freemarker)
+[![Build Status](https://travis-ci.org/apache/freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/freemarker)
 
 For the latest version or to report bugs visit:
 https://freemarker.apache.org/

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/rat-excludes
----------------------------------------------------------------------
diff --git a/rat-excludes b/rat-excludes
index cdc8ffc..221d104 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -38,10 +38,6 @@ src/manual/zh_CN/figures/overview.png
 src/manual/zh_CN/figures/tree.png
 src/manual/zh_CN/logo.png
 
-# Binaries/archives created in the Incubatir project:
-src/manual/en_US/apache-incubator.png
-src/manual/zh_CN/apache-incubator.png
-
 # Rat thinks it's a binary, but it's UTF-16 text:
 src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
 

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/dist/bin/LICENSE
----------------------------------------------------------------------
diff --git a/src/dist/bin/LICENSE b/src/dist/bin/LICENSE
index 9cf0525..93af53b 100644
--- a/src/dist/bin/LICENSE
+++ b/src/dist/bin/LICENSE
@@ -203,12 +203,10 @@
 
 =========================================================================
 
-The Apache FreeMarker (incubating) documentation contains the following
-binaries, which were created at the Apache FreeMarker (incubating)
-project, and hence are covered by the same license as the other source
-files of it:
+The Apache FreeMarker documentation contains the following binaries,
+which were created at the Apache FreeMarker project, and hence are
+covered by the same license as the other source files of it:
 
-    documentation/_html/apache-incubator.png
     documentation/_html/docgen-resources/img/patterned-bg.png
     documentation/_html/docgen-resources/img/xxe.png
     documentation/_html/favicon.png
@@ -219,14 +217,6 @@ files of it:
     
 =========================================================================
 
-The Apache FreeMarker (incubating) documentation contains the following
-binaries, which were created at the Apache Incubator project, and hence
-are covered by the same license as Apache FreeMarker (incubating):
-    
-    documentation/_html/apache-incubator.png
-
-=========================================================================
-
 The documentation includes a selection of icons from various icon sets
 (fonts), stored together inside these files, which were geneated with
 https://icomoon.io/app/:

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index 4766233..45a5748 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -61,7 +61,5 @@
     </ul>
     
     <p><a href="https://freemarker.apache.org/">Visit the FreeMarker home page</a>
(help, editor plugins, latest downloads, etc.)</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>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/dist/bin/rat-excludes
----------------------------------------------------------------------
diff --git a/src/dist/bin/rat-excludes b/src/dist/bin/rat-excludes
index b97e0b4..4e99682 100644
--- a/src/dist/bin/rat-excludes
+++ b/src/dist/bin/rat-excludes
@@ -20,7 +20,6 @@ freemarker.jar
 /documentation/_html/api/**
 
 # Images/binaries that were create at FreeMarker:
-documentation/_html/apache-incubator.png
 documentation/_html/docgen-resources/img/patterned-bg.png
 documentation/_html/docgen-resources/img/xxe.png
 documentation/_html/favicon.png
@@ -29,9 +28,6 @@ documentation/_html/figures/overview.png
 documentation/_html/figures/tree.png
 documentation/_html/logo.png
 
-# Images/binaries that were create at other Apache projects:
-documentation/_html/apache-incubator.png
-
 # Fonts whose license is detailed in the LICENSE file:
 documentation/_html/docgen-resources/fonts/icomoon.eot
 documentation/_html/docgen-resources/fonts/icomoon.svg

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/manual/en_US/apache-incubator.png
----------------------------------------------------------------------
diff --git a/src/manual/en_US/apache-incubator.png b/src/manual/en_US/apache-incubator.png
deleted file mode 100644
index 7ab45fc..0000000
Binary files a/src/manual/en_US/apache-incubator.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 3a5876b..5ab63c3 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -73,18 +73,6 @@
     <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 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">
@@ -27626,15 +27614,10 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
       <title>Version history</title>
 
       <section xml:id="versions_2_3_28">
-        <title>2.3.28 (incubating at Apache)</title>
+        <title>2.3.28</title>
 
         <para>Release date: [FIXME]</para>
 
-        <para><emphasis role="bold">This is a stable, final
-        release.</emphasis> The <quote>incubating</quote> suffix is required
-        by the Apache Software Foundation until the project becomes a fully
-        accepted (graduated) Apache project.</para>
-
         <section>
           <title>Changes on the FTL side</title>
 
@@ -27955,6 +27938,19 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
             </listitem>
           </itemizedlist>
         </section>
+
+        <section>
+          <title>Other changes</title>
+
+          <itemizedlist>
+            <listitem>
+              <para>FreeMarker has graduated from the Apache Incubator (as of
+              2018-03-31), and now is a normal top-level project at Apache.
+              Therefore, the version number doesn't contain
+              <quote>-incubating</quote> anymore.</para>
+            </listitem>
+          </itemizedlist>
+        </section>
       </section>
 
       <section xml:id="versions_2_3_27">

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index b2b977e..4652dae 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -131,7 +131,3 @@ socialLinks: {
   "Twitter": { class: "twitter", href: "olink:twitter" }
   "Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" }
 }
-
-sideTOCLogos: [
-  { src: "apache-incubator.png", alt: "Apache Incubator", href: "olink:asfIncubator" }
-]

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/manual/zh_CN/apache-incubator.png
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/apache-incubator.png b/src/manual/zh_CN/apache-incubator.png
deleted file mode 100644
index 7ab45fc..0000000
Binary files a/src/manual/zh_CN/apache-incubator.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/freemarker/blob/ac3c6d2e/src/manual/zh_CN/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/docgen.cjson b/src/manual/zh_CN/docgen.cjson
index 59df72a..88addcf 100644
--- a/src/manual/zh_CN/docgen.cjson
+++ b/src/manual/zh_CN/docgen.cjson
@@ -129,7 +129,3 @@ socialLinks: {
   "Twitter": { class: "twitter", href: "olink:twitter" }
   "Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" }
 }
-
-sideTOCLogos: [
-  { src: "apache-incubator.png", alt: "Apache Incubator", href: "olink:asfIncubator" }
-]


Mime
View raw message