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 <[email protected]>
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>

Reply via email to