hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject [4/8] HBASE-12059 Create hbase-annotations module
Date Tue, 23 Sep 2014 23:48:58 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union3.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union3.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union3.java
index b736b75..50116f8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union3.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union3.java
@@ -18,7 +18,7 @@
 package org.apache.hadoop.hbase.types;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.util.Order;
 import org.apache.hadoop.hbase.util.PositionedByteRange;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union4.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union4.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union4.java
index c284e18..8f204a1 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union4.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/types/Union4.java
@@ -18,7 +18,7 @@
 package org.apache.hadoop.hbase.types;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.util.Order;
 import org.apache.hadoop.hbase.util.PositionedByteRange;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java
index 2a9e498..3b3060f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Base64.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
index a6546a3..1915228 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.WritableUtils;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRange.java
index 6323a40..b690b61 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRange.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Lightweight, reusable class for specifying ranges of byte[]'s.
@@ -304,4 +304,4 @@ public interface ByteRange extends Comparable<ByteRange> {
    */
   public ByteRange shallowCopySubRange(int innerOffset, int copyLength);
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
index a571471..202eb05 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 import com.google.common.collect.Lists;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index 84a5819..5c22232 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -43,7 +43,7 @@ import com.google.protobuf.ByteString;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.io.RawComparator;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java
index 97d0c20..298b0f3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcurrentIndex.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * A simple concurrent map of sets. This is similar in concept to
@@ -170,4 +170,4 @@ public class ConcurrentIndex<K, V> {
       return new ConcurrentSkipListSet<V>(comparator);
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
index 21afd26..3bbdb95 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * High scalable counter. Thread safe.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/DefaultEnvironmentEdge.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/DefaultEnvironmentEdge.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/DefaultEnvironmentEdge.java
index b8461f2..c7f7042 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/DefaultEnvironmentEdge.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/DefaultEnvironmentEdge.java
@@ -34,4 +34,4 @@ public class DefaultEnvironmentEdge implements EnvironmentEdge {
   public long currentTime() {
     return System.currentTimeMillis();
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/EnvironmentEdge.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/EnvironmentEdge.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/EnvironmentEdge.java
index ee8c00a..b8e3128 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/EnvironmentEdge.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/EnvironmentEdge.java
@@ -34,4 +34,4 @@ public interface EnvironmentEdge {
    * @return Current time.
    */
   long currentTime();
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java
index aded23c..dfd8938 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Hash.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
index bd861fd..995477d 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
@@ -25,7 +25,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Produces 32-bit hash for hash table lookup.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MD5Hash.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MD5Hash.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MD5Hash.java
index 4679eac..ffa4816 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MD5Hash.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MD5Hash.java
@@ -26,7 +26,7 @@ import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Utility class for MD5

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash.java
index 9b498d1..0072515 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * This is a very fast, non-cryptographic hash suitable for general hash-based

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Order.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Order.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Order.java
index dc0b71d..f0b00bc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Order.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Order.java
@@ -18,7 +18,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Used to describe or modify the lexicographical sort order of a

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java
index bb858c4..80296c5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java
@@ -28,7 +28,7 @@ import java.nio.charset.Charset;
 import java.util.Comparator;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 import com.google.common.annotations.VisibleForTesting;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Pair.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Pair.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Pair.java
index ecfc308..e319245 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Pair.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Pair.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.util;
 import java.io.Serializable;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * A generic class for pairs.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java
index 2da2a3a..9a9c751 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PairOfSameType.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * A generic, immutable class for pairs of objects both of type <code>T</code>.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PositionedByteRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PositionedByteRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PositionedByteRange.java
index 0d31154..9444759 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PositionedByteRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PositionedByteRange.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.util;
 import java.nio.ByteBuffer;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * <p>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java
index 702bda6..20b8930 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/PrettyPrinter.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.HConstants;
 
 @InterfaceAudience.Public

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimpleMutableByteRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimpleMutableByteRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimpleMutableByteRange.java
index 65f0147..1b7f377 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimpleMutableByteRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimpleMutableByteRange.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * A basic mutable {@link ByteRange} implementation.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedByteRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedByteRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedByteRange.java
index 2f7e5c3..61c3572 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedByteRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedByteRange.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Extends the basic {@link SimpleMutableByteRange} implementation with position

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java
index cb4ae86..2aee671 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.hbase.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Extends the basic {@link AbstractPositionedByteRange} implementation with

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
index cd78eba..d89c5dc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
 import java.io.PrintWriter;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.VersionAnnotation;
 import org.apache.commons.logging.Log;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
deleted file mode 100644
index ab39591..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the client, This tests the hbase-client package and all of the client tests in
- * hbase-server.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface ClientTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
deleted file mode 100644
index ff65995..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to coprocessors.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface CoprocessorTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
deleted file mode 100644
index b4e9c35..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the filter package.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface FilterTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
deleted file mode 100644
index ddd92b1..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as failing commonly on public build infrastructure.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface FlakeyTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
deleted file mode 100644
index cf8bffa..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the io package. Things like HFile and the like.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface IOTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
deleted file mode 100644
index ce6af67..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.testclassification;
-
-/**
- * Tag a test as 'integration/system' test, meaning that the test class has the following
- * characteristics: <ul>
- *  <li> Possibly takes hours to complete</li>
- *  <li> Can be run on a mini cluster or an actual cluster</li>
- *  <li> Can make changes to the given cluster (starting stopping daemons, etc)</li>
- *  <li> Should not be run in parallel of other integration tests</li>
- * </ul>
- *
- * Integration / System tests should have a class name starting with "IntegrationTest", and
- * should be annotated with @Category(IntegrationTests.class). Integration tests can be run
- * using the IntegrationTestsDriver class or from mvn verify.
- *
- * @see SmallTests
- * @see MediumTests
- * @see LargeTests
- */
-public interface IntegrationTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
deleted file mode 100644
index b8f6ba3..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.testclassification;
-
-/**
- * Tag a test as 'large', meaning that the test class has the following
- * characteristics:
- *  - executed in an isolated JVM. Tests can however be executed in different
- *    JVM on the same machine simultaneously.
- *  - will not have to be executed by the developer before submitting a bug
- *  - ideally, last less than 2 minutes to help parallelization
- *
- *  It the worst case compared to small or medium, use it only for tests that
- *    you cannot put in the other categories
- *
- * @see SmallTests
- * @see MediumTests
- * @see IntegrationTests
- */
-public interface LargeTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
deleted file mode 100644
index 5f8c9b7..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to mapred or mapreduce,
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface MapReduceTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
deleted file mode 100644
index 19a95f2..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the master.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface MasterTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
deleted file mode 100644
index 0b79b3d..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.testclassification;
-
-/**
- * Tag a test as 'Medium', meaning that the test class has the following
- * characteristics:
- *  - executed in an isolated JVM. Tests can however be executed in different
- *    JVM on the same machine simultaneously.
- *  - will have to be executed by the developer before submitting a bug
- *  - ideally, last less than 1 minutes to help parallelization
- *
- *  Use it for tests that cannot be tagged as 'Small'.
- *
- * @see SmallTests
- * @see LargeTests
- * @see IntegrationTests
- */
-public interface MediumTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
deleted file mode 100644
index ef4d3f9..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as not easily falling into any of the below categories.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface MiscTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
deleted file mode 100644
index eab3375..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Tag a test as related to RPC.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface RPCTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
deleted file mode 100644
index 3b03194..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the regionserver,
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface RegionServerTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
deleted file mode 100644
index 4f86404..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to replication,
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface ReplicationTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
deleted file mode 100644
index 16fe1f7..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to the rest capability of HBase.
- *
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface RestTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
deleted file mode 100644
index 907ae7a..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to security.
- *
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface SecurityTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
deleted file mode 100644
index 1552617..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.testclassification;
-
-/**
- * Tag a test as 'small', meaning that the test class has the following
- * characteristics:
- *  - can be run simultaneously with other small tests in the same JVM
- *  - ideally, last less than 15 seconds
- *  - does not use a cluster
- *
- * @see MediumTests
- * @see LargeTests
- * @see IntegrationTests
- */
-public interface SmallTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
deleted file mode 100644
index 96a5e9a..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Tag a test as related to  mapreduce and taking longer than 5 minutes to run on public build
- * infrastructure.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-
-public interface VerySlowMapReduceTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
deleted file mode 100644
index 3caa218..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Tag a test as region tests which takes longer than 5 minutes to run on public build
- * infrastructure.
- * @see org.apache.hadoop.hbase.testclassification.ClientTests
- * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
- * @see org.apache.hadoop.hbase.testclassification.FilterTests
- * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
- * @see org.apache.hadoop.hbase.testclassification.IOTests
- * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
- * @see org.apache.hadoop.hbase.testclassification.MasterTests
- * @see org.apache.hadoop.hbase.testclassification.MiscTests
- * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
- * @see org.apache.hadoop.hbase.testclassification.RPCTests
- * @see org.apache.hadoop.hbase.testclassification.SecurityTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
- * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
- */
-package org.apache.hadoop.hbase.testclassification;
-
-public interface VerySlowRegionServerTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-hadoop2-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index 3b69915..ec0ab21 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -129,6 +129,10 @@ limitations under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-hadoop-compat</artifactId>
     </dependency>
     <dependency>
@@ -145,11 +149,6 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-annotations</artifactId>
-      <version>${hadoop-two.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop-two.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
index 82731b2..4142079 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/mapreduce/JobUtil.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.Cluster;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricQuantile.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricQuantile.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricQuantile.java
index 0fb2295..7263fdb 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricQuantile.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricQuantile.java
@@ -57,4 +57,4 @@ public class MetricQuantile {
     return (int) (Double.doubleToLongBits(quantile) ^ Double
         .doubleToLongBits(error));
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 112f4b5..710a393 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -283,10 +283,6 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </dependency>
       </dependencies>
@@ -337,10 +333,6 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 09fcfd5..0704eb8 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -156,10 +156,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
       </dependencies>
     </profile>
     <!--
@@ -182,10 +178,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
       </dependencies>
     </profile>
   </profiles>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java
index e1a92e0..ecec5c5 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/decode/ArraySearcherPool.java
@@ -60,4 +60,4 @@ public class ArraySearcherPool {
     return ("poolSize:" + pool.size());
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java
index 3b9df91..0a690ce 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/EncoderPool.java
@@ -29,4 +29,4 @@ public interface EncoderPool {
   PrefixTreeEncoder checkOut(OutputStream outputStream, boolean includeMvccVersion);
   void checkIn(PrefixTreeEncoder encoder);
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
index bb83ac5..fce7902 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
@@ -52,4 +52,4 @@ public interface ReversibleCellScanner extends CellScanner {
    *         {@link org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition#BEFORE_FIRST}
    */
   boolean previousRow(boolean endOfRow);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
index ef14a68..d4a92d2 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeHashSet.java
@@ -54,4 +54,4 @@ public class ByteRangeHashSet extends ByteRangeSet {
     Collections.sort(sortedRanges);
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
index 8dd9998..e7f614c 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/byterange/impl/ByteRangeTreeSet.java
@@ -51,4 +51,4 @@ public class ByteRangeTreeSet extends ByteRangeSet {
     sortedRanges.addAll(CollectionUtils.nullSafe(uniqueIndexByUniqueRange.keySet()));
   }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java b/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
index f7e9c7f..933a6e2 100644
--- a/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
+++ b/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
@@ -64,4 +64,4 @@ public final class HBaseZeroCopyByteString extends LiteralByteString {
     throw new UnsupportedOperationException("Need a LiteralByteString, got a "
                                             + buf.getClass().getName());
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 91503d5..509e8e2 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -610,10 +610,6 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
           <scope>test</scope>
         </dependency>
@@ -671,10 +667,6 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-annotations</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
         </dependency>
         <!-- Hadoop needs Netty 3.x at test scope for the minicluster -->

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthReport.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthReport.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthReport.java
index 1f43c0b..83882b0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthReport.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthReport.java
@@ -89,4 +89,4 @@ class HealthReport {
     }
     return true;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index d4a87d3..f270be0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -27,7 +27,7 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.HBaseAdmin;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
index 6654032..dd71dda 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/CoprocessorHConnection.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client;
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.ServerName;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java
index fa28eac..a3ab6fa 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java
@@ -353,4 +353,4 @@ public class HTableWrapper implements HTableInterface {
     table.batchCoprocessorService(methodDescriptor, request, startKey, endKey, responsePrototype,
       callback);
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
index 177ff9b..71b3b8b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java
index 5c3ce87..3f02d70 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.client.coprocessor;
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest;
 import org.apache.hadoop.hbase.regionserver.RowProcessor;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
index bc1b5e6..a53f575 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.coprocessor;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.HColumnDescriptor;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
index 857365f..87d9fb9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.coprocessor;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.HColumnDescriptor;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
index b5a8122..3bd8a5b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.NavigableSet;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Cell;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a5bd9316/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionServerObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionServerObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionServerObserver.java
index afcd457..b66e6ae 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionServerObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionServerObserver.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.client.Mutation;


Mime
View raw message