tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [05/12] incubator-tinkerpop git commit: TINKERPOP-1068 Bumped to jbcrypt 0.4
Date Fri, 18 Mar 2016 20:11:08 GMT
TINKERPOP-1068 Bumped to jbcrypt 0.4

Used a jitpack.io version for now to solve the problem for 3.1.2 since there is no officially
published version of this artifact.  CTR


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/77d4272f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/77d4272f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/77d4272f

Branch: refs/heads/master
Commit: 77d4272f805a683e5acd2f301d06406c95c3de0b
Parents: e8b6f8e
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Mar 16 07:43:59 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Mar 16 07:43:59 2016 -0400

----------------------------------------------------------------------
 gremlin-console/src/main/static/LICENSE                   |  2 +-
 gremlin-groovy/pom.xml                                    | 10 +++++++---
 .../groovy/plugin/dsl/credential/CredentialGraph.java     |  2 +-
 .../gremlin/server/auth/SimpleAuthenticator.java          |  2 +-
 gremlin-server/src/main/static/LICENSE                    |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77d4272f/gremlin-console/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index db0c2a7..5976d4c 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 (org.mindrot:jbcrypt:0.3m - https://github.com/jeremyh/jBCrypt) - for details,
see licenses/jbcrypt
\ No newline at end of file
+     jBCrypt (org.mindrot:jbcrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details,
see licenses/jbcrypt
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77d4272f/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 08cccd3..db6fef7 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>org.mindrot</groupId>
-            <artifactId>jbcrypt</artifactId>
-            <version>0.3m</version>
+            <groupId>com.github.jeremyh</groupId>
+            <artifactId>jBCrypt</artifactId>
+            <version>jbcrypt-0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
@@ -82,6 +82,10 @@ limitations under the License.
             <id>hyracks-releases</id>
             <url>http://obelix.ics.uci.edu/nexus/content/groups/hyracks-public-releases/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
     <build>
         <directory>${basedir}/target</directory>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77d4272f/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 a766f46..c2abdbf 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.jbcrypt.BCrypt;
+import org.mindrot.BCrypt;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77d4272f/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 ac25526..2436c29 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.jbcrypt.BCrypt;
+import org.mindrot.BCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/77d4272f/gremlin-server/src/main/static/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index 5502044..a3d2ea5 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 (org.mindrot:jbcrypt:0.3m - https://github.com/jeremyh/jBCrypt) - for details,
see deps/jbcrypt
\ No newline at end of file
+     jBCrypt (org.mindrot:jbcrypt:0.4 - https://github.com/jeremyh/jBCrypt) - for details,
see deps/jbcrypt
\ No newline at end of file


Mime
View raw message