From notifications-return-4950-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Thu Feb 1 11:21:07 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 F1B02180652 for ; Thu, 1 Feb 2018 11:21:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E1986160C44; Thu, 1 Feb 2018 10:21:06 +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 DB5D1160C26 for ; Thu, 1 Feb 2018 11:21:05 +0100 (CET) Received: (qmail 43845 invoked by uid 500); 1 Feb 2018 10:21:05 -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 43836 invoked by uid 99); 1 Feb 2018 10:21:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Feb 2018 10:21:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A39101A64D9 for ; Thu, 1 Feb 2018 10:21:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.231 X-Spam-Level: X-Spam-Status: No, score=-4.231 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] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id VBYFAo1eSFW6 for ; Thu, 1 Feb 2018 10:21:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 112F35F3B8 for ; Thu, 1 Feb 2018 10:20:59 +0000 (UTC) Received: (qmail 43693 invoked by uid 99); 1 Feb 2018 10:20:59 -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; Thu, 01 Feb 2018 10:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 563EEE96ED; Thu, 1 Feb 2018 10:20:58 +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 Date: Thu, 01 Feb 2018 10:21:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-freemarker-docgen git commit: Some license related clarifications Some license related clarifications Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/fcd3269d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/fcd3269d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/fcd3269d Branch: refs/heads/master Commit: fcd3269d2a3d07033389db8ea9ac5de483f21794 Parents: 1fe002a Author: ddekany Authored: Thu Feb 1 11:20:48 2018 +0100 Committer: ddekany Committed: Thu Feb 1 11:20:48 2018 +0100 ---------------------------------------------------------------------- .travis.yml | 17 + LICENSE | 34 +- build.properties.sample | 17 + build.xml | 41 + checkstyle.xml | 18 + gulpfile.js | 19 + ivy.xml | 24 + ivysettings.xml | 18 + package-lock.json | 6777 ++++++++++++++++++ src/main/org/freemarker/docgen/Transform.java | 4 - .../docgen/statics/img/callouts/1.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/10.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/11.gif | Bin 244 -> 0 bytes .../docgen/statics/img/callouts/12.gif | Bin 244 -> 0 bytes .../docgen/statics/img/callouts/13.gif | Bin 244 -> 0 bytes .../docgen/statics/img/callouts/14.gif | Bin 244 -> 0 bytes .../docgen/statics/img/callouts/15.gif | Bin 244 -> 0 bytes .../docgen/statics/img/callouts/2.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/3.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/4.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/5.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/6.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/7.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/8.gif | Bin 968 -> 0 bytes .../docgen/statics/img/callouts/9.gif | Bin 968 -> 0 bytes src/test/1/docgen.cjson | 19 +- src/test/2/docgen.cjson | 18 + src/test/3/docgen.cjson | 17 + src/test/4/docgen.cjson | 17 + src/test/5/docgen.cjson | 17 + src/test/6/docgen.cjson | 18 +- src/test/7/docgen.cjson | 17 + src/test/8/docgen.cjson | 17 + src/test/9/docgen.cjson | 19 +- test.xml | 18 + 35 files changed, 7136 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index ea62c86..2bb7c54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, 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. + language: java before_install: ant download-ivy install: ant all http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 2e99cb8..e014df3 100644 --- a/LICENSE +++ b/LICENSE @@ -202,11 +202,34 @@ limitations under the License. ============================================================================== -END LICENSE +The Apache FreeMarker (incubating) source code contains the following +files without copyright header for technical reasons, which were created +at the Apache FreeMarker (incubating) project, and hence are covered by +the same license as the other source files of it: + + package.json + package-lock.json + src/main/org/freemarker/docgen/statics/fonts/selection.json + src/main/org/freemarker/docgen/statics/img/patterned-bg.png + src/main/org/freemarker/docgen/statics/img/xxe.gif + src/main/org/freemarker/docgen/statics/img/xxe.png + src/test/1/bat.jpg + src/test/1/figures/model2sketch.png + src/test/1/figures/overview.png + src/test/1/figures/tree.png + src/test/1/logo.png + src/test/2/logo.png + src/test/2/test.gif + src/test/3/logo.png + src/test/4/logo.png + src/test/5/logo.png + src/test/6/logo.png + src/test/7/logo.png + src/test/8/logo.png + src/test/9/logo.png -Docgen subcomponents with different copyright owners ----------------------------------------------------- +============================================================================== The "icomoon" font files (icomoon.eot, icomoon.svg, icomoon.ttf, and icomoon.woff) under the "documentation" directory of the FreeMarker @@ -228,3 +251,8 @@ the binary, freemarker.jar. The fonts are: (http://google.github.io/material-design-icons/), licensed under Creative Common Attribution 4.0 International License (CC-BY 4.0) (https://creativecommons.org/licenses/by/4.0/). + +============================================================================== + +See the license of the src/main/org/freemarker/docgen/schema/docbook.rng file +in the following file: LICENSE-DOCBOOK-RNG http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/build.properties.sample ---------------------------------------------------------------------- diff --git a/build.properties.sample b/build.properties.sample index 8741114..a78d741 100644 --- a/build.properties.sample +++ b/build.properties.sample @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, 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. + # Should point to the rt.jar of Java 8. # You may comment this property out, but for releases it should be set, # so Java 8 incompatibilities will cause compilation-time errors. http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 7083dad..053880f 100644 --- a/build.xml +++ b/build.xml @@ -1,9 +1,28 @@ + @@ -415,4 +434,26 @@ + + + + + + + + + + + + + + Rat reports were written into build/rat-report.txt + + http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 9ad09d2..3f6d38b 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,5 +1,23 @@ + + + + + + @@ -16,5 +38,7 @@ + + http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/ivysettings.xml ---------------------------------------------------------------------- diff --git a/ivysettings.xml b/ivysettings.xml index 0eda602..eafd89f 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -1,3 +1,21 @@ +