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 1e714f8073d80c22503648f4db424c86579af6e4
Merge: 86691e0 ba37124
Author: Stephen Mallette <[email protected]>
AuthorDate: Tue Jul 6 07:36:26 2021 -0400

    Merge branch '3.5-dev'

 CHANGELOG.asciidoc                                 |   1 +
 docker/gremlin-server.sh                           |   7 +-
 docker/gremlin-server/docker-entrypoint.sh         |  33 +++++
 .../gremlin-server/gremlin-server-integration.yaml |   3 +-
 docs/src/reference/gremlin-variants.asciidoc       |  39 +++++-
 docs/src/reference/the-traversal.asciidoc          |   6 +-
 .../gremlin/process/traversal/Bytecode.java        |   2 +-
 gremlin-javascript/pom.xml                         | 141 +++++++++++++++++++++
 .../gremlin-javascript/lib/driver/client.js        |  16 ++-
 .../lib/driver/driver-remote-connection.js         |  34 ++++-
 .../lib/driver/remote-connection.js                |  48 ++++++-
 .../lib/process/anonymous-traversal.js             |   2 +-
 .../gremlin-javascript/lib/process/bytecode.js     |  23 ++++
 .../lib/process/graph-traversal.js                 |  27 +++-
 .../gremlin-javascript/lib/process/transaction.js  |  86 +++++++++++++
 .../lib/process/traversal-strategy.js              |  10 ++
 .../test/integration/session-client-tests.js       |   2 +-
 .../test/integration/traversal-test.js             |  82 +++++++++++-
 .../test/unit/traversal-strategy-test.js           |  51 ++++++++
 .../gremlin-javascript/test/unit/traversal-test.js |  43 ++++++-
 .../src/test/scripts/generate-all.groovy           |   9 ++
 .../src/test/scripts/test-server-start.groovy      |  13 ++
 pom.xml                                            |   3 +-
 23 files changed, 654 insertions(+), 27 deletions(-)

diff --cc gremlin-javascript/pom.xml
index 53423bf,ea5055b..3cdb95c
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@@ -65,9 -65,19 +65,19 @@@ limitations under the License
                          <version>${project.version}</version>
                      </dependency>
                      <dependency>
+                         <groupId>org.apache.tinkerpop</groupId>
+                         <artifactId>neo4j-gremlin</artifactId>
+                         <version>${project.version}</version>
+                     </dependency>
+                     <dependency>
+                         <groupId>commons-io</groupId>
+                         <artifactId>commons-io</artifactId>
+                         <version>${commons.io.version}</version>
+                     </dependency>
+                     <dependency>
 -                        <groupId>log4j</groupId>
 -                        <artifactId>log4j</artifactId>
 -                        <version>${log4j.version}</version>
 +                        <groupId>ch.qos.logback</groupId>
 +                        <artifactId>logback-classic</artifactId>
 +                        <version>${logback.version}</version>
                          <scope>runtime</scope>
                      </dependency>
                      <dependency>

Reply via email to