Repository: accumulo Updated Branches: refs/heads/1.6 712504b2d -> a323f0362 refs/heads/master 93a3d5c69 -> 0b4b694d4
ACCUMULO-3576 Use guava's preconditions, not jline's Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a323f036 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a323f036 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a323f036 Branch: refs/heads/1.6 Commit: a323f0362417c9f62dd9d6d3ee6c513e78fa03cc Parents: 712504b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Feb 10 20:04:01 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Feb 10 20:04:01 2015 -0500 ---------------------------------------------------------------------- .../core/client/security/tokens/CredentialProviderToken.java | 4 ++-- .../apache/accumulo/core/conf/CredentialProviderFactoryShim.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a323f036/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java index baae411..d8ebc4a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java +++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java @@ -21,12 +21,12 @@ import java.nio.CharBuffer; import java.util.LinkedHashSet; import java.util.Set; -import jline.internal.Preconditions; - import org.apache.accumulo.core.conf.CredentialProviderFactoryShim; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.hadoop.conf.Configuration; +import com.google.common.base.Preconditions; + /** * An {@link AuthenticationToken} backed by a Hadoop CredentialProvider. */ http://git-wip-us.apache.org/repos/asf/accumulo/blob/a323f036/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java index 81fe540..3c3c051 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java @@ -23,13 +23,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import jline.internal.Preconditions; - import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.hadoop.conf.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; + /** * Shim around Hadoop: tries to use the CredentialProviderFactory provided by hadoop-common, falling back to a copy inside accumulo-core. * <p>
