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/10/25 16:12:39 UTC

[tinkerpop] branch master updated (662506d -> 7d2ffdd)

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 662506d  Merge branch '3.5-dev'
     new de6a61a  TINKERPOP-2632 Bumped to Netty 4.1.68 CTR
     new 107cdb8  Merge branch '3.4-dev' into 3.5-dev
     new 7d2ffdd  Merge branch '3.5-dev'

The 3 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 | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[tinkerpop] 02/03: Merge branch '3.4-dev' into 3.5-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 107cdb8ae384d778fda48ec6ba032865ef8f1dda
Merge: df85d45 de6a61a
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 12:01:54 2021 -0400

    Merge branch '3.4-dev' into 3.5-dev

 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc pom.xml
index 6e3187b,b2ad55f..98235f6
--- a/pom.xml
+++ b/pom.xml
@@@ -160,11 -156,11 +160,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.61.Final</netty.version>
+         <netty.version>4.1.68.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] 03/03: Merge branch '3.5-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 7d2ffddce3dce86c7b2839f6dc2ca4ad65a30823
Merge: 662506d 107cdb8
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 12:12:28 2021 -0400

    Merge branch '3.5-dev'

 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc pom.xml
index 8460bf9,98235f6..c08aee7
--- a/pom.xml
+++ b/pom.xml
@@@ -159,12 -158,12 +159,12 @@@ limitations under the License
          <java.tuples.version>1.2</java.tuples.version>
          <javadoc-plugin.version>3.1.0</javadoc-plugin.version>
          <jcabi.version>1.1</jcabi.version>
 -        <log4j.version>1.2.17</log4j.version>
 +        <logback.version>1.2.3</logback.version>
          <metrics.version>3.0.2</metrics.version>
-         <netty.version>4.1.61.Final</netty.version>
+         <netty.version>4.1.68.Final</netty.version>
          <slf4j.version>1.7.25</slf4j.version>
          <snakeyaml.version>1.27</snakeyaml.version>
 -        <spark.version>3.0.0</spark.version>
 +        <spark.version>3.1.2</spark.version>
          <powermock.version>2.0.9</powermock.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

[tinkerpop] 01/03: TINKERPOP-2632 Bumped to Netty 4.1.68 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 de6a61ab79dcae9adb85a6381dd01ad5aa8c7801
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 12:01:17 2021 -0400

    TINKERPOP-2632 Bumped to Netty 4.1.68 CTR
---
 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7fa9910..cd8fdf0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
 * Minor changes to the initialization of Java driver `Cluster` and `Client` such that hosts are marked as available only after successfully initializing connection pools.
 * `NoHostAvailableException` now contains a cause for the failure.
+* Bumped to Netty 4.1.68.
 
 [[release-3-4-12]]
 === TinkerPop 3.4.12 (Release Date: July 19, 2021)
diff --git a/pom.xml b/pom.xml
index b41e2ba..b2ad55f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@ 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.61.Final</netty.version>
+        <netty.version>4.1.68.Final</netty.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>1.27</snakeyaml.version>
         <spark.version>2.4.0</spark.version>