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/03/26 20:05:09 UTC
tinkerpop git commit: Pinned netty to 4.0.x for spark/console
Repository: tinkerpop
Updated Branches:
refs/heads/spark-deps-fix [created] a136b7d6e
Pinned netty to 4.0.x for spark/console
Spark and Gremlin Console use netty 4.0.x. They have to be the same version because spark is incompatible with 4.1.x so if the console has that version present then spark jobs won't submit and docs won't generate. Luckily, the driver is fine with 4.0.x in terms of connecting to 4.1.x from the testing i've tried.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a136b7d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a136b7d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a136b7d6
Branch: refs/heads/spark-deps-fix
Commit: a136b7d6ed1abc078426bbd4d91e0df1d9a4cc50
Parents: 53a0b56
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 26 16:02:54 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 26 16:02:54 2018 -0400
----------------------------------------------------------------------
gremlin-console/pom.xml | 14 ++++++++++++++
gremlin-tools/gremlin-coverage/pom.xml | 8 ++++++++
spark-gremlin/pom.xml | 15 +++++----------
3 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a136b7d6/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 365fc90..cd2c82d 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -50,6 +50,20 @@ limitations under the License.
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
<version>${project.version}</version>
+ <!-- force the console to use netty 4.0.56.Final to comply with spark 2.2.0 which is incompatible with
+ netty 4.1.x line used by Gremlin driver/server -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- We can avoid pinning the console to this version once spark is upgraded to support netty 4.1.x -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.56.Final</version>
</dependency>
<dependency>
<groupId>org.gperfutils</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a136b7d6/gremlin-tools/gremlin-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-coverage/pom.xml b/gremlin-tools/gremlin-coverage/pom.xml
index 979fc48..839243f 100644
--- a/gremlin-tools/gremlin-coverage/pom.xml
+++ b/gremlin-tools/gremlin-coverage/pom.xml
@@ -15,6 +15,14 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-console</artifactId>
<version>${project.version}</version>
+ <!-- console is temporarily pinned to netty 4.0.x until spark upgrades to 4.1.x - see the gremlin-console
+ and spark-gremlin pom.xml for more information -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a136b7d6/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 8e3d352..355e1d5 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -233,10 +233,6 @@
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
@@ -278,15 +274,14 @@
<artifactId>snappy-java</artifactId>
<version>1.1.1.7</version>
</dependency>
+ <!-- this is the last version of netty on the 4.0.x line. spark 2.2.0 is bound to 4.0.43.Final actually.
+ 4.1.x is not compatible which is what gremlin-server/console are on. allowed netty to specify the version
+ of io.netty/netty which is 3.9.9.Final. when this gets sorted, fix-up gremlin-coverage and gremlin-console
+ pom.xml files as well -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.43.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.9.9.Final</version>
+ <version>4.0.56.Final</version>
</dependency>
<!-- TEST -->
<dependency>