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 <[email protected]>
Authored: Wed Feb 15 10:43:53 2017 -0500
Committer: Stephen Mallette <[email protected]>
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
<classifier>indy</classifier>
</dependency>
<dependency>
+ <groupId>com.github.jeremyh</groupId>
+ <artifactId>jBCrypt</artifactId>
+ <version>jbcrypt-0.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
+ <version>${commons.lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mindrot</groupId>
+ <artifactId>jbcrypt</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-test</artifactId>
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
----------------------------------------------------------------------
