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 f7077a8ecf21bd204c7eabe5e988012022799a40
Merge: cd9ae4e3da 1a4cf962a2
Author: Stephen Mallette <[email protected]>
AuthorDate: Mon Jun 13 15:00:12 2022 -0400

    Merge branch '3.5-dev' into 3.6-dev

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

diff --cc pom.xml
index 041d04952c,8ba0125126..de9a8fb1b6
--- a/pom.xml
+++ b/pom.xml
@@@ -171,13 -168,13 +171,13 @@@ limitations under the License
          <jcabi.version>1.2.1</jcabi.version>
          <junit.version>4.13.1</junit.version>
          <kerby.version>2.0.1</kerby.version>
 -        <log4j.version>1.2.17</log4j.version>
 +        <logback.version>1.2.9</logback.version>
          <metrics.version>3.0.2</metrics.version>
          <mockito.version>3.3.3</mockito.version>
-         <netty.version>4.1.72.Final</netty.version>
+         <netty.version>4.1.77.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>

Reply via email to