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 2020/09/21 18:43:15 UTC
[tinkerpop] branch master updated (0865542 -> b420ff5)
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 0865542 Merge branch '3.4-dev'
add e80d3ba Upgrade to Netty 4.1.52.Final
add 42ec6c5 minor changelog fixes CTR
new b420ff5 Merge branch '3.4-dev'
The 1 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 | 21 +++++++++++----------
pom.xml | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
[tinkerpop] 01/01: 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 b420ff5ce95643c4ef0d1b9ff923431a2cc91294
Merge: 0865542 42ec6c5
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Sep 21 14:42:45 2020 -0400
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 21 +++++++++++----------
pom.xml | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --cc pom.xml
index 605c4e5,5c90a1a..78bf5b6
--- a/pom.xml
+++ b/pom.xml
@@@ -156,10 -156,10 +156,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.1.49.Final</netty.version>
+ <netty.version>4.1.52.Final</netty.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.15</snakeyaml.version>
- <spark.version>2.4.0</spark.version>
+ <spark.version>3.0.0</spark.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>