From 8adcbe5a574ab907abeba567643b5ad09ae1f97a Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 8 Sep 2017 21:00:30 -0700 Subject: [PATCH] HBASE-18782 Module untangling work --- hbase-archetypes/hbase-client-project/pom.xml | 7 ------- hbase-examples/pom.xml | 16 --------------- hbase-external-blockcache/pom.xml | 4 ---- .../hadoop/hbase/io/hfile/MemcachedBlockCache.java | 7 +++++-- hbase-it/pom.xml | 10 --------- hbase-protocol-shaded/pom.xml | 10 --------- .../hadoop/hbase/util/ForeignExceptionUtil.java | 10 +++++---- hbase-protocol/pom.xml | 10 --------- .../org/apache/hadoop/hbase/util/ByteStringer.java | 7 +++++-- hbase-rest/pom.xml | 24 ---------------------- hbase-shell/pom.xml | 10 --------- hbase-spark-it/pom.xml | 10 --------- 12 files changed, 16 insertions(+), 109 deletions(-) diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml index bfb8d7b82f..489446a27c 100644 --- a/hbase-archetypes/hbase-client-project/pom.xml +++ b/hbase-archetypes/hbase-client-project/pom.xml @@ -63,13 +63,6 @@ org.apache.hbase - hbase-annotations - ${project.version} - test-jar - test - - - org.apache.hbase hbase-common ${project.version} diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 3227e39f9c..c72a874f9f 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -128,12 +128,6 @@ org.apache.hbase - hbase-annotations - test-jar - test - - - org.apache.hbase hbase-common @@ -287,16 +281,6 @@ org.apache.hadoop - hadoop-annotations - - - jdk.tools - jdk.tools - - - - - org.apache.hadoop hadoop-minicluster diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index f832e464b5..53708d83a0 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -156,10 +156,6 @@ org.apache.hbase - hbase-annotations - - - org.apache.hbase hbase-common 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 3df9d08db6..2fb8fdbcbc 100644 --- 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 d813cd8f4e..5642e3c778 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -228,16 +228,6 @@ org.apache.hbase - hbase-hadoop-compat - - - com.google.guava - guava - - - - - org.apache.hbase ${compat.module} ${project.version} diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 77f5f12b7e..ea7ed7ab41 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -226,16 +226,6 @@ hbase-shaded-protobuf - org.apache.hbase - hbase-annotations - - - jdk.tools - jdk.tools - - - - junit junit test 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 28b390997f..db479459ee 100644 --- 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 9e5661ad63..c55f82c5fd 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -115,16 +115,6 @@ - - org.apache.hbase - hbase-annotations - - - jdk.tools - jdk.tools - - - com.google.protobuf 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 afa9297446..f36c44aad7 100644 --- 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 7ce6d577e7..5141eb547a 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -229,30 +229,6 @@ org.apache.hbase - hbase-hadoop-compat - - - org.apache.hbase - hbase-hadoop-compat - test-jar - test - - - - org.apache.hbase hbase-server test-jar test diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 19ec0c2a65..b83a19e1a7 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -197,12 +197,6 @@ org.apache.hbase - hbase-annotations - test-jar - test - - - org.apache.hbase hbase-client @@ -216,10 +210,6 @@ org.apache.hbase - hbase-hadoop-compat - - - org.apache.hbase ${compat.module} ${project.version} diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml index 761ab7f924..a71c9b896d 100644 --- a/hbase-spark-it/pom.xml +++ b/hbase-spark-it/pom.xml @@ -216,16 +216,6 @@ org.apache.hbase - hbase-hadoop-compat - - - com.google.guava - guava - - - - - org.apache.hbase ${compat.module} ${project.version} -- 2.11.0 (Apple Git-81)