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 2018/02/09 00:25:19 UTC
incubator-freemarker git commit: Introduced rat-excludes so that we
can require 0 suspicious files in the reports. Also,
added all tricky files to the LICENSE one by one (though all such files had
some notice in its directory)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 4ba637f15 -> 607c42732
Introduced rat-excludes so that we can require 0 suspicious files in the reports. Also, added all tricky files to the LICENSE one by one (though all such files had some notice in its directory)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/607c4273
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/607c4273
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/607c4273
Branch: refs/heads/2.3-gae
Commit: 607c427324ff4e8571564b0b98fb5c97423c78c9
Parents: 4ba637f
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 9 01:25:08 2018 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 9 01:25:08 2018 +0100
----------------------------------------------------------------------
LICENSE | 21 +++++++++++
build.xml | 9 ++---
rat-excludes | 80 ++++++++++++++++++++++++++++++++++++++++++
src/dist/bin/LICENSE | 24 +++++++++++++
src/dist/bin/rat-excludes | 42 ++++++++++++++++++++++
5 files changed, 172 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/607c4273/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7449e24..5b74a8a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,5 +210,26 @@ 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/607c4273/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 0be09d4..ff929e2 100644
--- a/build.xml
+++ b/build.xml
@@ -738,6 +738,7 @@
<include name="*.txt" />
<include name="osgi.bnd" />
<include name=".git*" />
+ <include name="rat-excludes" />
</fileset>
</copy>
@@ -1137,14 +1138,14 @@ Proceed? </input>
classpathref="ivy.dep"
/>
- <rat:report reportFile="build/rat-report-src.txt">
- <fileset dir="src"/>
+ <rat:report reportFile="build/rat-report-root.txt">
+ <fileset dir="" excludesfile="rat-excludes" />
</rat:report>
<rat:report reportFile="build/rat-report-dist-src.txt">
- <fileset dir="build/dist/src"/>
+ <fileset dir="${dist.src.dir}" excludesfile="rat-excludes" />
</rat:report>
<rat:report reportFile="build/rat-report-dist-bin.txt">
- <fileset dir="build/dist/bin"/>
+ <fileset dir="${dist.bin.dir}" excludesfile="src/dist/bin/rat-excludes" />
</rat:report>
<echo level="info"><!--
-->Rat reports were written into build/rat-report-*.txt<!--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/607c4273/rat-excludes
----------------------------------------------------------------------
diff --git a/rat-excludes b/rat-excludes
new file mode 100644
index 0000000..adcc8fa
--- /dev/null
+++ b/rat-excludes
@@ -0,0 +1,80 @@
+# 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.
+
+# In src/:
+# --------
+
+# 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:
+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
+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
+# Rat thinks it's a binary, but it's UTF-16 text:
+src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
+
+# Tooling/IDE generated files:
+# ----------------------------
+
+ide-dependencies/**
+archive
+.git/**
+.ivy/**
+.bin/**
+bin/**
+build/**
+.build/**
+out/**
+.out/**
+target/**
+.settings/**
+.classpath
+.project
+.settings
+.idea/**
+*.iml
+*.iws
+*.ipr
+.idea_modules/**
+.out/**
+.gradle/**
+gradle/**
+.DS_Store*
+.AppleDouble
+.LSOverride
+.directory
+.Trash*
+
+# Well known files that need no license note:
+# -------------------------------------------
+
+README.md
+gradlew.bat
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/607c4273/src/dist/bin/LICENSE
----------------------------------------------------------------------
diff --git a/src/dist/bin/LICENSE b/src/dist/bin/LICENSE
index a0f6dc4..9cf0525 100644
--- a/src/dist/bin/LICENSE
+++ b/src/dist/bin/LICENSE
@@ -203,6 +203,30 @@
=========================================================================
+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:
+
+ documentation/_html/apache-incubator.png
+ documentation/_html/docgen-resources/img/patterned-bg.png
+ documentation/_html/docgen-resources/img/xxe.png
+ documentation/_html/favicon.png
+ documentation/_html/figures/model2sketch.png
+ documentation/_html/figures/overview.png
+ documentation/_html/figures/tree.png
+ documentation/_html/logo.png
+
+=========================================================================
+
+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/incubator-freemarker/blob/607c4273/src/dist/bin/rat-excludes
----------------------------------------------------------------------
diff --git a/src/dist/bin/rat-excludes b/src/dist/bin/rat-excludes
new file mode 100644
index 0000000..b97e0b4
--- /dev/null
+++ b/src/dist/bin/rat-excludes
@@ -0,0 +1,42 @@
+# 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.
+
+# Generated
+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
+documentation/_html/figures/model2sketch.png
+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
+documentation/_html/docgen-resources/fonts/icomoon.ttf
+documentation/_html/docgen-resources/fonts/icomoon.woff
+
+# Well known files that need no license note:
+README.md