Repository: incubator-freemarker-site Updated Branches: refs/heads/master 8d6cc3aab -> 24f04b88c
Some license related clarifications Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/24f04b88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/24f04b88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/24f04b88 Branch: refs/heads/master Commit: 24f04b88c8135657f3f8729c5a79ff3bdbbfcae1 Parents: 8d6cc3a Author: ddekany <ddek...@apache.org> Authored: Thu Feb 1 11:21:57 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Thu Feb 1 11:21:57 2018 +0100 ---------------------------------------------------------------------- LICENSE | 30 ++++++++++++++++++++++++++++++ build.xml | 24 +++++++++++++++++++++++- ivy.xml | 20 ++++++++++++++++++++ ivysettings.xml | 18 ++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/24f04b88/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index d645695..d13b95f 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,33 @@ 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 +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: + + src/main/image/logo-square-rounded.png + src/main/image/logo-square-rounded.svg + src/main/image/logo-square.png + src/main/image/logo-square.svg + src/main/docgen/favicon.png + src/main/docgen/images/overview.png + src/main/docgen/images/poweredby_big_ffffff.png + src/main/docgen/images/poweredby_ffffff.png + src/main/docgen/images/poweredby_sq_bluespot.png + src/main/docgen/images/poweredby_sq_simple.png + src/main/docgen/images/poweredby_sq_sunset.png + src/main/docgen/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/main/docgen/images/apache-incubator.png + +========================================================================= http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/24f04b88/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index d4268ad..b79e6c0 100644 --- a/build.xml +++ b/build.xml @@ -21,6 +21,7 @@ <project name="FreeMarker Site" default="site" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:docgen="http://freemarker.org/docgen"; + xmlns:rat="antlib:org.apache.rat.anttasks" > <!-- Ivy project coordinates: --> @@ -123,5 +124,26 @@ <ivy:resolve /> <ivy:report todir="build/deps-report" /> </target> - + + <target name="rat" description="Generates Apache RAT report"> + <ivy:cachepath pathid="ivy.dep" /> + <taskdef + uri="antlib:org.apache.rat.anttasks" + resource="org/apache/rat/anttasks/antlib.xml" + classpathref="ivy.dep" + /> + + <rat:report reportFile="build/rat-report.txt"> + <fileset dir=""> + <exclude name="build/**"/> + <exclude name="ide-dependencies/**"/> + <exclude name=".*"/> + <exclude name=".*/**"/> + </fileset> + </rat:report> + <echo level="info"><!-- + -->Rat reports were written into build/rat-report.txt<!-- + --></echo> + </target> + </project> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/24f04b88/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index e3daf67..d67ed7e 100644 --- a/ivy.xml +++ b/ivy.xml @@ -1,4 +1,23 @@ <!-- + 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. +--> + +<!-- AFTER CHANGING THIS FILE don't forget to issue: ant update-deps --> <ivy-module version="2.0"> @@ -8,5 +27,6 @@ </publications> <dependencies> <dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="default->default" changing="true" /> + <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.11" conf="default->default" /> </dependencies> </ivy-module> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/24f04b88/ivysettings.xml ---------------------------------------------------------------------- diff --git a/ivysettings.xml b/ivysettings.xml index 0eda602..eafd89f 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -1,3 +1,21 @@ +<!-- + 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. +--> <ivysettings> <!-- Prevent IvyDE error: --> <property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false" />
