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:16 UTC

[tinkerpop] 03/03: Merge branch '3.5-dev'

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>