AMBARI-22325 Fix build errors (benyoka)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b57e54a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b57e54a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b57e54a Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2 Commit: 3b57e54a6bea9a74ac5dd57e66be0be60c8f4c0a Parents: 017bfc8 Author: Balazs Bence Sari <beny...@apache.org> Authored: Fri Nov 24 12:23:46 2017 +0100 Committer: Doroszlai, Attila <adorosz...@hortonworks.com> Committed: Fri Dec 8 20:24:25 2017 +0100 ---------------------------------------------------------------------- .../apache/ambari/server/topology/SecurityConfiguration.java | 4 ++-- .../ambari/server/topology/SecurityConfigurationTest.java | 5 +++-- .../ambari/server/topology/TopologyTemplateFactoryTest.java | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3b57e54a/ambari-server/src/main/java/org/apache/ambari/server/topology/SecurityConfiguration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/SecurityConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/SecurityConfiguration.java index 864e802..00ad10b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/SecurityConfiguration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/SecurityConfiguration.java @@ -22,12 +22,12 @@ package org.apache.ambari.server.topology; import java.io.IOException; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.ambari.server.state.SecurityType; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Holds security related properties, the securityType and security descriptor (in case of KERBEROS http://git-wip-us.apache.org/repos/asf/ambari/blob/3b57e54a/ambari-server/src/test/java/org/apache/ambari/server/topology/SecurityConfigurationTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/SecurityConfigurationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/SecurityConfigurationTest.java index 4af0806..1e49a97 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/SecurityConfigurationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/SecurityConfigurationTest.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertEquals; import java.util.Map; +import org.apache.ambari.server.utils.ResourceUtils; +import org.junit.Test; + import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.ambari.server.utils.ResourceUtils; -import org.junit.Test; public class SecurityConfigurationTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/3b57e54a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyTemplateFactoryTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyTemplateFactoryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyTemplateFactoryTest.java index 7efbbd6..67c6590 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyTemplateFactoryTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyTemplateFactoryTest.java @@ -23,17 +23,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.io.IOException; import java.util.Map; import org.apache.ambari.server.state.SecurityType; import org.apache.ambari.server.utils.ResourceUtils; import org.junit.Test; -import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.io.Resources; public class TopologyTemplateFactoryTest {
