AMBARI-20884. Compilation error due to import from relocated package
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e61fea51 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e61fea51 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e61fea51 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: e61fea51b5ffb9c74f746810713a7d9f1f27184f Parents: d8d5868 Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Tue Jun 6 13:08:21 2017 +0200 Committer: Attila Doroszlai <adorosz...@hortonworks.com> Committed: Tue Jun 6 13:09:50 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/orm/entities/UpgradeEntity.java | 3 ++- .../apache/ambari/server/orm/entities/UpgradeHistoryEntity.java | 3 ++- .../ambari/server/serveraction/upgrades/UpgradeActionTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e61fea51/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java index 975d6a6..43b2e08 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java @@ -41,7 +41,8 @@ import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.state.stack.upgrade.Direction; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.hadoop.metrics2.sink.relocated.google.common.base.Objects; + +import com.google.common.base.Objects; /** * Models the data representation of an upgrade http://git-wip-us.apache.org/repos/asf/ambari/blob/e61fea51/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java index 8bfafd3..0f7ac72 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java @@ -31,7 +31,8 @@ import javax.persistence.TableGenerator; import javax.persistence.UniqueConstraint; import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.hadoop.metrics2.sink.relocated.google.common.base.Objects; + +import com.google.common.base.Objects; /** * The {@link UpgradeHistoryEntity} represents the version history of components http://git-wip-us.apache.org/repos/asf/ambari/blob/e61fea51/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java index 35fffda..b6fa6d2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java @@ -79,7 +79,7 @@ import org.apache.ambari.server.state.UpgradeState; import org.apache.ambari.server.state.stack.UpgradePack; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; import org.apache.ambari.server.utils.EventBusSynchronizer; -import org.apache.hadoop.metrics2.sink.relocated.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before;