You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by da...@apache.org on 2017/02/15 18:24:52 UTC
[36/40] tinkerpop git commit: Fix imports for jbcrypt 0.4 CTR
Fix imports for jbcrypt 0.4 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9d743725
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9d743725
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9d743725
Branch: refs/heads/TINKERPOP-1599
Commit: 9d743725d256d5a33d566d0dc6a5501156b85af8
Parents: 9750750
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 15 12:36:24 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Feb 15 12:36:24 2017 -0500
----------------------------------------------------------------------
.../gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java | 2 +-
.../gremlin/groovy/plugin/dsl/credential/CredentialGraph.java | 2 +-
.../apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d743725/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
index 707e816..9220282 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
@@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.mindrot.BCrypt;
+import org.mindrot.jbcrypt.BCrypt;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d743725/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java
index 6a90587..564c573 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java
@@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.mindrot.BCrypt;
+import org.mindrot.jbcrypt.BCrypt;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d743725/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
index 2fd8b4e..10c3531 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
@@ -24,7 +24,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.IoCore;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.mindrot.BCrypt;
+import org.mindrot.jbcrypt.BCrypt;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;