You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ha...@apache.org on 2019/06/28 22:38:28 UTC
[zookeeper] branch master updated: ZOOKEEPER-3440: Fix Apache RAT
check by excluding binary files (images)
This is an automated email from the ASF dual-hosted git repository.
hanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 1e6edc9 ZOOKEEPER-3440: Fix Apache RAT check by excluding binary files (images)
1e6edc9 is described below
commit 1e6edc9229c418b8bea46ccc5d603ea1c4a47a9e
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Fri Jun 28 15:38:18 2019 -0700
ZOOKEEPER-3440: Fix Apache RAT check by excluding binary files (images)
- Fix Apache Rat plugin configuration (make it pass against C client, docs and contrib module)
- Add apache-rat:check on Travis
Author: Enrico Olivelli <eo...@apache.org>
Reviewers: Andor Molnár <an...@apache.org>, Norbert Kalmar <nk...@yahoo.com>, Michael Han <ha...@apache.org>
Closes #998 from eolivelli/fix/ZOOKEEPER-3440-rat
---
.travis.yml | 2 +-
pom.xml | 29 +++++++++++++++++------------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 98d0027..b427f92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
packages:
- libcppunit-dev
-script: mvn clean install -DskipTests spotbugs:check checkstyle:check -Pfull-build
+script: mvn clean apache-rat:check install -DskipTests spotbugs:check checkstyle:check -Pfull-build
branches:
only:
diff --git a/pom.xml b/pom.xml
index 0701d18..1024abf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -784,22 +784,27 @@
<exclude>README_packaging.txt</exclude>
<exclude>src/main/resources/markdown/skin/*</exclude>
<exclude>src/main/resources/markdown/html/*</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/*</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-zooinspector/TODO</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-zkperl/Changes</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES</exclude>
- <exclude>zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java</exclude>
+ <exclude>src/main/resources/markdown/images/*</exclude>
+ <!-- contrib -->
+ <exclude>zookeeper-contrib-monitoring/JMX-RESOURCES</exclude>
+ <exclude>zookeeper-contrib-fatjar/src/main/resources/mainClasses</exclude>
+ <exclude>zookeeper-contrib-zkperl/Changes</exclude>
+ <exclude>zookeeper-contrib-zkperl/MANIFEST</exclude>
+ <exclude>zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/*</exclude>
+ <exclude>src/main/resources/webapp/org/apache/zookeeper/graph/resources/*</exclude>
+ <exclude>src/main/java/com/nitido/utils/toaster/Toaster.java</exclude>
+ <exclude>TODO</exclude>
+ <!-- c client -->
<exclude>**/acinclude.m4</exclude>
<exclude>**/aminclude.am</exclude>
- <exclude>zookeeper-client-c/src/hashtable/*</exclude>
- <exclude>zookeeper-client-c/include/winconfig.h</exclude>
- <exclude>zookeeper-client-c/tests/wrappers.opt</exclude>
- <exclude>zookeeper-client-c/tests/quorum.cfg</exclude>
- <exclude>zookeeper-client-c/tests/wrappers-mt.opt</exclude>
+ <exclude>src/hashtable/*</exclude>
+ <exclude>include/winconfig.h</exclude>
+ <exclude>tests/wrappers.opt</exclude>
+ <exclude>tests/quorum.cfg</exclude>
+ <exclude>tests/wrappers-mt.opt</exclude>
<exclude>**/c-doc.Doxyfile</exclude>
</excludes>
+ <consoleOutput>true</consoleOutput>
</configuration>
</plugin>
</plugins>