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 2021/04/11 19:14:06 UTC

[tinkerpop] branch master updated (ee45fd5 -> ec95e04)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from ee45fd5  Merge branch '3.4-dev'
     add fe6147c  TINKERPOP-2535 Bump to Netty 4.1.61
     new 10ac8aa  Merge branch '3.4-dev'
     new ec95e04  Update driver NOTICE with netty bump CTR

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.asciidoc                     | 2 +-
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-driver/src/main/static/NOTICE  | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 pom.xml                                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

[tinkerpop] 01/02: Merge branch '3.4-dev'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 10ac8aaa6f3b1a646358c5e0400d689f76f667be
Merge: ee45fd5 fe6147c
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Sun Apr 11 09:50:19 2021 -0400

    Merge branch '3.4-dev'

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

diff --cc pom.xml
index 98ee328,ad9e499..24b2ca4
--- a/pom.xml
+++ b/pom.xml
@@@ -158,11 -156,11 +158,11 @@@ 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.1.59.Final</netty.version>
+         <netty.version>4.1.61.Final</netty.version>
          <slf4j.version>1.7.25</slf4j.version>
          <snakeyaml.version>1.27</snakeyaml.version>
 -        <spark.version>2.4.0</spark.version>
 -        <powermock.version>1.6.4</powermock.version>
 +        <spark.version>3.0.0</spark.version>
 +        <powermock.version>2.0.9</powermock.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

[tinkerpop] 02/02: Update driver NOTICE with netty bump CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ec95e04afcb64f83a17faaf40fe3bbc4a13a6636
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Sun Apr 11 15:13:29 2021 -0400

    Update driver NOTICE with netty bump CTR
---
 gremlin-driver/src/main/static/NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gremlin-driver/src/main/static/NOTICE b/gremlin-driver/src/main/static/NOTICE
index b6d823b..bd9526e 100644
--- a/gremlin-driver/src/main/static/NOTICE
+++ b/gremlin-driver/src/main/static/NOTICE
@@ -22,7 +22,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 ------------------------------------------------------------------------
-Netty 4.1.52
+Netty 4.1.62
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project