HBASE-18782 Module untangling work

diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml
index bfb8d7b..489446a 100644 (file)
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@@ -63,13 +63,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 3227e39..c72a874 100644 (file)
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -128,12 +128,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
     </dependency>
     <dependency>
@@ -287,16 +281,6 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-          <exclusions>
-            <exclusion>
-              <groupId>jdk.tools</groupId>
-              <artifactId>jdk.tools</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
         </dependency>
       </dependencies>

diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml
index f832e46..53708d8 100644 (file)
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -156,10 +156,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
     </dependency>
     <dependency>

diff --git a/hbase-external-blockcache/src/main/java/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.java b/hbase-external-blockcache/src/main/java/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.java
index 3df9d08..2fb8fdb 100644 (file)
--- a/hbase-external-blockcache/src/main/java/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.java
+++ b/hbase-external-blockcache/src/main/java/org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.java
@@ -28,7 +28,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;
 import org.apache.hadoop.hbase.nio.ByteBuff;
 import org.apache.hadoop.hbase.nio.SingleByteBuff;
@@ -52,7 +51,11 @@ import java.util.concurrent.ExecutionException;
  * good network connection to the HBase regionservers. Any other use will likely slow down HBase
  * greatly.
  */
-@InterfaceAudience.Private
+// @InterfaceAudience.Private
+// This class has NO InterfaceAudience. It is commented out. We do not want to import
+// InterfaceAudience. This would be only class in this module with the IA import and we do not want
+// to have this module depend annotations module just for one class.
+// NO InterfaceAudience defaults to mean InterfaceAudience.Private!
 public class MemcachedBlockCache implements BlockCache {
   private static final Log LOG = LogFactory.getLog(MemcachedBlockCache.class.getName());
 

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index d813cd8..5642e3c 100644 (file)
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -228,16 +228,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>${compat.module}</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 77f5f12..ea7ed7a 100644 (file)
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -226,16 +226,6 @@
       <artifactId>hbase-shaded-protobuf</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jdk.tools</groupId>
-          <artifactId>jdk.tools</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/util/ForeignExceptionUtil.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/util/ForeignExceptionUtil.java
index 28b3909..db47945 100644 (file)
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/util/ForeignExceptionUtil.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/util/ForeignExceptionUtil.java
@@ -23,8 +23,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage;
@@ -33,8 +31,12 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.Sta
  * Helper to convert Exceptions and StackTraces from/to protobuf.
  * (see ErrorHandling.proto for the internal of the proto messages)
  */
-@InterfaceAudience.Private
-@InterfaceStability.Evolving
+// @InterfaceAudience.Private
+// @InterfaceStability.Evolving
+// This class has NO InterfaceAudience. It is commented out. We do not want to import
+// InterfaceAudience. This would be only class in this module with the IA import and we do not want
+// to have this module depend annotations module just for one class.
+// NO InterfaceAudience defaults to mean InterfaceAudience.Private!
 public final class ForeignExceptionUtil {
   private ForeignExceptionUtil() { }
 

diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml
index 9e5661a..c55f82c 100644 (file)
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@@ -115,16 +115,6 @@
   </build>
   <dependencies>
     <!-- Intra-project dependencies -->
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jdk.tools</groupId>
-          <artifactId>jdk.tools</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <!-- General dependencies -->
     <dependency>
       <groupId>com.google.protobuf</groupId>

diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java
index afa9297..f36c44a 100644 (file)
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.HBaseZeroCopyByteString;
@@ -27,7 +26,11 @@ import com.google.protobuf.HBaseZeroCopyByteString;
 /**
  * Hack to workaround HBASE-10304 issue that keeps bubbling up when a mapreduce context.
  */
-@InterfaceAudience.Private
+// @InterfaceAudience.Private
+// This class has NO InterfaceAudience. It is commented out. We do not want to import
+// InterfaceAudience. This would be only class in this module with the IA import and we do not want
+// to have this module depend annotations module just for one class.
+// NO InterfaceAudience defaults to mean InterfaceAudience.Private!
 public class ByteStringer {
   private static final Log LOG = LogFactory.getLog(ByteStringer.class);
 

diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 7ce6d57..5141eb5 100644 (file)
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -229,30 +229,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <!-- REMOVE
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>${compat.module}</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>${compat.module}</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
--->
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml
index 761ab7f..a71c9b8 100644 (file)
--- a/hbase-spark-it/pom.xml
+++ b/hbase-spark-it/pom.xml
@@ -216,16 +216,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
-        </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>${compat.module}</artifactId>
       <version>${project.version}</version>
     </dependency>