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/07/12 22:40:09 UTC
[freemarker] branch master updated: Removed further content from
abandoned master (2.4) branch
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/master by this push:
new 689044a Removed further content from abandoned master (2.4) branch
689044a is described below
commit 689044a3ccdfa75b61a4fc3e0bc19184934e7c79
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Jul 13 00:40:00 2019 +0200
Removed further content from abandoned master (2.4) branch
---
DISCLAIMER | 8 --------
NOTICE | 28 ----------------------------
RELEASE-NOTES | 8 --------
3 files changed, 44 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index b56f1c4..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-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.
diff --git a/NOTICE b/NOTICE
index af3d669..62a65c0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,31 +3,3 @@ Copyright 2015-2016 The Apache Software Foundation
This product includes software developed at
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:
-
- src/main/freemarker/ext/jsp/web-app_2_2.dtd
- src/main/freemarker/ext/jsp/web-app_2_3.dtd
- src/main/freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
- src/main/freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
-
-=========================================================================
-
-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:
-
- src/main/misc/overloadedNumberRules/prices.ods
- src/manual/en_US/docgen-originals/figures/overview.odg
- src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/WebappLocalFreemarkerServlet.jar
- src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
- src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
- src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar
-
-=========================================================================
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
deleted file mode 100644
index dcf7a88..0000000
--- a/RELEASE-NOTES
+++ /dev/null
@@ -1,8 +0,0 @@
-Where to find the change log:
-
-- Online (for stable releases only):
- http://freemarker.org/docs/app_versions.html
-
-- Offline:
- In the binary release, open documentation/index.html, and you will find the
- link.
\ No newline at end of file