incubator-freemarker-site git commit: Typo fixes...
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 4ad25cdd4 -> 842785d01 Typo fixes... 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/842785d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/842785d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/842785d0 Branch: refs/heads/asf-site Commit: 842785d017aaff7ce91d6c2a9386b799dd044316 Parents: 4ad25cd Author: ddekanyAuthored: Fri Feb 9 01:48:25 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:48:25 2018 +0100 -- committer-howto.html | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/842785d0/committer-howto.html -- diff --git a/committer-howto.html b/committer-howto.html index 59268ba..68d8787 100644 --- a/committer-howto.html +++ b/committer-howto.html @@ -283,10 +283,10 @@ ga('send', 'pageview'); licenses. Skip to the next point if there were none! Otherwise, first you have to describe them in the related LICENSE files (there are several of them, -depending on if its for the source, the binary distrobution, the +depending on if its for the source, the binary distribution, the Maven jar artifact, or the Maven javadoc artifact), and then you -have to add them to related rat-excludes file -(theres one in the project root for the source release, and +have to add them to the related rat-excludes +file (theres one in the project root for the source release, and another in src/dist/bin for the binary release) so that the files wont be reported next time. Finally restart the process from rebuilding the distribution. @@ -740,7 +740,7 @@ ga('send', 'pageview'); OverviewWhat is FreeMarker?DownloadVersion historyAbout usLicenseHandy stuffhttp://try.freemarker.org/;>Try template onlineExpressions cheatsheet#directives?built_ins.special_varsCommunityhttps://github.com/apache/incubator -freemarker">FreeMarker on Githubhttps://twitter.com/freemarker;>Follow us on Twitterhttps://issues.apache.org/jira/browse/FREEMARKER/;>Report a bughttps://stackoverflow.com/questions/ask?tags=freemarker;>Ask a questionMailing listshttps://github.com/apache/incubator-freemarker;>GitHubhttps://twitter.com/freemarker;>Twitterhttps://stackoverflow.com/questions/ask?tags=freemarker;>Stack Overflowhttp://www.xmlmind.com/xmleditor/; rel="nofollow" title="Edited with XMLMind XML Editor">Edited with XMLMind XML Editor Last generated: -2018-02-09 00:43:11 GMT +2018-02-09 00:47:20 GMT © 1999â2018 http://schema.org/Organization; itemprop="copyrightHolder" href="http://apache.org/;>The Apache Software Foundation. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
incubator-freemarker-site git commit: Typo fixes...
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 1e55ad988 -> d72f57e27 Typo fixes... 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/d72f57e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d72f57e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d72f57e2 Branch: refs/heads/master Commit: d72f57e27f0fad8be30c022ac0e12a30ce780cfb Parents: 1e55ad9 Author: ddekanyAuthored: Fri Feb 9 01:47:37 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:47:37 2018 +0100 -- src/main/docgen/book.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d72f57e2/src/main/docgen/book.xml -- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 75bc656..1de47c5 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1637,10 +1637,10 @@ two freemarker.jar-s and unpredictable behavior! licenses. Skip to the next point if there were none! Otherwise, first you have to describe them in the related LICENSE files (there are several of them, -depending on if it's for the source, the binary distrobution, the +depending on if it's for the source, the binary distribution, the Maven jar artifact, or the Maven javadoc artifact), and then you -have to add them to related rat-excludes file -(there's one in the project root for the source release, and +have to add them to the related rat-excludes +file (there's one in the project root for the source release, and another in src/dist/bin for the binary release) so that the files won't be reported next time. Finally restart the process from rebuilding the distribution.
incubator-freemarker-site git commit: Stricter release policy regarding Rat reports
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site d57c721e4 -> 4ad25cdd4 Stricter release policy regarding Rat reports 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/4ad25cdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/4ad25cdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/4ad25cdd Branch: refs/heads/asf-site Commit: 4ad25cdd4c4066490a3254058722035c67a0bf92 Parents: d57c721 Author: ddekanyAuthored: Fri Feb 9 01:45:14 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:45:14 2018 +0100 -- committer-howto.html | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/4ad25cdd/committer-howto.html -- diff --git a/committer-howto.html b/committer-howto.html index 511178e..59268ba 100644 --- a/committer-howto.html +++ b/committer-howto.html @@ -278,7 +278,18 @@ ga('send', 'pageview'); -ant rat, check output +ant rat, check output. There cant be any +binaries, archives, and especially not unknown or unapproved +licenses. Skip to the next point if there were none! Otherwise, +first you have to describe them in the related +LICENSE files (there are several of them, +depending on if its for the source, the binary distrobution, the +Maven jar artifact, or the Maven javadoc artifact), and then you +have to add them to related rat-excludes file +(theres one in the project root for the source release, and +another in src/dist/bin for the binary release) +so that the files wont be reported next time. Finally restart the +process from rebuilding the distribution. @@ -729,7 +740,7 @@ ga('send', 'pageview'); OverviewWhat is FreeMarker?DownloadVersion historyAbout usLicenseHandy stuffhttp://try.freemarker.org/;>Try template onlineExpressions cheatsheet#directives?built_ins.special_varsCommunityhttps://github.com/apache/incubator -freemarker">FreeMarker on Githubhttps://twitter.com/freemarker;>Follow us on Twitterhttps://issues.apache.org/jira/browse/FREEMARKER/;>Report a bughttps://stackoverflow.com/questions/ask?tags=freemarker;>Ask a questionMailing listshttps://github.com/apache/incubator-freemarker;>GitHubhttps://twitter.com/freemarker;>Twitterhttps://stackoverflow.com/questions/ask?tags=freemarker;>Stack Overflowhttp://www.xmlmind.com/xmleditor/; rel="nofollow" title="Edited with XMLMind XML Editor">Edited with XMLMind XML Editor Last generated: -2018-01-12 08:01:17 GMT +2018-02-09 00:43:11 GMT © 1999â2018 http://schema.org/Organization; itemprop="copyrightHolder" href="http://apache.org/;>The Apache Software Foundation. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
incubator-freemarker-site git commit: (Clarification to the Rat release policy.)
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 10900e26d -> 1e55ad988 (Clarification to the Rat release policy.) 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/1e55ad98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/1e55ad98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/1e55ad98 Branch: refs/heads/master Commit: 1e55ad9886e2a361c3e0ef46aac9829b0cbbc220 Parents: 10900e2 Author: ddekanyAuthored: Fri Feb 9 01:42:57 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:42:57 2018 +0100 -- src/main/docgen/book.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/1e55ad98/src/main/docgen/book.xml -- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 63b9130..75bc656 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1634,16 +1634,16 @@ two freemarker.jar-s and unpredictable behavior! ant rat, check output. There can't be any binaries, archives, and especially not unknown or unapproved -licenses. If there is some, then first you have to describe them -in the related LICENSE files (there are several -of them, depending on if it's for the source, the binary -distrobution, the Maven jar artifact, or the Maven javadoc -artifact), and then you have to add them to related -rat-excludes file (there's one in the project -root for the source release, and another in -src/dist/bin for the binary release) so that -the files won't be reported next time. Finally restart the process -from rebuilding the distribution. +licenses. Skip to the next point if there were none! Otherwise, +first you have to describe them in the related +LICENSE files (there are several of them, +depending on if it's for the source, the binary distrobution, the +Maven jar artifact, or the Maven javadoc artifact), and then you +have to add them to related rat-excludes file +(there's one in the project root for the source release, and +another in src/dist/bin for the binary release) +so that the files won't be reported next time. Finally restart the +process from rebuilding the distribution.
incubator-freemarker-site git commit: Described more string Rat policy on release. This is supposed to protect us from someone naively adding images and such with unclear licensing terms.
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 24f04b88c -> 10900e26d Described more string Rat policy on release. This is supposed to protect us from someone naively adding images and such with unclear licensing terms. 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/10900e26 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/10900e26 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/10900e26 Branch: refs/heads/master Commit: 10900e26df84738d0d12cdcc97326ed624aec040 Parents: 24f04b8 Author: ddekanyAuthored: Fri Feb 9 01:41:01 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:41:01 2018 +0100 -- src/main/docgen/book.xml | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/10900e26/src/main/docgen/book.xml -- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index ad740b0..63b9130 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1632,7 +1632,18 @@ two freemarker.jar-s and unpredictable behavior! -ant rat, check output +ant rat, check output. There can't be any +binaries, archives, and especially not unknown or unapproved +licenses. If there is some, then first you have to describe them +in the related LICENSE files (there are several +of them, depending on if it's for the source, the binary +distrobution, the Maven jar artifact, or the Maven javadoc +artifact), and then you have to add them to related +rat-excludes file (there's one in the project +root for the source release, and another in +src/dist/bin for the binary release) so that +the files won't be reported next time. Finally restart the process +from rebuilding the distribution.
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 som
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: ddekanyAuthored: Fri Feb 9 01:25:08 2018 +0100 Committer: ddekany 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 @@ + @@ -1137,14 +1138,14 @@ Proceed? classpathref="ivy.dep" /> - - + + - + - + Rat reports were written into
incubator-freemarker-site git commit: docgen update
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site f8fd282a3 -> d57c721e4 docgen update 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/d57c721e Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d57c721e Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d57c721e Branch: refs/heads/asf-site Commit: d57c721e43f9cb23f1e2332de4dad06e9d009202 Parents: f8fd282 Author: ddekanyAuthored: Fri Feb 9 01:12:56 2018 +0100 Committer: ddekany Committed: Fri Feb 9 01:12:56 2018 +0100 -- .../docgen/docgen-2.0-branch-head.jar | Bin 268009 -> 254166 bytes .../docgen/docgen-2.0-branch-head.jar.md5 | 2 +- .../docgen/docgen-2.0-branch-head.jar.sha1 | 2 +- .../docgen/ivy-2.0-branch-head.xml | 26 ++- .../docgen/ivy-2.0-branch-head.xml.md5 | 2 +- .../docgen/ivy-2.0-branch-head.xml.sha1 | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar -- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar index 7b86d64..5400fe3 100644 Binary files a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar and b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 -- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 index 9fec3b5..48d4510 100644 --- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 +++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 @@ -1 +1 @@ -d42988c0b7fec5b79130095dc0f4f57c \ No newline at end of file +d97283c242d6f93b81f51d90d2838c74 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 -- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 index 9283949..14b68f6 100644 --- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 +++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 @@ -1 +1 @@ -9390a00986b57907f2e11b85dfc615fd91ff5726 \ No newline at end of file +13d979cc3be04dcf24d3e4b68f4b9e780d04cb3a \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml -- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml index 69d643e..de6b519 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml @@ -1,9 +1,31 @@ + - + + + + + @@ -17,5 +39,7 @@ + + http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 -- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 index d517782..021d4f9 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 @@ -1 +1 @@ -63bc3281c7cfa1756c7dcd1cf71b3f91 \ No newline at end of file +abb00c00f9c961d29fb9f21863805e26 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d57c721e/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 -- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 index d62853f..e050a79 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 @@ -1 +1 @@
incubator-freemarker-online-tester git commit: Refined Rat excludes
Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master cf21526ae -> db05d7c89 Refined Rat excludes Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/db05d7c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/db05d7c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/db05d7c8 Branch: refs/heads/master Commit: db05d7c892f1b8774e007fbf045145ab3bbe86a9 Parents: cf21526 Author: ddekanyAuthored: Fri Feb 9 00:43:55 2018 +0100 Committer: ddekany Committed: Fri Feb 9 00:43:55 2018 +0100 -- build.gradle | 12 +--- rat-excludes | 58 +++ 2 files changed, 59 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/db05d7c8/build.gradle -- diff --git a/build.gradle b/build.gradle index 1a48037..34dab49 100644 --- a/build.gradle +++ b/build.gradle @@ -118,17 +118,7 @@ task rat { name: 'ratReport', classname: 'org.apache.rat.anttasks.Report', classpath: configurations.rat.asPath) ant.ratReport(reportFile: "build/rat-report.txt") { -fileset(dir: "") { -exclude(name: "README.md") -exclude(name: "gradlew.bat") -exclude(name: "gradle/**") -exclude(name: "build/**") -exclude(name: "bin/**") -exclude(name: "out/**") -exclude(name: "ide-dependencies/**") -exclude(name: ".*") -exclude(name: ".*/**") -} +fileset(dir: "", excludesfile: "rat-excludes") } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/db05d7c8/rat-excludes -- diff --git a/rat-excludes b/rat-excludes new file mode 100644 index 000..825c857 --- /dev/null +++ b/rat-excludes @@ -0,0 +1,58 @@ +# 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/: +# + +# No excludes there yet + +# Tooling/IDE generated files: +# + +ide-dependencies/** +.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* + +# Known files that need no license note: +# -- + +README.md +gradlew.bat \ No newline at end of file
incubator-freemarker-online-tester git commit: Removed or excluded any remaining files for which Rat reports "Unknown License".
Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master b96fa9c2d -> cf21526ae Removed or excluded any remaining files for which Rat reports "Unknown License". Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/cf21526a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/cf21526a Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/cf21526a Branch: refs/heads/master Commit: cf21526aedfab941aa71cd1905a4c0d4ece6048c Parents: b96fa9c Author: ddekanyAuthored: Thu Feb 8 22:31:56 2018 +0100 Committer: ddekany Committed: Thu Feb 8 22:31:56 2018 +0100 -- .travis.yml | 17 + build.gradle | 3 +++ src/main/resources/banner.txt | 10 -- 3 files changed, 20 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/cf21526a/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 968f652..5f6d72e 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 jdk: - oraclejdk8 http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/cf21526a/build.gradle -- diff --git a/build.gradle b/build.gradle index 6b6e39a..1a48037 100644 --- a/build.gradle +++ b/build.gradle @@ -119,6 +119,9 @@ task rat { classpath: configurations.rat.asPath) ant.ratReport(reportFile: "build/rat-report.txt") { fileset(dir: "") { +exclude(name: "README.md") +exclude(name: "gradlew.bat") +exclude(name: "gradle/**") exclude(name: "build/**") exclude(name: "bin/**") exclude(name: "out/**") http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/cf21526a/src/main/resources/banner.txt -- diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt deleted file mode 100644 index 784711d..000 --- a/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ - - __ _ _ _ - | || | / __ \ | (_) - | |__ _ __ ___ ___ _ __ ___ __ _ _ __| | _ _ __ | | | |_ __ | |_ _ __ ___ - | __| '__/ _ \/ _ \ '_ ` _ \ / _` | '__| |/ / _ \ '__| | | | | '_ \| | | '_ \ / _ \ - | | | | | __/ __/ | | | | | (_| | | | < __/ | | |__| | | | | | | | | | __/ - |_| |_| \___|\___|_| |_| |_|\__,_|_| |_|\_\___|_| \/|_| |_|_|_|_| |_|\___| - - -
[2/2] incubator-freemarker-online-tester git commit: Added rat task to build.gradle
Added rat task to build.gradle Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/b96fa9c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/b96fa9c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/b96fa9c2 Branch: refs/heads/master Commit: b96fa9c2d71750221810cd3bfd1154c66c58b684 Parents: ef79502 Author: ddekanyAuthored: Thu Feb 8 20:53:29 2018 +0100 Committer: ddekany Committed: Thu Feb 8 20:53:29 2018 +0100 -- build.gradle| 26 ++ dependencies.gradle | 5 - 2 files changed, 30 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/b96fa9c2/build.gradle -- diff --git a/build.gradle b/build.gradle index 25018fe..6b6e39a 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,10 @@ buildscript { } } +configurations { +rat +} + dependencies { compile libraries.dropwizard compile libraries.dropwizard_views @@ -66,6 +70,8 @@ dependencies { testCompile libraries.mockito testCompile libraries.hamcrest testCompile libraries.jersey_grrizle + +rat libraries.rat } compileJava { @@ -106,5 +112,25 @@ jacocoTestReport { } } +task rat { +doLast { +ant.taskdef( +name: 'ratReport', classname: 'org.apache.rat.anttasks.Report', +classpath: configurations.rat.asPath) +ant.ratReport(reportFile: "build/rat-report.txt") { +fileset(dir: "") { +exclude(name: "build/**") +exclude(name: "bin/**") +exclude(name: "out/**") +exclude(name: "ide-dependencies/**") +exclude(name: ".*") +exclude(name: ".*/**") +} +} +} + +project.logger.lifecycle('Rat reports will be written into build/rat-report.txt') +} + check.dependsOn jacocoTestReport build.dependsOn shadowJar http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/b96fa9c2/dependencies.gradle -- diff --git a/dependencies.gradle b/dependencies.gradle index abfc7d2..c7fa0d2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,5 +45,8 @@ ext.libraries = [ junit: "junit:junit-dep:4.11", mockito: "org.mockito:mockito-core:1.9.0", hamcrest: "org.hamcrest:hamcrest-library:1.3", -jersey_grrizle: "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:$jeresy_version" +jersey_grrizle: "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:$jeresy_version", + +// Build: +rat: "org.apache.rat:apache-rat-tasks:0.12" ] \ No newline at end of file
[1/2] incubator-freemarker-online-tester git commit: Added missing copyright headers
Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master 6e99e846b -> b96fa9c2d Added missing copyright headers Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/ef795028 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/ef795028 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/ef795028 Branch: refs/heads/master Commit: ef795028c2067a008582e66704a572c3eb8dbed2 Parents: 6e99e84 Author: ddekanyAuthored: Thu Feb 8 20:53:11 2018 +0100 Committer: ddekany Committed: Thu Feb 8 20:53:11 2018 +0100 -- .../dropwizard/FreeMarkerOnlineTester.java | 20 +++- .../FreeMarkerOnlineTesterConfiguration.java| 20 +++- .../onlinetester/resources/ResourceTest.java| 19 +++ 3 files changed, 57 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/ef795028/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java -- diff --git a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java index a9ddc91..40dab6e 100644 --- a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java +++ b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java @@ -1,5 +1,23 @@ -package org.apache.freemarker.onlinetester.dropwizard; +/* + * 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. + */ +package org.apache.freemarker.onlinetester.dropwizard; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/ef795028/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java -- diff --git a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java index f7eae4c..b29622c 100644 --- a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java +++ b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java @@ -1,5 +1,23 @@ -package org.apache.freemarker.onlinetester.dropwizard; +/* + * 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. + */ +package org.apache.freemarker.onlinetester.dropwizard; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/ef795028/src/test/java/org/apache/freemarker/onlinetester/resources/ResourceTest.java -- diff --git a/src/test/java/org/apache/freemarker/onlinetester/resources/ResourceTest.java b/src/test/java/org/apache/freemarker/onlinetester/resources/ResourceTest.java index 4872cbf..f3d02f5 100644 ---