Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 25D5D200C43 for ; Wed, 15 Feb 2017 19:24:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2476E160B5E; Wed, 15 Feb 2017 18:24:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1D8CB160B8F for ; Wed, 15 Feb 2017 19:24:18 +0100 (CET) Received: (qmail 79554 invoked by uid 500); 15 Feb 2017 18:24:18 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 79141 invoked by uid 99); 15 Feb 2017 18:24:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2017 18:24:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC2F0DFD9E; Wed, 15 Feb 2017 18:24:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davebshow@apache.org To: commits@tinkerpop.apache.org Date: Wed, 15 Feb 2017 18:24:49 -0000 Message-Id: <2177dbf2b1ca4d5eb1fda31a3265b21b@git.apache.org> In-Reply-To: <9ed9a243ae324c48879ca6a8db427b65@git.apache.org> References: <9ed9a243ae324c48879ca6a8db427b65@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/40] tinkerpop git commit: Merge branch 'tp31' into tp32 archived-at: Wed, 15 Feb 2017 18:24:22 -0000 Merge branch 'tp31' into tp32 Conflicts: gremlin-groovy/pom.xml Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/16284672 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/16284672 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/16284672 Branch: refs/heads/TINKERPOP-1599 Commit: 162846724898e74801e8c8cb60168feb96c2c44a Parents: 4c9a503 2e62809 Author: Stephen Mallette Authored: Wed Feb 15 10:43:53 2017 -0500 Committer: Stephen Mallette Committed: Wed Feb 15 10:43:53 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 10 +++------- docs/src/reference/gremlin-applications.asciidoc | 2 -- gremlin-console/src/main/static/LICENSE | 2 +- gremlin-groovy/pom.xml | 9 +++++---- .../groovy/plugin/dsl/credential/CredentialGraph.java | 2 +- .../gremlin/server/auth/SimpleAuthenticator.java | 2 +- gremlin-server/src/main/static/LICENSE | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16284672/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16284672/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16284672/gremlin-groovy/pom.xml ---------------------------------------------------------------------- diff --cc gremlin-groovy/pom.xml index 36ae6d5,d9d4f3a..a81a56b --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@@ -61,21 -61,15 +61,26 @@@ limitations under the License indy + com.github.jeremyh + jBCrypt + jbcrypt-0.4 + + org.apache.commons commons-lang3 - 3.3.1 + ${commons.lang3.version} + + org.mindrot + jbcrypt + 0.4 + + + + org.slf4j + slf4j-log4j12 + test + org.apache.tinkerpop gremlin-test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16284672/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraph.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16284672/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java ----------------------------------------------------------------------