From notifications-return-5011-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Fri Feb 9 14:28:31 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id DE230180654 for ; Fri, 9 Feb 2018 14:28:31 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CF226160C4C; Fri, 9 Feb 2018 13:28:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1973A160C2E for ; Fri, 9 Feb 2018 14:28:30 +0100 (CET) Received: (qmail 32160 invoked by uid 500); 9 Feb 2018 13:28:30 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 32151 invoked by uid 99); 9 Feb 2018 13:28:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2018 13:28:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C1060C0CCE for ; Fri, 9 Feb 2018 13:28:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -11.731 X-Spam-Level: X-Spam-Status: No, score=-11.731 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_DEF_SPF_WL=-7.5] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id udcRomgdKAns for ; Fri, 9 Feb 2018 13:28:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 05AEE5F5B3 for ; Fri, 9 Feb 2018 13:28:25 +0000 (UTC) Received: (qmail 32088 invoked by uid 99); 9 Feb 2018 13:28:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2018 13:28:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 948CAE0779; Fri, 9 Feb 2018 13:28:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: <73c395bfb7024bfd8f0fdaa7e9ae6a76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: Seems that most projects don't lists images and such that are created in the project, so let's not go overboard. Date: Fri, 9 Feb 2018 13:28:24 +0000 (UTC) Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 607c42732 -> 5065cfe86 Seems that most projects don't lists images and such that are created in the project, so let's not go overboard. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/5065cfe8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5065cfe8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5065cfe8 Branch: refs/heads/2.3-gae Commit: 5065cfe863a1eeab4fa96320e31c2c353d6dea40 Parents: 607c427 Author: ddekany Authored: Fri Feb 9 14:28:11 2018 +0100 Committer: ddekany Committed: Fri Feb 9 14:28:11 2018 +0100 ---------------------------------------------------------------------- LICENSE | 33 --------------------------------- rat-excludes | 10 +++++++--- 2 files changed, 7 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5065cfe8/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 5b74a8a..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -200,36 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -========================================================================= - -The Apache FreeMarker (incubating) source code 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: - - src/main/misc/overloadedNumberRules/prices.ods - src/manual/en_US/docgen-originals/figures/overview.odg - src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png - src/manual/en_US/docgen-originals/figures/tree_with_alpha.png - src/manual/en_US/favicon.png - src/manual/en_US/figures/model2sketch.png - src/manual/en_US/figures/overview.png - src/manual/en_US/figures/tree.png - src/manual/en_US/logo.png - src/manual/zh_CN/favicon.png - src/manual/zh_CN/figures/model2sketch.png - src/manual/zh_CN/figures/overview.png - src/manual/zh_CN/figures/tree.png - src/manual/zh_CN/logo.png - -========================================================================= - -The Apache FreeMarker (incubating) source code contains the following -binaries, which were created at the Apache Incubator project, and hence -are covered by the same license as Apache FreeMarker (incubating): - - src/manual/en_US/apache-incubator.png - src/manual/zh_CN/apache-incubator.png - -========================================================================= http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5065cfe8/rat-excludes ---------------------------------------------------------------------- diff --git a/rat-excludes b/rat-excludes index adcc8fa..cdc8ffc 100644 --- a/rat-excludes +++ b/rat-excludes @@ -21,11 +21,10 @@ # Generated files basically; see details in the files: src/manual/en_US/docgen-misc/googleAnalytics.html src/manual/zh_CN/docgen-misc/googleAnalytics.html -# Binaries/archives covered in LICENSE: + +# Binaries/archives created in the FreeMarker project: src/main/misc/overloadedNumberRules/prices.ods src/manual/en_US/docgen-originals/figures/overview.odg -src/manual/en_US/apache-incubator.png -src/manual/zh_CN/apache-incubator.png src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png src/manual/en_US/docgen-originals/figures/tree_with_alpha.png src/manual/en_US/favicon.png @@ -38,6 +37,11 @@ src/manual/zh_CN/figures/model2sketch.png 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