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/27 11:22:52 UTC

tinkerpop git commit: TINKERPOP-1884 Revert netty back to 4.0.56.Final

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 53a0b56b9 -> 2e74c31c3


TINKERPOP-1884 Revert netty back to 4.0.56.Final

4.1.x conflicted with spark and there was no clear upgrade path that didn't look like a hack. CTR


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

Branch: refs/heads/tp33
Commit: 2e74c31c39b959263605436555ba9cbc05eab2c5
Parents: 53a0b56
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 07:21:39 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 07:21:39 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                     | 1 -
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 pom.xml                                | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e42c7b6..e968c95 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 This release also includes changes from <<release-3-2-8, 3.2.8>>.
 
 * Fixed regression issue where the HTTPChannelizer doesn't instantiate the specified AuthenticationHandler.
-* Bumped to Netty 4.1.21.Final.
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
 * Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to `List`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index fed03e1..a6a6d10 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 ------------------------------------------------------------------------
-Netty 4.1.21
+Netty 4.0.56
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index f50caec..cc20c09 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.1.21
+Netty 4.0.56
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d4c8d28..bab77a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@ limitations under the License.
         <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
         <jcabi.version>1.1</jcabi.version>
         <metrics.version>3.0.2</metrics.version>
-        <netty.version>4.1.21.Final</netty.version>
+        <netty.version>4.0.56.Final</netty.version>
         <slf4j.version>1.7.21</slf4j.version>
         <snakeyaml.version>1.15</snakeyaml.version>
         <spark.version>2.2.0</spark.version>