You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2019/07/25 22:11:17 UTC

[accumulo] branch 1.9 updated: Fix spotbugs when building on Java 11

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

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new 87da062  Fix spotbugs when building on Java 11
87da062 is described below

commit 87da0627c9c595a6fc7f942d390adfe17d22086d
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jul 25 15:33:37 2019 -0400

    Fix spotbugs when building on Java 11
    
    Also remove NOOP `@Deprecated` tag that does nothing on package elements
    (which now generates a warning in JDK9 and later)
---
 .../main/java/org/apache/accumulo/core/client/mock/package-info.java | 1 -
 core/src/main/spotbugs/exclude-filter.xml                            | 5 +++++
 examples/simple/src/main/spotbugs/exclude-filter.xml                 | 5 +++++
 minicluster/src/main/spotbugs/exclude-filter.xml                     | 5 +++++
 pom.xml                                                              | 2 +-
 server/base/src/main/spotbugs/exclude-filter.xml                     | 5 +++++
 server/tserver/src/main/spotbugs/exclude-filter.xml                  | 5 +++++
 test/src/main/spotbugs/exclude-filter.xml                            | 5 +++++
 8 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java b/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java
index 08e4251..e29a7de 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java
@@ -20,5 +20,4 @@
  * <p>
  * Deprecated since 1.8.0; use MiniAccumuloCluster or a standard mock framework instead.
  */
-@Deprecated
 package org.apache.accumulo.core.client.mock;
diff --git a/core/src/main/spotbugs/exclude-filter.xml b/core/src/main/spotbugs/exclude-filter.xml
index 58d7a12..2b6cb2d 100644
--- a/core/src/main/spotbugs/exclude-filter.xml
+++ b/core/src/main/spotbugs/exclude-filter.xml
@@ -105,4 +105,9 @@
     <Class name="org.apache.accumulo.core.client.impl.ScannerOptionsTest" />
     <Bug code="NP" pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/examples/simple/src/main/spotbugs/exclude-filter.xml b/examples/simple/src/main/spotbugs/exclude-filter.xml
index 0ce1597..1b68b74 100644
--- a/examples/simple/src/main/spotbugs/exclude-filter.xml
+++ b/examples/simple/src/main/spotbugs/exclude-filter.xml
@@ -20,4 +20,9 @@
     <Class name="org.apache.accumulo.examples.simple.isolation.InterferenceTest$Writer" />
     <Bug code="DM" pattern="DM_EXIT" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/minicluster/src/main/spotbugs/exclude-filter.xml b/minicluster/src/main/spotbugs/exclude-filter.xml
index bf850ec..b04879d 100644
--- a/minicluster/src/main/spotbugs/exclude-filter.xml
+++ b/minicluster/src/main/spotbugs/exclude-filter.xml
@@ -27,4 +27,9 @@
     <Method name="equals" params="java.lang.Object" returns="boolean" />
     <Bug code="EQ" pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index 2240d84..78dbdd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -567,7 +567,7 @@
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>3.1.6</version>
+          <version>3.1.12.1</version>
           <configuration>
             <xmlOutput>true</xmlOutput>
             <effort>Max</effort>
diff --git a/server/base/src/main/spotbugs/exclude-filter.xml b/server/base/src/main/spotbugs/exclude-filter.xml
index 26aa119..04b8fe8 100644
--- a/server/base/src/main/spotbugs/exclude-filter.xml
+++ b/server/base/src/main/spotbugs/exclude-filter.xml
@@ -35,4 +35,9 @@
     </Or>
     <Bug code="DM" pattern="DM_EXIT" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/server/tserver/src/main/spotbugs/exclude-filter.xml b/server/tserver/src/main/spotbugs/exclude-filter.xml
index a334163..2c8a66d 100644
--- a/server/tserver/src/main/spotbugs/exclude-filter.xml
+++ b/server/tserver/src/main/spotbugs/exclude-filter.xml
@@ -27,4 +27,9 @@
     <Method name="&lt;init&gt;" params="org.apache.accumulo.tserver.TabletServer,org.apache.accumulo.server.fs.VolumeManager" returns="void" />
     <Bug code="DM" pattern="DM_GC" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/test/src/main/spotbugs/exclude-filter.xml b/test/src/main/spotbugs/exclude-filter.xml
index 3c3e596..a53d038 100644
--- a/test/src/main/spotbugs/exclude-filter.xml
+++ b/test/src/main/spotbugs/exclude-filter.xml
@@ -48,4 +48,9 @@
     </Or>
     <Bug code="DM" pattern="DM_GC" />
   </Match>
+  <Match>
+    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>