Browse Source

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 <eolivelli@apache.org>

Reviewers: Andor Molnár <andor@apache.org>, Norbert Kalmar <nkalmar@yahoo.com>, Michael Han <hanm@apache.org>

Closes #998 from eolivelli/fix/ZOOKEEPER-3440-rat
Enrico Olivelli 5 years ago
parent
commit
1e6edc9229
2 changed files with 18 additions and 13 deletions
  1. 1 1
      .travis.yml
  2. 17 12
      pom.xml

+ 1 - 1
.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:

+ 17 - 12
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>