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/12/15 18:17:13 UTC

[tinkerpop] branch master updated (d0124f0 -> 36463d2)

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 d0124f0  Merge branch '3.5-dev'
     new 5db8aad  Bump to Netty 4.1.72 CTR
     new 459067c  Merge branch '3.4-dev' into 3.5-dev
     new 36463d2  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 | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[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 36463d267df453ff9d2da6761f7cc2032cdf2118
Merge: d0124f0 459067c
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 15 13:16:56 2021 -0500

    Merge branch '3.5-dev'

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

diff --cc pom.xml
index 1e5b68e,7158fc3..9f29f1f
--- 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.68.Final</netty.version>
+         <netty.version>4.1.72.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.2.0</spark.version>
          <powermock.version>2.0.9</powermock.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

[tinkerpop] 01/03: Bump to Netty 4.1.72 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 5db8aad6d01ba027b2d2e2699041e93360b67ef1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 15 12:39:08 2021 -0500

    Bump to Netty 4.1.72 CTR
---
 CHANGELOG.asciidoc | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d4912d1..ed87ae9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,7 +29,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.
+* Bumped to Netty 4.1.72.
 
 [[release-3-4-12]]
 === TinkerPop 3.4.12 (Release Date: July 19, 2021)
diff --git a/pom.xml b/pom.xml
index b2ad55f..5503889 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.68.Final</netty.version>
+        <netty.version>4.1.72.Final</netty.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>1.27</snakeyaml.version>
         <spark.version>2.4.0</spark.version>

[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 459067c8b3b0713e9dbf86e146dbbdb55860b8ce
Merge: ebcfdf3 5db8aad
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 15 12:39:33 2021 -0500

    Merge branch '3.4-dev' into 3.5-dev

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

diff --cc pom.xml
index 98235f6,5503889..7158fc3
--- 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.68.Final</netty.version>
+         <netty.version>4.1.72.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>