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 10ac8aaa6f3b1a646358c5e0400d689f76f667be
Merge: ee45fd5 fe6147c
Author: Stephen Mallette <[email protected]>
AuthorDate: Sun Apr 11 09:50:19 2021 -0400

    Merge branch '3.4-dev'

 CHANGELOG.asciidoc                     | 2 +-
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 pom.xml                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --cc pom.xml
index 98ee328,ad9e499..24b2ca4
--- a/pom.xml
+++ b/pom.xml
@@@ -158,11 -156,11 +158,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.59.Final</netty.version>
+         <netty.version>4.1.61.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>

Reply via email to