From db12b35ba4c3273a535fce4906e2838441d78eaa Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Tue, 2 Aug 2016 01:17:59 -0500 Subject: [PATCH] HBASE-16321 ensure no findbugs-jsr305 --- hbase-client/pom.xml | 12 ++++++------ hbase-rsgroup/pom.xml | 12 ++++++------ hbase-server/pom.xml | 4 ++-- hbase-spark/pom.xml | 12 ++++++++++++ pom.xml | 35 ++++++++++++++++++++++++++++------- 5 files changed, 54 insertions(+), 21 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index e74e0d5..61f4a2a 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -246,8 +246,8 @@ - com.google.code.findbugs - jsr305 + com.github.stephenc.findbugs + findbugs-annotations true @@ -259,10 +259,6 @@ hadoop-common - com.github.stephenc.findbugs - findbugs-annotations - - net.java.dev.jets3t jets3t @@ -298,6 +294,10 @@ tomcat jasper-runtime + + com.google.code.findbugs + jsr305 + diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index aff49b7..d216263 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -259,8 +259,8 @@ - com.google.code.findbugs - jsr305 + com.github.stephenc.findbugs + findbugs-annotations true @@ -272,10 +272,6 @@ hadoop-common - com.github.stephenc.findbugs - findbugs-annotations - - net.java.dev.jets3t jets3t @@ -311,6 +307,10 @@ tomcat jasper-runtime + + com.google.code.findbugs + jsr305 + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index a7954ec..c2488c0 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -430,8 +430,8 @@ - com.google.code.findbugs - jsr305 + com.github.stephenc.findbugs + findbugs-annotations true diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 89ed186..cddaba9 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -78,6 +78,10 @@ org.scala-lang scalap + + com.google.code.findbugs + jsr305 + @@ -181,6 +185,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + @@ -215,6 +223,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + diff --git a/pom.xml b/pom.xml index ea7743f..e21fd02 100644 --- a/pom.xml +++ b/pom.xml @@ -1258,7 +1258,6 @@ 4.4.4 3.1.2 12.0.1 - 1.3.9 1.9.13 5.5.23 2.2.2 @@ -1509,6 +1508,12 @@ + com.github.stephenc.findbugs + findbugs-annotations + ${findbugs-annotations} + + + org.codehaus.jettison jettison ${jettison.version} @@ -1534,11 +1539,12 @@ com.google.guava guava ${guava.version} - - - com.google.code.findbugs - jsr305 - ${jsr305.version} + + + com.google.code.findbugs + jsr305 + + commons-collections @@ -1854,7 +1860,6 @@ com.github.stephenc.findbugs findbugs-annotations - ${findbugs-annotations} compile @@ -2210,6 +2215,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + @@ -2240,6 +2249,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + @@ -2376,6 +2389,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + @@ -2411,6 +2428,10 @@ io.netty netty + + com.google.code.findbugs + jsr305 + -- 2.7.2