You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/18 21:11:04 UTC
[01/12] incubator-tinkerpop git commit: Update hadoop to 2.7.2
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 714d8cd53 -> 60f977839
Update hadoop to 2.7.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/76fe3004
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/76fe3004
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/76fe3004
Branch: refs/heads/master
Commit: 76fe3004025847b9de9e5fd209aff936a6947821
Parents: da5abb0
Author: Hendy Irawan <he...@hendyirawan.com>
Authored: Tue Mar 15 20:14:33 2016 +0700
Committer: Hendy Irawan <he...@hendyirawan.com>
Committed: Tue Mar 15 20:14:33 2016 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/76fe3004/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acef6c6..99194f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@ limitations under the License.
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
<slf4j.version>1.7.12</slf4j.version>
- <hadoop.version>2.7.1</hadoop.version>
+ <hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
[09/12] incubator-tinkerpop git commit: Use mirrors for download
location.
Posted by ok...@apache.org.
Use mirrors for download location.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/08ed04b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/08ed04b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/08ed04b8
Branch: refs/heads/master
Commit: 08ed04b81608f2403999ea69d758f804b07447c9
Parents: 46f4d9d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Mar 18 08:52:30 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Mar 18 08:52:30 2016 -0400
----------------------------------------------------------------------
docs/src/tutorials/getting-started/index.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/08ed04b8/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index bfdfe97..7b82751 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -51,11 +51,11 @@ NOTE: Are you unsure of what a vertex or edge is? That topic is covered in the <
but please allow the tutorial to get you oriented with the Gremlin Console first, so that you have an understanding of
the tool that will help you with your learning experience.
-Download the console, unpackage it and start it:
+link:https://www.apache.org/dyn/closer.lua/incubator/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip[Download the console],
+unpackage it and start it:
[source,text]
----
-$ curl -L -O http://archive.apache.org/dist/incubator/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip
$ unzip apache-gremlin-console-x.y.z-bin.zip
$ cd apache-gremlin-console-x.y.z-bin.zip
$ bin/gremlin.sh
[06/12] incubator-tinkerpop git commit: Fixed a bug in waiting
futures for the driver ResultQueue.
Posted by ok...@apache.org.
Fixed a bug in waiting futures for the driver ResultQueue.
if the client queued a CompletableFuture waiting for results before errors occurred on the server, the CompletableFuture would complete() successfully with an empty result instead of an error. This bug was also fixed in master already. Replicating it here for 3.1.2 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/113b6d17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/113b6d17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/113b6d17
Branch: refs/heads/master
Commit: 113b6d1778e9cac4353b8180eb29a7a74a170849
Parents: 77d4272
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 16 16:18:00 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 16 16:18:00 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++--
.../org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 11 +++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/113b6d17/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 53c817f..ea53882 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug in `gremlin-driver` where a really fast call to get a `Future` to wait for a result might not register an error raised from the server.
* Fixed a severe bug where `LP_O_OB_P_S_SE_SL_Traverser` was not registered with `GryoMapper`.
* The future from `GremlinExecutor.eval()` is completed after the entire evaluation lifecyle is completed.
* Spark `Memory` uses `collect().iterator()` instead of `toLocalIterator()` to reduce noise in Spark UI.
@@ -37,8 +38,8 @@ TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
* Fixed a bug where `OrderGlobalStep` and `OrderLocalStep` were not incorporating their children's traverser requirements.
* Fixed a compilation bug in `TraversalExplanation`.
* Fixed bug where a session explicitly closed was being closed again by session expiration.
-* Improved the recovery options for Gremlin Driver after failed requests to Gremlin Server.
-* Added `maxWaitForSessionClose` to the settings for Gremlin Driver.
+* Improved the recovery options for `gremlin-driver` after failed requests to Gremlin Server.
+* Added `maxWaitForSessionClose` to the settings for `gremlin-driver`.
* Bumped to Netty 4.0.34.Final.
* Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".
* Bumped to Apache Groovy 2.4.6.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/113b6d17/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 1a55edc..da6a008 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -124,10 +124,17 @@ final class ResultQueue {
flushed.set(true);
}
- private static void internalDrain(final int items, final CompletableFuture<List<Result>> result,
+ private void internalDrain(final int items, final CompletableFuture<List<Result>> result,
final LinkedBlockingQueue<Result> resultLinkedBlockingQueue) {
final List<Result> results = new ArrayList<>(items);
resultLinkedBlockingQueue.drainTo(results, items);
- result.complete(results);
+
+ // it's important to check for error here because a future may have already been queued in "waiting" prior
+ // to the first response back from the server. if that happens, any "waiting" futures should be completed
+ // exceptionally otherwise it will look like success.
+ if (null == error.get())
+ result.complete(results);
+ else
+ result.completeExceptionally(error.get());
}
}
[07/12] incubator-tinkerpop git commit: Changed test semantics to
match the new manner in which the ResultQueue works.
Posted by ok...@apache.org.
Changed test semantics to match the new manner in which the ResultQueue works.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8645c147
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8645c147
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8645c147
Branch: refs/heads/master
Commit: 8645c1471fd5a539d477087567eda35a985e8fe5
Parents: 113b6d1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 17 19:14:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 17 19:15:16 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/ResultQueueTest.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8645c147/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index 12f85ec..91b9ee3 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.driver;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.junit.Test;
import java.util.ArrayList;
@@ -141,7 +142,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
}
@Test
- public void shouldAwaitEverythingAndFlushOnMarkError() throws Exception {
+ public void shouldAwaitFailTheFutureOnMarkError() throws Exception {
// not so sure this is good behavior (i.e. flushing whatever has arrived up to the error)
final CompletableFuture<List<Result>> future = resultQueue.await(4);
resultQueue.add(new Result("test1"));
@@ -149,14 +150,15 @@ public class ResultQueueTest extends AbstractResultQueueTest {
resultQueue.add(new Result("test3"));
assertThat(future.isDone(), is(false));
- resultQueue.markError(new Exception());
+ resultQueue.markError(new Exception("no worky"));
assertThat(future.isDone(), is(true));
- final List<Result> results = future.get();
- assertEquals("test1", results.get(0).getString());
- assertEquals("test2", results.get(1).getString());
- assertEquals("test3", results.get(2).getString());
- assertEquals(3, results.size());
+ try {
+ future.get();
+ } catch (Exception ex) {
+ final Throwable t = ExceptionUtils.getRootCause(ex);
+ assertEquals("no worky", t.getMessage());
+ }
}
@Test
[11/12] incubator-tinkerpop git commit: updated CHANGELOG and docs to
reflect Hadoop 2.7.2 support. Giraph and Spark pom.xml manifest needed
updating.
Posted by ok...@apache.org.
updated CHANGELOG and docs to reflect Hadoop 2.7.2 support. Giraph and Spark pom.xml manifest needed updating.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6c4dc6f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6c4dc6f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6c4dc6f1
Branch: refs/heads/master
Commit: 6c4dc6f1459601c0d8a6307e175d167ef6af3e5b
Parents: fe197c1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 18 13:07:42 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 18 13:07:42 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/implementations-hadoop.asciidoc | 2 +-
giraph-gremlin/pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ea53882..1733330 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to Apache Hadoop 2.7.2.
* Fixed a bug in `gremlin-driver` where a really fast call to get a `Future` to wait for a result might not register an error raised from the server.
* Fixed a severe bug where `LP_O_OB_P_S_SE_SL_Traverser` was not registered with `GryoMapper`.
* The future from `GremlinExecutor.eval()` is completed after the entire evaluation lifecyle is completed.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc
index 59c7412..54ed776 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -34,7 +34,7 @@ using both TinkerPop3's OLTP and OLAP graph computing models.
IMPORTANT: This section assumes that the user has a Hadoop 2.x cluster functioning. For more information on getting
started with Hadoop, please see the
-link:http://hadoop.apache.org/docs/r2.7.1/hadoop-project-dist/hadoop-common/SingleCluster.html[Single Node Setup]
+link:http://hadoop.apache.org/docs/r2.7.2/hadoop-project-dist/hadoop-common/SingleCluster.html[Single Node Setup]
tutorial. Moreover, if using `GiraphGraphComputer` or `SparkGraphComputer` it is advisable that the reader also
familiarize their self with Giraph (link:http://giraph.apache.org/quick_start.html[Getting Started]) and Spark
(link:http://spark.apache.org/docs/latest/quick-start.html[Quick Start]).
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 347bd0d..190f5c8 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -248,7 +248,7 @@ limitations under the License.
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
</Gremlin-Plugin-Dependencies>
</manifestEntries>
</archive>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6c4dc6f1/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 6e4ab17..e671d69 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -382,7 +382,7 @@
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
</Gremlin-Plugin-Dependencies>
<!-- deletes the servlet-api jar from the path after install - causes conflicts -->
<Gremlin-Plugin-Paths>servlet-api-2.5.jar=</Gremlin-Plugin-Paths>
[04/12] incubator-tinkerpop git commit: Make hadoop-gremlin and
giraph-gremlin pass enforcer
Posted by ok...@apache.org.
Make hadoop-gremlin and giraph-gremlin pass enforcer
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/91546603
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/91546603
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/91546603
Branch: refs/heads/master
Commit: 915466039ff1bca2d773e7d56c8bbebf243a9d65
Parents: eb382a2
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 21:31:11 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 21:31:11 2016 +0700
----------------------------------------------------------------------
giraph-gremlin/pom.xml | 10 ++++++++++
hadoop-gremlin/pom.xml | 22 ++++++++++------------
2 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/91546603/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 727e1cb..347bd0d 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -25,6 +25,16 @@ limitations under the License.
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- see: https://github.com/apache/hadoop/pull/84 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/91546603/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 2ddcb15..ee18ca9 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -25,6 +25,16 @@ limitations under the License.
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- see: https://github.com/apache/hadoop/pull/84 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -37,23 +47,11 @@ limitations under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <!-- see: https://github.com/apache/hadoop/pull/84 -->
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
- <!-- see: https://github.com/apache/hadoop/pull/84 -->
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
-
- <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
[05/12] incubator-tinkerpop git commit: TINKERPOP-1068 Bumped to
jbcrypt 0.4
Posted by ok...@apache.org.
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 <sp...@genoprime.com>
Authored: Wed Mar 16 07:43:59 2016 -0400
Committer: Stephen Mallette <sp...@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
[12/12] incubator-tinkerpop git commit: CTR on a pointless file
reference in spark-gremlin pom.xml
Posted by ok...@apache.org.
CTR on a pointless file reference in spark-gremlin pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/60f97783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/60f97783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/60f97783
Branch: refs/heads/master
Commit: 60f9778397a6dd6082478b3ec34f2b654cc6e211
Parents: 714d8cd 6c4dc6f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 18 14:10:57 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 18 14:10:57 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 ++++--
docs/src/reference/implementations-hadoop.asciidoc | 2 +-
docs/src/tutorials/getting-started/index.asciidoc | 4 ++--
giraph-gremlin/pom.xml | 12 +++++++++++-
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 +-
hadoop-gremlin/pom.xml | 12 +++++++++++-
pom.xml | 2 +-
spark-gremlin/pom.xml | 5 +----
12 files changed, 42 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/giraph-gremlin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/gremlin-groovy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60f97783/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --cc spark-gremlin/pom.xml
index 8a0508a,e671d69..97583ae
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@@ -393,7 -393,7 +393,6 @@@
</plugin>
</plugins>
</build>
--
<profiles>
<profile>
<id>appveyor</id>
@@@ -410,8 -410,8 +409,6 @@@
<configuration>
<excludes>
<exclude>**/SparkHadoopGremlinTest*</exclude>
-- <exclude>**/SparkGraphComputerGroovyProcessIntegrateTest*</exclude>
-- <exclude>**/SparkGraphComputerProcessIntegrateTest*</exclude>
<exclude>**/GryoSerializerIntegrateTest*</exclude>
</excludes>
</configuration>
[02/12] incubator-tinkerpop git commit: Use netty 3.7.1.Final
Posted by ok...@apache.org.
Use netty 3.7.1.Final
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/18c0ae38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/18c0ae38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/18c0ae38
Branch: refs/heads/master
Commit: 18c0ae3855bc09265b67b77e943f4d468ac13202
Parents: 76fe300
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 20:56:33 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 20:56:33 2016 +0700
----------------------------------------------------------------------
hadoop-gremlin/pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/18c0ae38/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 2221d76..694ec83 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -37,6 +37,12 @@ limitations under the License.
<version>${project.version}</version>
</dependency>
<dependency>
+ <!-- see: https://github.com/apache/hadoop/pull/84 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
@@ -161,7 +167,7 @@ limitations under the License.
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.1
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
</Gremlin-Plugin-Dependencies>
</manifestEntries>
</archive>
[10/12] incubator-tinkerpop git commit: Merge remote-tracking branch
'ceefour/patch-3' into tp31
Posted by ok...@apache.org.
Merge remote-tracking branch 'ceefour/patch-3' into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fe197c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fe197c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fe197c18
Branch: refs/heads/master
Commit: fe197c18beccdb7b533fd76288f84a20815535c6
Parents: 08ed04b 9154660
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 18 12:24:34 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 18 12:24:34 2016 -0600
----------------------------------------------------------------------
giraph-gremlin/pom.xml | 10 ++++++++++
hadoop-gremlin/pom.xml | 12 +++++++++++-
pom.xml | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[03/12] incubator-tinkerpop git commit: Use netty 3.7.1.Final
Posted by ok...@apache.org.
Use netty 3.7.1.Final
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eb382a2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eb382a2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eb382a2d
Branch: refs/heads/master
Commit: eb382a2d0dfbdc6bf3af543e0777eeda4eba816a
Parents: 18c0ae3
Author: Hendy Irawan <ce...@gmail.com>
Authored: Tue Mar 15 21:05:46 2016 +0700
Committer: Hendy Irawan <ce...@gmail.com>
Committed: Tue Mar 15 21:05:46 2016 +0700
----------------------------------------------------------------------
hadoop-gremlin/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eb382a2d/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 694ec83..2ddcb15 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -48,6 +48,12 @@ limitations under the License.
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <!-- see: https://github.com/apache/hadoop/pull/84 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
[08/12] incubator-tinkerpop git commit: Point download of console at
archives away from dist.
Posted by ok...@apache.org.
Point download of console at archives away from dist.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/46f4d9d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/46f4d9d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/46f4d9d9
Branch: refs/heads/master
Commit: 46f4d9d9d92e92a67027079a52da59624de9a619
Parents: 8645c14
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Mar 18 08:32:06 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Mar 18 08:32:06 2016 -0400
----------------------------------------------------------------------
docs/src/tutorials/getting-started/index.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/46f4d9d9/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index 19e5947..bfdfe97 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -55,7 +55,7 @@ Download the console, unpackage it and start it:
[source,text]
----
-$ curl -L -O https://www.apache.org/dist/incubator/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip
+$ curl -L -O http://archive.apache.org/dist/incubator/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip
$ unzip apache-gremlin-console-x.y.z-bin.zip
$ cd apache-gremlin-console-x.y.z-bin.zip
$ bin/gremlin.sh