HBASE-16321 ensure no findbugs-jsr305
Signed-off-by: Esteban Gutierrez <[email protected]>
Conflicts:
hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
hbase-rsgroup/pom.xml
hbase-server/pom.xml
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java
hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase-spark/pom.xml
src/main/asciidoc/_chapters/developer.adoc
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a5f98c3f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a5f98c3f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a5f98c3f
Branch: refs/heads/branch-1
Commit: a5f98c3f9ede67f3a5fb76bd00450f17ca233207
Parents: b1c6094
Author: Sean Busbey <[email protected]>
Authored: Tue Aug 2 01:17:59 2016 -0500
Committer: Sean Busbey <[email protected]>
Committed: Fri Aug 5 14:08:50 2016 -0500
----------------------------------------------------------------------
hbase-client/pom.xml | 8 +-
.../hbase/protobuf/ResponseConverter.java | 2 +-
.../apache/hadoop/hbase/codec/BaseDecoder.java | 5 +-
hbase-server/pom.xml | 5 ++
.../hadoop/hbase/master/LoadBalancer.java | 1 +
.../hbase/client/TestMetaWithReplicas.java | 3 +-
.../TestMultiTableSnapshotInputFormat.java | 2 +-
pom.xml | 87 ++++++++++++++------
8 files changed, 75 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index dae9c67..2d661b4 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -247,8 +247,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -260,10 +260,6 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
- <groupId>com.github.stephenc.findbugs</groupId>
- <artifactId>findbugs-annotations</artifactId>
- </exclusion>
- <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
----------------------------------------------------------------------
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
index 0c7cbd7..91d30fd 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
@@ -17,13 +17,13 @@
*/
package org.apache.hadoop.hbase.protobuf;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
----------------------------------------------------------------------
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
index 86f8678..485b88a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
@@ -22,8 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
-import javax.annotation.Nonnull;
-
+import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Cell;
@@ -99,7 +98,7 @@ public abstract class BaseDecoder implements Codec.Decoder {
* thrown if EOF is reached prematurely. Does not return null.
* @throws IOException
*/
- @Nonnull
+ @NonNull
protected abstract Cell parseCell() throws IOException;
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 205f845..3d97c59 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -440,6 +440,11 @@
</dependency>
<!-- General dependencies -->
<dependency>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
index e293d60..c581b08 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.master;
import java.util.List;
import java.util.Map;
+import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.conf.ConfigurationObserver;
import org.apache.hadoop.conf.Configurable;
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
index 0ef9890..061e6c3 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
@@ -33,8 +33,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutorService;
-import javax.annotation.Nullable;
-
+import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
index f3e6d8d..93bb820 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.mapreduce;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimaps;
+import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Scan;
@@ -34,7 +35,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5f98c3f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc49af5..cc672db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -801,36 +801,52 @@
</dependency>
</dependencies>
<!-- version set by parent -->
- <configuration>
- <rules>
- <!-- The earliest maven version we verify builds for via ASF
Jenkins -->
- <requireMavenVersion>
- <version>[${maven.min.version},)</version>
- <message>Maven is out of date.
+ <executions>
+ <execution>
+ <id>min-maven-and-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!-- The earliest maven version we verify builds for via ASF
Jenkins -->
+ <requireMavenVersion>
+ <version>[${maven.min.version},)</version>
+ <message>Maven is out of date.
HBase requires at least version ${maven.min.version} of Maven to properly
build from source.
You appear to be using an older version. You can use either "mvn -version" or
"mvn enforcer:display-info" to verify what version is active.
See the reference guide on building for more information:
http://hbase.apache.org/book.html#build
- </message>
- </requireMavenVersion>
- <!-- The earliest JVM version we verify builds for via ASF Jenkins
-->
- <requireJavaVersion>
- <version>[${java.min.version},)</version>
- <message>Java is out of date.
+ </message>
+ </requireMavenVersion>
+ <!-- The earliest JVM version we verify builds for via ASF
Jenkins -->
+ <requireJavaVersion>
+ <version>[${java.min.version},)</version>
+ <message>Java is out of date.
HBase requirs at least version ${java.min.version} of the JDK to properly
build from source.
You appear to be using an older version. You can use either "mvn -version" or
"mvn enforcer:display-info" to verify what version is active.
See the reference guide on building for more information:
http://hbase.apache.org/book.html#build
- </message>
- </requireJavaVersion>
- </rules>
- </configuration>
- <executions>
+ </message>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
<execution>
- <id>enforce</id>
+ <id>banned-jsr305</id>
<goals>
<goal>enforce</goal>
</goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>com.google.code.findbugs:jsr305</exclude>
+ </excludes>
+ <message>We don't allow the JSR305 jar from the Findbugs
project, see HBASE-16321.</message>
+ </bannedDependencies>
+ </rules>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -1152,7 +1168,6 @@
<httpcore.version>4.4.4</httpcore.version>
<metrics-core.version>2.2.0</metrics-core.version>
<guava.version>12.0.1</guava.version>
- <jsr305.version>1.3.9</jsr305.version>
<jackson.version>1.9.13</jackson.version>
<jasper.version>5.5.23</jasper.version>
<jaxb-api.version>2.2.2</jaxb-api.version>
@@ -1397,6 +1412,12 @@
</dependency>
<!-- General dependencies -->
<dependency>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ <version>${findbugs-annotations}</version>
+ </dependency>
+ <!-- General dependencies -->
+ <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
@@ -1422,11 +1443,12 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr305.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -1742,7 +1764,6 @@
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
- <version>${findbugs-annotations}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -2051,6 +2072,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2081,6 +2106,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2217,6 +2246,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2252,6 +2285,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
