[zookeeper] branch branch-3.5.5 updated: ZOOKEEPER-3351: 3.5 - Fix findBugs and rat check, add filename to sha

[andor]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.5.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.5.5 by this push:
     new c9299f7  ZOOKEEPER-3351: 3.5 - Fix findBugs and rat check, add 
filename to sha
c9299f7 is described below

commit c9299f76356bc1ce3f92e591a5f7c1cd97f490d2
Author: Norbert Kalmar <nkal...@yahoo.com>
AuthorDate: Sat Apr 13 18:08:25 2019 +0200

    ZOOKEEPER-3351: 3.5 - Fix findBugs and rat check, add filename to sha
    
    Author: Norbert Kalmar <nkal...@yahoo.com>
    
    Reviewers: an...@apache.org
    
    Closes #908 from nkalmar/ZK-3351-3.5 and squashes the following commits:
    
    a9f311963 [Norbert Kalmar] ZOOKEEPER-3351 - fix findBugs issue on released 
versions
    9149b27ff [Norbert Kalmar] ZOOKEEPER-3351 - add rat exceptions and fix sha 
generation
    
    (cherry picked from commit 07de70cce69705f415c86f74d533be013fec7f11)
    Signed-off-by: Andor Molnar <an...@apache.org>
---
 pom.xml                                            | 38 ++++++++++++++++++++++
 .../main/java/org/apache/zookeeper/Version.java    |  4 +++
 2 files changed, 42 insertions(+)

diff --git a/pom.xml b/pom.xml
index 58ff541..9c151df 100755
--- a/pom.xml
+++ b/pom.xml
@@ -663,6 +663,7 @@
           <algorithms>
             <algorithm>SHA-512</algorithm>
           </algorithms>
+          <appendFilename>true</appendFilename>
         </configuration>
       </plugin>
 
@@ -681,6 +682,43 @@
           </suppressionFiles>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/log4j.properties</exclude>
+            <exclude>**/README.md</exclude>
+            <exclude>**/git.properties</exclude>
+            <exclude>**/findbugsExcludeFile.xml</exclude>
+            <exclude>**/checkstyle-noframes-sorted.xsl</exclude>
+            <exclude>**/configure.ac</exclude>
+            <exclude>**/Makefile.am</exclude>
+            <exclude>conf/zoo_sample.cfg</exclude>
+            <exclude>conf/configuration.xsl</exclude>
+            <exclude>.travis.yml</exclude>
+            <exclude>excludeFindBugsFilter.xml</exclude>
+            <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>**/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>**/c-doc.Doxyfile</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
 
     <resources>
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java 
b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
index 1f5cf1a..225a54c 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
@@ -18,6 +18,8 @@
 
 package org.apache.zookeeper;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class Version implements org.apache.zookeeper.version.Info {
 
     /*
@@ -39,6 +41,8 @@ public class Version implements 
org.apache.zookeeper.version.Info {
         return BUILD_DATE;
     }
 
+    @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE",
+            justification = "Missing QUALIFIER causes redundant null-check")
     public static String getVersion() {
         return MAJOR + "." + MINOR + "." + MICRO
             + (QUALIFIER == null ? "" : "-" + QUALIFIER);