You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/07/17 20:20:03 UTC
[1/2] tinkerpop git commit: Bump to Spark 2.3.1 and Netty 4.1.25.Final
Repository: tinkerpop
Updated Branches:
refs/heads/master f7e6c0e1e -> 62b17e961
Bump to Spark 2.3.1 and Netty 4.1.25.Final
These really needed to be bumped together because going to netty 4.1.x doesn't work nicely with Spark 2.2.x - Spark only upgraded on 2.3.x.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/07ca64e9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/07ca64e9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/07ca64e9
Branch: refs/heads/master
Commit: 07ca64e9d462a0ea496d3924953532f8b794346f
Parents: 1f240fe
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 27 08:23:58 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jun 29 16:05:23 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
gremlin-console/src/main/static/NOTICE | 2 +-
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +++++++++
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 4 ++--
spark-gremlin/pom.xml | 4 ++--
.../gremlin/spark/process/computer/LocalPropertyTest.java | 7 ++++++-
7 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d4f0c2e..f37c574 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <<release-3-3-3, 3.3.3>>.
+* Bumped to Netty 4.1.25.
+* Bumped to Spark 2.3.1.
* Moved `Parameterizing` interface to the `org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker interfaces of its type.
* Replaced `Parameterizing.addPropertyMutations()` with `Configuring.configure()`.
* Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces as they are tightly related.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 2bcdb41..593d16b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -48,7 +48,7 @@ JavaTuples 1.2
Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
------------------------------------------------------------------------
-Netty 4.0.56
+Netty 4.1.25
------------------------------------------------------------------------
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 537cdbe..4e8ad22 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -1685,5 +1685,14 @@ namespace Gremlin.Net.Process.Traversal
return Wrap<S, E>(this);
}
+ /// <summary>
+ /// Adds the with step to this <see cref="GraphTraversal{SType, EType}" />.
+ /// </summary>
+ public GraphTraversal<S, E> With (string key, object value)
+ {
+ Bytecode.AddStep("with", key, value);
+ return Wrap<S, E>(this);
+ }
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index c166ba7..68e628c 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/
------------------------------------------------------------------------
-Netty 4.0.56
+Netty 4.1.25
------------------------------------------------------------------------
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13dd988..c279851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,10 +146,10 @@ limitations under the License.
<jcabi.version>1.1</jcabi.version>
<log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.2</metrics.version>
- <netty.version>4.0.56.Final</netty.version>
+ <netty.version>4.1.25.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
<snakeyaml.version>1.15</snakeyaml.version>
- <spark.version>2.2.0</spark.version>
+ <spark.version>2.3.1</spark.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index ad3bf43..7b0ffd3 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -261,7 +261,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.5</version>
+ <version>2.6.7</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -281,7 +281,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.43.Final</version>
+ <version>4.1.25.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
index 9ff6225..ba8338e 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
@@ -84,7 +84,12 @@ public class LocalPropertyTest extends AbstractSparkTest {
configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, rddName);
configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, null);
configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, null);
- configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, false);
+
+ // just a note that this value should have always been set to true, but from the initial commit was false.
+ // interestingly the last assertion had always passed up to spark 2.3.x when it started to fail. apparently
+ // that assertion should likely have never passed, so it stands to reason that there was a bug in spark in
+ // 2.2.x that was resolved for 2.3.x....that's my story and i'm sticking to it.
+ configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, true);
configuration.setProperty("spark.jobGroup.id", "44");
graph = GraphFactory.open(configuration);
graph.compute(SparkGraphComputer.class)
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1987'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1987'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62b17e96
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62b17e96
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62b17e96
Branch: refs/heads/master
Commit: 62b17e961e1bf93add063797277ff5762aebde67
Parents: f7e6c0e 07ca64e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 17 13:46:28 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 17 13:46:28 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
gremlin-console/src/main/static/NOTICE | 2 +-
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +++++++++
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 4 ++--
spark-gremlin/pom.xml | 4 ++--
.../gremlin/spark/process/computer/LocalPropertyTest.java | 7 ++++++-
7 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62b17e96/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62b17e96/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
----------------------------------------------------------------------