[6/8] hbase git commit: HBASE-17908 Upgrade guava
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5c6e110/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
index 3e4016d..16093b5 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
+import
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
/**
* Implementation of the Cormode, Korn, Muthukrishnan, and Srivastava algorithm
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5c6e110/hbase-it/pom.xml
--
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 14c8e71..953dacc 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -215,6 +215,12 @@
org.apache.hbase
hbase-hadoop-compat
+
+
+ com.google.guava
+ guava
+
+
org.apache.hbase
@@ -226,8 +232,8 @@
hbase-testing-util
- com.google.guava
- guava
+ org.apache.hbase.thirdparty
+ hbase-shaded-miscellaneous
io.dropwizard.metrics
@@ -295,12 +301,24 @@
org.apache.hadoop
hadoop-mapreduce-client-core
+
+
+ com.google.guava
+ guava
+
+
org.apache.hadoop
hadoop-mapreduce-client-jobclient
test-jar
test
+
+
+ com.google.guava
+ guava
+
+
org.apache.hadoop
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5c6e110/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
--
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
index ca8e277..e1c17a4 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Sets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.regionserver.CompactingMemStore;
import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5c6e110/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
--
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index 8596489..f041f72 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -46,14 +46,15 @@ import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.MoreObjects;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Objects;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
/**
* An integration test to detect regressions in HBASE-7912. Create
@@ -297,7 +298,8 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
rowsInBatch =
Integer.parseInt(cmd.getOptionValue(NB_ROWS_IN_BATCH_KEY,
Integer.toString(DEFAULT_NB_ROWS_IN_BATCH)));
-LOG.info(Objects.toStringHelper("Parsed Options").add(REGION_COUNT_KEY,
regionsCountPerServer)
+LOG.info(MoreObjects.toStringHelper("Parsed Options").
+ add(REGION_COUNT_KEY, regionsCountPerServer)
.add(REGIONSERVER_COUNT_KEY,
regionServerCount).add(NB_ROWS_
[6/8] hbase git commit: HBASE-17908 Upgrade guava
http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
index 3e4016d..16093b5 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/util/MetricSampleQuantiles.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
+import
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
/**
* Implementation of the Cormode, Korn, Muthukrishnan, and Srivastava algorithm
http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-it/pom.xml
--
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index ae8c790..eba4440 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -215,6 +215,12 @@
org.apache.hbase
hbase-hadoop-compat
+
+
+ com.google.guava
+ guava
+
+
org.apache.hbase
@@ -226,8 +232,8 @@
hbase-testing-util
- com.google.guava
- guava
+ org.apache.hbase.thirdparty
+ hbase-shaded-miscellaneous
io.dropwizard.metrics
@@ -295,12 +301,24 @@
org.apache.hadoop
hadoop-mapreduce-client-core
+
+
+ com.google.guava
+ guava
+
+
org.apache.hadoop
hadoop-mapreduce-client-jobclient
test-jar
test
+
+
+ com.google.guava
+ guava
+
+
org.apache.hadoop
http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
--
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
index ca8e277..e1c17a4 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Sets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.regionserver.CompactingMemStore;
import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
--
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index 8596489..f041f72 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -46,14 +46,15 @@ import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.MoreObjects;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Objects;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
/**
* An integration test to detect regressions in HBASE-7912. Create
@@ -297,7 +298,8 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
rowsInBatch =
Integer.parseInt(cmd.getOptionValue(NB_ROWS_IN_BATCH_KEY,
Integer.toString(DEFAULT_NB_ROWS_IN_BATCH)));
-LOG.info(Objects.toStringHelper("Parsed Options").add(REGION_COUNT_KEY,
regionsCountPerServer)
+LOG.info(MoreObjects.toStringHelper("Parsed Options").
+ add(REGION_COUNT_KEY, regionsCountPerServer)
.add(REGIONSERVER_COUNT_KEY,
regionServerCount).add(NB_ROWS_
