HADOOP-14280. Fix compilation of TestKafkaMetrics.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26f5552f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26f5552f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26f5552f Branch: refs/heads/HDFS-10467 Commit: 26f5552f0b6e8a01fd77942c641a9a1cc3be60ae Parents: 04ef448 Author: Andrew Wang <[email protected]> Authored: Wed Apr 5 15:12:03 2017 -0700 Committer: Inigo <[email protected]> Committed: Thu Apr 6 18:58:22 2017 -0700 ---------------------------------------------------------------------- hadoop-tools/hadoop-kafka/pom.xml | 26 -------------------- .../hadoop/metrics2/impl/TestKafkaMetrics.java | 4 +-- 2 files changed, 2 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26f5552f/hadoop-tools/hadoop-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-kafka/pom.xml b/hadoop-tools/hadoop-kafka/pom.xml index 06c38f7..13e0ac0 100644 --- a/hadoop-tools/hadoop-kafka/pom.xml +++ b/hadoop-tools/hadoop-kafka/pom.xml @@ -36,32 +36,6 @@ <downloadSources>true</downloadSources> </properties> - <profiles> - <profile> - <id>tests-off</id> - <activation> - <file> - <missing>src/test/resources/auth-keys.xml</missing> - </file> - </activation> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> - <profile> - <id>tests-on</id> - <activation> - <file> - <exists>src/test/resources/auth-keys.xml</exists> - </file> - </activation> - <properties> - <maven.test.skip>false</maven.test.skip> - </properties> - </profile> - - </profiles> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/hadoop/blob/26f5552f/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java index eff1afa..8479298 100644 --- a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java +++ b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java @@ -18,7 +18,7 @@ package org.apache.hadoop.metrics2.impl; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import org.apache.commons.configuration2.SubsetConfiguration; import org.apache.hadoop.metrics2.AbstractMetric; @@ -74,7 +74,7 @@ public class TestKafkaMetrics { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name()) + return MoreObjects.toStringHelper(this).add("name", name()) .add("description", desc).toString(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
