You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/08/13 18:02:26 UTC

hbase git commit: HBASE-20257 hbase-spark should not depend on com.google.code.findbugs.jsr305

Repository: hbase
Updated Branches:
  refs/heads/master a07e75562 -> d6e1646be


HBASE-20257 hbase-spark should not depend on com.google.code.findbugs.jsr305

Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d6e1646b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d6e1646b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d6e1646b

Branch: refs/heads/master
Commit: d6e1646bea8e1b534c736c672f0da69c8cea3c47
Parents: a07e755
Author: Artem Ervits <ge...@gmail.com>
Authored: Mon Aug 13 11:35:22 2018 -0400
Committer: tedyu <yu...@gmail.com>
Committed: Mon Aug 13 11:01:44 2018 -0700

----------------------------------------------------------------------
 hbase-spark-it/pom.xml | 10 ----------
 hbase-spark/pom.xml    | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d6e1646b/hbase-spark-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml
index bfd2906..2f29fa3 100644
--- a/hbase-spark-it/pom.xml
+++ b/hbase-spark-it/pom.xml
@@ -123,16 +123,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
-          <!-- purposefully have jsr 305 exclusion only warn in this module -->
-          <execution>
-            <id>banned-jsr305</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <fail>false</fail>
-            </configuration>
-          </execution>
           <!-- hbase-spark is ok in this modules -->
           <execution>
             <id>banned-hbase-spark</id>

http://git-wip-us.apache.org/repos/asf/hbase/blob/d6e1646b/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index a5f96b4..1042663 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -55,10 +55,6 @@
       <version>${scala.version}</version>
       <scope>provided</scope>
     </dependency>
-    <!-- we exclude jsr305 below and then expressly relist it as
-              provided / optional to avoid dependency resolution possibly
-              bringing it back into runtime scope.
-         -->
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
@@ -92,13 +88,6 @@
       <version>1.1.4</version>
     </dependency>
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>1.3.9</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
@@ -487,16 +476,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
-          <!-- purposefully have jsr 305 exclusion only warn in this module -->
-          <execution>
-            <id>banned-jsr305</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <fail>false</fail>
-            </configuration>
-          </execution>
           <!-- scala is ok in the spark modules -->
           <execution>
             <id>banned-scala</id>
@@ -581,6 +560,12 @@
           <version>${hadoop-two.version}</version>
           <type>test-jar</type>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.code.findbugs</groupId>
+              <artifactId>jsr305</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
@@ -588,6 +573,12 @@
           <version>${hadoop-two.version}</version>
           <type>test-jar</type>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.code.findbugs</groupId>
+              <artifactId>jsr305</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
@@ -629,6 +620,12 @@
           <version>${hadoop-three.version}</version>
           <type>test-jar</type>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.code.findbugs</groupId>
+              <artifactId>jsr305</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
@@ -636,6 +633,12 @@
           <version>${hadoop-three.version}</version>
           <type>test-jar</type>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.code.findbugs</groupId>
+              <artifactId>jsr305</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>