TINKERPOP-1633 use official jbcrypt 0.4 in maven central
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0fb51e94 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0fb51e94 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0fb51e94 Branch: refs/heads/TINKERPOP-1599 Commit: 0fb51e941cafc733419204a7f80b55c30d5387d4 Parents: 5bba83c Author: Zach A. Thomas <[email protected]> Authored: Mon Feb 13 16:01:16 2017 -0500 Committer: Zach A. Thomas <[email protected]> Committed: Mon Feb 13 16:01:16 2017 -0500 ---------------------------------------------------------------------- gremlin-console/src/main/static/LICENSE | 2 +- gremlin-groovy/pom.xml | 6 +++--- .../gremlin/groovy/plugin/dsl/credential/CredentialGraph.java | 2 +- .../tinkerpop/gremlin/server/auth/SimpleAuthenticator.java | 2 +- gremlin-server/src/main/static/LICENSE | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fb51e94/gremlin-console/src/main/static/LICENSE ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE index 4a621fc..f86c257 100644 --- a/gremlin-console/src/main/static/LICENSE +++ b/gremlin-console/src/main/static/LICENSE @@ -235,4 +235,4 @@ Other Licenses The Apache TinkerPop project bundles the following components under the ISC License: - jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt + jBCrypt (org.mindrot:jbcrypt:0.4 - https://github.com/djmdjm/jBCrypt) - for details, see licenses/jbcrypt http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fb51e94/gremlin-groovy/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml index 55de86a..984e805 100644 --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@ -66,9 +66,9 @@ limitations under the License. <version>3.3.1</version> </dependency> <dependency> - <groupId>com.github.jeremyh</groupId> - <artifactId>jBCrypt</artifactId> - <version>jbcrypt-0.4</version> + <groupId>org.mindrot</groupId> + <artifactId>jbcrypt</artifactId> + <version>0.4</version> </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fb51e94/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 c2abdbf..a766f46 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/0fb51e94/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 93a2096..eccc1f4 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; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fb51e94/gremlin-server/src/main/static/LICENSE ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE index 69c411c..78c3648 100644 --- a/gremlin-server/src/main/static/LICENSE +++ b/gremlin-server/src/main/static/LICENSE @@ -239,4 +239,4 @@ The Apache TinkerPop project bundles the following components under the BSD/MIT The Apache TinkerPop project bundles the following components under the ISC License: - jBCrypt (com.github.jeremyh:jBCrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details, see licenses/jbcrypt + jBCrypt (org.mindrot:jbcrypt:0.4 - https://github.com/djmdjm/jBCrypt) - for details, see licenses/jbcrypt
