(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-06-11 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7584e69f73b8bf156af292f75834386103d9393e
Merge: 8623b2e05a 08dea3489a
Author: Cole-Greer 
AuthorDate: Tue Jun 11 13:13:15 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 gremlin-go/go.mod|  4 ++--
 gremlin-go/go.sum|  8 
 .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-06-11 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ba70d5dc2ab09e20a2b4724ce718f9b78ac92fd5
Merge: 8d9f63ce4e b43c90962a
Author: Cole-Greer 
AuthorDate: Tue Jun 11 09:57:51 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 docs/src/dev/developer/for-committers.asciidoc | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-06-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 404ae62163dce3da5510e453948ba33cda5bcdad
Merge: 97fc494228 e12d6bdaa9
Author: Cole-Greer 
AuthorDate: Wed Jun 5 12:04:32 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 gremlin-go/go.mod  |  2 +-
 gremlin-go/go.sum  |  4 ++--
 .../gremlin-javascript/package-lock.json   | 24 +++---
 gremlint/package-lock.json | 24 +++---
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --cc gremlin-go/go.mod
index 8ec4053ac9,1d27d89dbb..2f76470548
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
github.com/gorilla/websocket v1.5.1
github.com/nicksnyder/go-i18n/v2 v2.4.0
github.com/stretchr/testify v1.9.0
-   golang.org/x/text v0.15.0
+   golang.org/x/text v0.16.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-05-01 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7e0f30a949af6f599774f11ac2f5bea10f655827
Merge: 0e371060eb c7a391b1c1
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Wed May 1 09:48:44 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 gremlin-python/pom.xml | 10 ++
 1 file changed, 10 insertions(+)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-04-16 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e68a9470855ac01ce1ae8faf404c2d1d592ed8b4
Merge: c735441a9d 8c73d09c8d
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Apr 16 15:58:24 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc  |  4 
 docs/src/upgrade/release-3.6.x.asciidoc | 14 --
 2 files changed, 16 insertions(+), 2 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-04-05 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 70027dcea9f9f49207844c98ca87bd1ef0b2fbd9
Merge: 34eb10bb66 d577767208
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Fri Apr 5 13:07:50 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc  | 1 +
 .../tinkerpop/gremlin/process/traversal/step/map/CallStep.java  | 6 +-
 .../tinkerpop/gremlin/process/traversal/step/map/MergeStep.java | 6 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-04-05 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 34eb10bb662f6a4027808e38b5e17dbfa6d948d4
Merge: c5c9baa86b 7619c535fe
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Fri Apr 5 09:49:00 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml| 2 +-
 CHANGELOG.asciidoc  | 2 ++
 docs/src/dev/developer/development-environment.asciidoc | 2 +-
 docs/src/upgrade/release-3.5.x.asciidoc | 2 +-
 docs/src/upgrade/release-3.6.x.asciidoc | 4 
 gremlin-go/README.md| 2 +-
 gremlin-go/docker-compose.yml   | 2 +-
 gremlin-go/driver/README.md | 6 +++---
 gremlin-go/examples/go.mod  | 4 ++--
 gremlin-go/go.mod   | 2 +-
 10 files changed, 17 insertions(+), 11 deletions(-)

diff --cc gremlin-go/examples/go.mod
index acfd53ab41,be7ba3f41c..4ac05244c2
--- a/gremlin-go/examples/go.mod
+++ b/gremlin-go/examples/go.mod
@@@ -17,9 -17,9 +17,9 @@@
  
  module example
  
- go 1.20
+ go 1.21
  
- require github.com/apache/tinkerpop/gremlin-go/v3 v3.7.0
 -require github.com/apache/tinkerpop/gremlin-go/v3 v3.6.6
++require github.com/apache/tinkerpop/gremlin-go/v3 v3.7.1
  
  require (
github.com/google/uuid v1.3.0 // indirect

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-03-25 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c5c9baa86b355d11808e80a380c5076580a32bf6
Merge: e39ef4fcce 0b8b7ec4c5
Author: Cole-Greer 
AuthorDate: Mon Mar 25 15:26:49 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  2 +-
 .../apache/tinkerpop/gremlin/driver/Client.java|  5 +-
 .../tinkerpop/gremlin/driver/RequestOptions.java   | 30 
 .../driver/remote/DriverRemoteConnection.java  | 27 +--
 .../driver/remote/DriverRemoteConnectionTest.java  |  5 +-
 gremlin-go/driver/cucumber/gremlin.go  |  2 +-
 .../gremlin-javascript/test/cucumber/gremlin.js|  2 +-
 gremlin-python/src/main/python/radish/gremlin.py   |  2 +-
 .../server/ClientWithOptionsIntegrateTest.java | 87 ++
 .../gremlin/test/features/map/Select.feature   |  2 +-
 11 files changed, 130 insertions(+), 35 deletions(-)

diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index e520b2b328,bf7e01c810..b10a2db7ab
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@@ -1164,7 -892,7 +1164,7 @@@ namespace Gremlin.Net.IntegrationTest.G
 
{"g_withStrategiesXProductiveByStrategyX_V_asXaX_selectXaX_byXageX", new 
List, ITraversal>> 
{(g,p) =>g.WithStrategies(new ProductiveByStrategy(productiveKeys: new 
List {})).V().As("a").Select("a").By("age")}}, 
 {"g_withSideEffectXk_nullX_injectXxX_selectXkX", new 
List, ITraversal>> 
{(g,p) =>g.WithSideEffect("k",null).Inject("x").Select("k")}}, 
 {"g_V_out_in_selectXall_a_a_aX_byXunfold_name_foldX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("A").Property("name","a1").As("a1").AddV("A").Property("name","a2").As("a2").AddV("A").Property("name","a3").As("a3").AddV("B").Property("name","b1").As("b1").AddV("B").Property("name","b2").As("b2").AddV("B").Property("name","b3").As("b3").AddE("ab").From("a1").To("b1").AddE("ab").From("a2").To("b2").AddE("ab").From("a3").To(
 [...]
--   {"g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX", 
new List, ITraversal>> 
{(g,p) 
=>g.V().As("label").Aggregate(Scope.Local,"x").Select("x").Select("label")}},
 
++   {"g_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX", 
new List, ITraversal>> 
{(g,p) 
=>g.V().As("label").Aggregate(Scope.Local,"x").Barrier().Select("x").Select("label")}},
 
 {"g_V_shortestPath", new List, ITraversal>> {(g,p) 
=>g.V().Identity().ShortestPath()}}, 
 {"g_V_both_dedup_shortestPath", new 
List, ITraversal>> 
{(g,p) =>g.V().Both().Dedup().ShortestPath()}}, 
 {"g_V_shortestPath_edgesIncluded", new 
List, ITraversal>> 
{(g,p) 
=>g.V().Identity().ShortestPath().With("~tinkerpop.shortestPath.includeEdges")}},
 
diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
index 63d7dad91a,cd5c2b68e0..f439157999
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
@@@ -18,13 -18,22 +18,23 @@@
   */
  package org.apache.tinkerpop.gremlin.driver;
  
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 +import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+ import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
  
  import java.util.HashMap;
+ import java.util.Iterator;
  import java.util.Map;
  import java.util.Optional;
  import java.util.UUID;
  
 -import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_BATCH_SIZE;
 -import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_EVAL_TIMEOUT;
 -import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_USER_AGENT;
 -import static org.apache.tinkerpop.gremlin.driver.Tokens.REQUEST_ID;
++import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_BATCH_SIZE;
++import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
++import static 
org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
++import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_USER_AGENT;
++import static org.apache.tinkerpop.gremlin.util.Tokens.REQUEST_ID;
+ 
  /**
   * Options that can be supplied on a per request basis.
   *
@@@ -88,6 -93,24 +98,26 @@@ public final class RequestOptions 
  return new Builder();
  }
  
+ public static RequestOptions getRequestOptions(final Bytecode bytecode) {
+ final Iterator itty = 
BytecodeHelper.findStrategies(bytecode,

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-03-22 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e39ef4fcce713dc26a28d451475fad27c622b99d
Merge: 20443b0d7b dd7cb24669
Author: Cole-Greer 
AuthorDate: Fri Mar 22 13:57:48 2024 -0700

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc| 2 +-
 .../tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-03-05 Thread valentyn 
This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a0919dc3d6ad29a2737f36fe076defbec092840c
Merge: 06af2ec6d5 2d950116db
Author: Valentyn Kahamlyk 
AuthorDate: Tue Mar 5 13:54:38 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |   1 +
 .../optimization/FilterRankingStrategy.java| 129 --
 ...lterRankingStrategyCacheInitializationTest.java | 434 +
 .../optimization/FilterRankingStrategyTest.java| 179 +++--
 4 files changed, 681 insertions(+), 62 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-02-29 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit cc9b3cf02c1e5d68a0583e2571e1a2a22d9fa249
Merge: 88acbad25a 1efe40b288
Author: Cole-Greer 
AuthorDate: Thu Feb 29 08:56:53 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc | 5 +++--
 gremlin-python/src/main/python/gremlin_python/driver/connection.py | 7 ---
 gremlin-python/src/main/python/gremlin_python/driver/serializer.py | 2 +-
 gremlin-python/src/main/python/tests/driver/test_client.py | 6 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-02-29 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7f73599f74db02a188f37d5168efa84f39c2d068
Merge: a919b90ebe 3166f1b347
Author: Cole-Greer 
AuthorDate: Thu Feb 29 08:16:20 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 gremlin-go/go.mod  |   4 +-
 gremlin-go/go.sum  |   8 +-
 .../gremlin-javascript/package-lock.json   | 151 +++--
 3 files changed, 57 insertions(+), 106 deletions(-)

diff --cc gremlin-go/go.mod
index 49824ef350,111ad2210b..a44e094cc7
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -20,13 -20,12 +20,13 @@@ module github.com/apache/tinkerpop/grem
  go 1.20
  
  require (
-   github.com/cucumber/godog v0.13.0
+   github.com/cucumber/godog v0.14.0
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.1
-   github.com/nicksnyder/go-i18n/v2 v2.3.0
+   github.com/nicksnyder/go-i18n/v2 v2.4.0
github.com/stretchr/testify v1.8.4
golang.org/x/text v0.14.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-02-13 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 01de8868c75fda50f5369d9706f0b3e9a4d604f0
Merge: 9b46b6777d d862355334
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Feb 13 14:53:06 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-01-29 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c0d704cb372622d8f874e7aebc861d12afd6d65b
Merge: 804eeab954 d2303d5fad
Author: Cole-Greer 
AuthorDate: Mon Jan 29 16:58:35 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml   |   8 +-
 gremlin-go/go.mod  |   2 +-
 gremlin-go/go.sum  |   4 +-
 .../gremlin-javascript/package-lock.json   | 833 ++---
 .../javascript/gremlin-javascript/package.json |   2 +-
 gremlint/package-lock.json |  24 +-
 6 files changed, 68 insertions(+), 805 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2024-01-15 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 2f606812bdee26152362778ee8471bbf8b118470
Merge: 821bf60d41 ddf32174d7
Author: Cole-Greer 
AuthorDate: Mon Jan 15 09:43:04 2024 -0800

Merge branch '3.6-dev' into 3.7-dev

 .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++--
 gremlin-python/src/main/python/examples/requirements.txt | 10 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-19 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c8d08b0269349d2e7e1174aff100fe7c9f28d093
Merge: 3a512146d1 de74d3c9e2
Author: Cole-Greer 
AuthorDate: Tue Dec 19 17:08:07 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/codeql.yml   | 14 
 bin/run-examples.sh|  4 +--
 docs/src/dev/developer/release.asciidoc|  5 +--
 gremlin-go/go.mod  |  2 +-
 gremlin-go/go.sum  |  4 +--
 gremlin-javascript/examples/package-lock.json  |  4 +--
 gremlin-javascript/examples/package.json   |  4 +--
 .../gremlin-javascript/package-lock.json   | 40 +++---
 8 files changed, 39 insertions(+), 38 deletions(-)

diff --cc docs/src/dev/developer/release.asciidoc
index a55f0d1315,aaf1b8e1e4..6a5e525fbf
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@@ -326,7 -327,8 +325,9 @@@ the help of a PMC member for those step
  .. Commit and push the `SNAPSHOT` changes to git
  . Examine the `future.asciidoc` and update the "Roadmap" as needed.
  . Send email to advise that code freeze is lifted.
 +. Consider the changes made to Gremlin and determine if the community needs 
to organize a PR to 
[DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/gremlin)
 to keep TypeScript up to date.
+ . Ensure that the GLV examples compile and run with the latest image and 
dependencies: `bin/run-examples.sh`.
+ .. Make changes as necessary to update the examples.
  . Generate a list of dead branches that will be automatically deleted and 
post them as a DISCUSS thread for review, then once consensus is reached 
removed those branches.
  . Set up the IO tests for the current `SNAPSHOT` as discussed in the <>

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-18 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 3a512146d10a54d71bcf7734e664d684ba4c65d0
Merge: 90c1ae3fe0 1e10331e2c
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Mon Dec 18 16:49:21 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 gremlin-server/src/main/docker/docker-entrypoint.sh | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-14 Thread kenhuuu 
This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c9750b18e942708ac7484e52dbe6da4108761ee0
Merge: 6fbafc436c d4fc477a5c
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Thu Dec 14 19:28:34 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 .../driver/handler/HttpGremlinResponseDecoder.java | 25 +---
 .../gremlin_python/driver/aiohttp/transport.py |  4 +-
 .../main/python/gremlin_python/driver/protocol.py  | 46 +++---
 gremlin-python/src/main/python/tests/conftest.py   | 21 ++
 .../driver/test_driver_remote_connection_http.py   | 10 +
 .../handler/HttpBasicAuthorizationHandler.java | 15 +--
 .../server/handler/HttpGremlinEndpointHandler.java | 18 +
 .../gremlin/server/handler/HttpHandlerUtil.java| 12 +-
 .../gremlin/server/HttpDriverIntegrateTest.java| 34 
 10 files changed, 144 insertions(+), 42 deletions(-)

diff --cc 
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
index ec19b28e6d,662ed48a36..665cf1ef3c
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
@@@ -244,20 -239,7 +246,20 @@@ public class HttpGremlinEndpointHandle
  final List results = 
requestMessage.getOp().equals(Tokens.OPS_BYTECODE) ?
  (List) 
IteratorUtils.asList(o).stream().map(r -> new DefaultRemoteTraverser(r, 
1)).collect(Collectors.toList()) :
  IteratorUtils.asList(o);
 +
 +if (mp.isPresent() && 
mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)) {
 +final Object firstElement = results.get(0);
 +
 +if (firstElement instanceof Element) {
 +for (int i = 0; i < results.size(); i++)
 +results.set(i, 
ReferenceFactory.detach((Element) results.get(i)));
 +} else if (firstElement instanceof 
AbstractTraverser) {
 +for (final Object item : results)
 +((AbstractTraverser) item).detach();
 +}
 +}
 +
- final ResponseMessage responseMessage = 
ResponseMessage.build(requestMessage.getRequestId())
+ final ResponseMessage responseMessage = 
ResponseMessage.build(requestId)
  .code(ResponseStatusCode.SUCCESS)
  .result(results).create();

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-14 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit df1d4538ee158db7db08e3bf8f5a19ce28f08f2c
Merge: b4f33076bc 9f97af5a87
Author: Cole-Greer 
AuthorDate: Thu Dec 14 14:51:45 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-14 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b4f33076bc290fc8b34aae03d1675b1a2b38775b
Merge: 2730fb0ad4 7b2580e520
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Thu Dec 14 08:49:03 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 .../gremlin_python/structure/io/graphsonV2d0.py| 26 -
 .../gremlin_python/structure/io/graphsonV3d0.py| 27 +-
 .../src/main/python/tests/driver/test_client.py|  9 
 .../python/tests/structure/io/test_graphsonV2d0.py |  8 +++
 .../python/tests/structure/io/test_graphsonV3d0.py |  8 +++
 6 files changed, 77 insertions(+), 2 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-11 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 679b784941c6c9d6e6ba61ebc19f61d9482c9a05
Merge: a5784e74d3 b48fd8c0ff
Author: Cole-Greer 
AuthorDate: Mon Dec 11 16:29:52 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc  | 1 +
 gremlin-console/pom.xml | 7 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-07 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a5784e74d3baf1a0d8626b5bc5dc8d4d74a1a747
Merge: 24a5e241ec 20ddedd308
Author: Cole-Greer 
AuthorDate: Thu Dec 7 17:45:11 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-07 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 24a5e241ec0abb5a332e49e9c78f782d1471b97d
Merge: ec9e194add 1006f515e0
Author: Cole-Greer 
AuthorDate: Thu Dec 7 17:36:58 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-07 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 17f74c93d326eca55e88473cb2f94e118d3b192a
Merge: b1d0a58efd da8a5fbe05
Author: Cole-Greer 
AuthorDate: Thu Dec 7 12:25:51 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-06 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b1d0a58efde4143e2e5087d7cb73164733458d99
Merge: cb508ba7bc c2e20863a2
Author: Cole-Greer 
AuthorDate: Wed Dec 6 14:45:43 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml | 2 +-
 gremlin-javascript/pom.xml   | 2 +-
 gremlint/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-06 Thread valentyn 
This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 0756e12f8900e58a06cebe3d47b50e9a6ac36c67
Merge: 1b64fac483 bf19ce9e16
Author: Valentyn Kahamlyk 
AuthorDate: Wed Dec 6 12:16:08 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 .../DriverRemoteConnection/GraphTraversalTests.cs  | 20 ++
 gremlin-go/driver/traversal_test.go| 44 ++
 .../gremlin-javascript/lib/process/transaction.js  | 12 +-
 .../test/integration/traversal-test.js | 26 +
 .../gremlin-javascript/test/unit/traversal-test.js | 23 +++
 .../gremlin_python/process/graph_traversal.py  |  2 +-
 .../tests/driver/test_driver_remote_connection.py  | 31 +++
 8 files changed, 156 insertions(+), 3 deletions(-)

diff --cc 
gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
index 365776e029,64e1bc5a55..39b628c4ef
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
@@@ -218,8 -218,36 +218,34 @@@ describe('Traversal', function () 
}, (err) => assert.fail("tanked: " + err));
  });
});
+   describe("should handle tx errors if graph not support tx", function() {
+ it('should throw exception on commit if graph not support tx', async 
function() {
+   const g = traversal().withRemote(connection);
+   const tx = g.tx();
+   const gtx = tx.begin();
+   const result = await g.V().count().next();
+   assert.strictEqual(6, result.value);
+   try {
+ await tx.commit();
+ assert.fail("should throw error");
+   } catch (err) {
+ assert.strictEqual("Server error: Graph does not support transactions 
(500)", err.message);
+   }
+ });
+ it('should throw exception on rollback if graph not support tx', async 
function() {
+   const g = traversal().withRemote(connection);
+   const tx = g.tx();
+   tx.begin();
+   try {
+ await tx.rollback();
+ assert.fail("should throw error");
+   } catch (err) {
+ assert.strictEqual("Server error: Graph does not support transactions 
(500)", err.message);
+   }
+ });
+   });
describe('support remote transactions - commit', function() {
  before(function () {
 -  if (process.env.TEST_TRANSACTIONS !== "true") return this.skip();
 -
txConnection = helper.getConnection('gtx');
return txConnection.open();
  });

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d075af84ee34dd7a136025f9168a25749d3160b6
Merge: 07db2b6cf6 1e0cfaea35
Author: Cole-Greer 
AuthorDate: Tue Dec 5 15:56:11 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 .github/workflows/build-test.yml   | 60 +--
 .github/workflows/codeql.yml   |  6 +-
 gremlin-go/go.mod  |  2 +-
 gremlin-go/go.sum  | 34 ++-
 .../gremlin-javascript/package-lock.json   | 68 +++---
 gremlint/package-lock.json | 12 ++--
 6 files changed, 78 insertions(+), 104 deletions(-)

diff --cc gremlin-go/go.mod
index bc3ad693b9,6fb14e147e..8ecb32c783
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -23,10 -23,9 +23,10 @@@ require 
github.com/cucumber/godog v0.13.0
github.com/google/uuid v1.4.0
github.com/gorilla/websocket v1.5.1
-   github.com/nicksnyder/go-i18n/v2 v2.2.2
+   github.com/nicksnyder/go-i18n/v2 v2.3.0
github.com/stretchr/testify v1.8.4
golang.org/x/text v0.14.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-05 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 07db2b6cf64950f46863d4bf2fc10c7bfe3b67f1
Merge: e488252e01 296bbcdb27
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Dec 5 13:54:59 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 .../process/traversal/dsl/graph/GraphTraversalTest.java| 10 ++
 1 file changed, 10 insertions(+)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-12-04 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit cef56e4b754d5e798cb7f4966251f15bde000419
Merge: 05ac05d020 636b49d200
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Mon Dec 4 22:08:25 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc  |  5 +
 docs/src/upgrade/release-3.6.x.asciidoc | 14 ++
 2 files changed, 19 insertions(+)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-11-21 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 1454d2b39177848c086676decf5e93f9c9ce37b7
Merge: 515bf483c8 a9ff025c83
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Nov 21 12:02:28 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc  | 39 +++--
 docs/src/upgrade/release-3.5.x.asciidoc | 18 ++-
 docs/src/upgrade/release-3.6.x.asciidoc | 17 ++
 3 files changed, 41 insertions(+), 33 deletions(-)

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-11-20 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 515bf483c8fd9124973cdee7cf38ea11d03119e3
Merge: ceeeaa2133 7c06364d15
Author: Cole-Greer 
AuthorDate: Mon Nov 20 13:14:16 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 gremlin-console/pom.xml| 11 -
 gremlin-console/src/main/static/NOTICE | 26 +++-
 gremlin-console/src/main/static/licenses/bigint| 23 ++
 .../src/main/static/licenses/ganymed-ssh   | 28 ++
 gremlin-driver/pom.xml |  7 +-
 gremlin-driver/src/main/static/NOTICE  | 22 -
 gremlin-driver/src/main/static/licenses/bigint | 23 ++
 gremlin-server/src/main/static/NOTICE  | 28 --
 gremlin-server/src/main/static/licenses/bigint | 23 ++
 .../src/main/static/licenses/ganymed-ssh   | 28 ++
 gremlin-shaded/pom.xml |  4 
 gremlin-shaded/src/main/static/NOTICE  | 22 -
 gremlin-shaded/src/main/static/licenses/bigint | 23 ++
 13 files changed, 261 insertions(+), 7 deletions(-)

diff --cc gremlin-server/src/main/static/NOTICE
index 3aac6f7ff6,02d78b6d73..4f6521d8b1
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@@ -5,13 -5,18 +5,13 @@@ This product includes software develope
  The Apache Software Foundation (http://www.apache.org/).
  
  
 -Apache Groovy 2.5.22 (AL ASF)
 +Apache Groovy 4.0.9 (AL ASF)
  
 -This product includes/uses ANTLR (http://www.antlr2.org/)
 -developed by Terence Parr 1989-2006
 -
 -This product bundles icons from the famfamfam.com silk icons set
 -http://www.famfamfam.com/lab/icons/silk/
 -Licensed under the Creative Commons Attribution Licence v2.5
 -http://creativecommons.org/licenses/by/2.5/
 +This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
 +Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
  
  
- Apache Ivy 2.3.0 (AL ASF)
+ Apache Ivy 2.5.1 (AL ASF)
  
  Portions of Ivy were originally developed by
  Jayasoft SARL (http://www.jayasoft.fr/)
diff --cc gremlin-shaded/src/main/static/NOTICE
index 99728668c8,aa0c1d929c..23fdb19a8e
--- a/gremlin-shaded/src/main/static/NOTICE
+++ b/gremlin-shaded/src/main/static/NOTICE
@@@ -5,13 -5,36 +5,33 @@@ This product includes software develope
  The Apache Software Foundation (http://www.apache.org/).
  
  
- Jackson-Databind 2.14.0 and Jackson-Core - shaded in gremlin-shaded to 
org.apache.tinkerpop.shaded.jackson
+ Jackson-Databind, Jackson-Annotation and Jackson-Core 2.15.2
  
 -# Jackson JSON processor
 -
 -Jackson is a high-performance, Free/Open Source JSON processing library.
  It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has
  been in development since 2007.
  It is currently developed by a community of developers.
  
+ * FastDoubleParser
+ 
+ jackson-core bundles a shaded copy of FastDoubleParser 
.
+ That code is available under an MIT license 

+ under the following copyright.
+ 
+ Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
+ 
+ Some portions of the code have been derived from other projects.
+ 
+ fast_double_parser, Copyright (c) 2022 Daniel Lemire. Apache 2.0 
License.
+ https://github.com/fastfloat/fast_float
+ 
+ fast_float, Copyright (c) 2021 The fast_float authors. Apache 2.0 
License.
+ https://github.com/fastfloat/fast_float
+ 
+ bigint, Copyright 2020 Tim Buktu. 2-clause BSD License.
+ https://github.com/tbuktu/bigint/tree/floatfft
+ (We only use those portions of the bigint project that can be 
licensed under 2-clause BSD License.)
+ 
  
 -Objenesis 2.4
 +Objenesis 3.3 - shaded in gremlin-shaded to 
org.apache.tinkerpop.shaded.objenesis
  
 -Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
 +Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-11-19 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ceeeaa21331aa8bb1870bd8f3081aac7cdba4de1
Merge: 03e798f505 9674b1e6bf
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Sun Nov 19 22:44:15 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 docs/src/reference/intro.asciidoc | 4 ++--
 docs/src/reference/preface.asciidoc   | 2 +-
 docs/src/reference/the-traversal.asciidoc | 8 
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --cc docs/src/reference/the-traversal.asciidoc
index d20352dcff,ef1192d0ad..edf2d8618f
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -2378,25 -2058,8 +2378,25 @@@ g.V().emit(__.has("name", "marko").or()
  *Additional References*
  
  
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#loops()++[`loops()`],
- link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping[`Looping 
Recipes`]
+ link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping++[`Looping 
Recipes`]
  
 +[[lTrim-step]]
 +=== LTrim Step
 +
 +The `lTrim()`-step (*map*) returns a string with leading whitespace removed. 
Null values are not processed and remain
 +as null when returned. If the incoming traverser is a non-String value then 
an `IllegalArgumentException` will be thrown.
 +
 +[gremlin-groovy,modern]
 +
 +g.inject("   hello   ", " world ", null).lTrim()
 +g.inject(["   hello   ", " world ", null]).lTrim(local) <1>
 +
 +
 +<1> Use `Scope.local` to operate on individual string elements inside 
incoming list, which will return a list.
 +
 
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#lTrim()++[`lTrim()`]
 
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#lTrim(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`lTrim(Scope)`]
 +
  [[map-step]]
  === Map Step
  
@@@ -3915,65 -3525,8 +3915,65 @@@ an adjacent vertex's properties or edge
  
  
link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#repeat(org.apache.tinkerpop.gremlin.process.traversal.Traversal)++[`repeat(Traversal)`]
  
- link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping[`Looping 
Recipes`]
+ link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping++[`Looping 
Recipes`]
  
 +[[replace-step]]
 +=== Replace Step
 +The `replace()`-step (*map*) returns a string with the specified characters 
in the original string replaced with the new
 +characters. Any null arguments will be a no-op and the original string is 
returned. Null values from the incoming
 +traversers are not processed and remain as null when returned. If the 
incoming traverser is a non-String  value then
 +an `IllegalArgumentException` will be thrown.
 +
 +[gremlin-groovy,modern]
 +
 +g.inject('that', 'this', 'test', null).replace('h', 'j') <1>
 +g.inject('hello world').replace(null, 'j') <2>
 +g.V().hasLabel("software").values("name").replace("p", "g") <3>
 +g.V().hasLabel("software").values("name").fold().replace(local, "p", "g") <4>
 +
 +<1> Replace "h" in the strings with "j".
 +<2> Null inputs are ignored and the original string is returned.
 +<3> Return software names with "p" replaced by "g".
 +<4> Use `Scope.local` to operate on individual string elements inside 
incoming list, which will return a list.
 +
 +*Additional References*
 
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#replace(java.lang.String,java.lang.String)++[`replace(String,String)`]
 
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#replace(org.apache.tinkerpop.gremlin.process.traversal.Scope,java.lang.String,java.lang.String)++[`replace(Scope,String,String)`]
 +
 +[[reverse-step]]
 +=== Reverse Step
 +
 +The `reverse()`-step (*map*) returns the reverse of the incoming list 
traverser. Single values (including `null`) are not
 +processed and are added back to the Traversal Stream unchanged. If the 
incoming traverser is a String value then the
 +reversed String will be returned.
 +
 +[gremlin-groovy,modern]
 +
 +g.V().values("name").reverse() <1>
 +g.V().values("name").order().fold().reverse() <2>
 +
 +<1> Reverse the order of the characters in each name.
 +<2> Fold all the names into a list in ascending order and then reverse the 
list's ordering (into descending).
 +
 
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#reverse()++[`reverse()`]

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-11-17 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ed7570d06f0f28db3dce9c0bd7a5cbe0496533ff
Merge: d8906996ac d95d83bef3
Author: Cole-Greer 
AuthorDate: Fri Nov 17 09:19:50 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 docs/src/upgrade/release-3.6.x.asciidoc|  3 +
 .../tinkerpop/gremlin/driver/Channelizer.java  |  7 +--
 .../driver/handler/HttpGremlinRequestEncoder.java  | 15 -
 .../gremlin/server/AbstractChannelizer.java|  2 +-
 .../gremlin/server/channel/HttpChannelizer.java|  3 +
 .../server/handler/HttpUserAgentHandler.java   | 67 ++
 .../handler/WsAndHttpChannelizerHandler.java   | 29 ++
 .../gremlin/server/GremlinServerIntegrateTest.java | 63 ++--
 ...stChannelizer.java => HttpTestChannelizer.java} | 12 ++--
 .../gremlin/server/channel/TestChannelizer.java|  6 ++
 .../server/channel/UnifiedTestChannelizer.java |  6 +-
 .../server/channel/WebSocketTestChannelizer.java   |  6 +-
 ...nnelizer.java => WsAndHttpTestChannelizer.java} | 11 +++-
 14 files changed, 199 insertions(+), 32 deletions(-)

diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index c29dd1ddaa,606549a535..67f7e3d95c
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@@ -27,12 -27,13 +27,13 @@@ import io.netty.handler.codec.http.Full
  import io.netty.handler.codec.http.HttpHeaderNames;
  import io.netty.handler.codec.http.HttpMethod;
  import io.netty.handler.codec.http.HttpVersion;
 -import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+ import org.apache.tinkerpop.gremlin.driver.UserAgent;
  import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 -import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
 -import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
  import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 +import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 +import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 +import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 +import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
  
  import java.util.List;
  import java.util.function.UnaryOperator;

(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

2023-11-14 Thread kenhuuu 
This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 933ad520bcd295f015af53e93b7d6de6c818bc47
Merge: 63e4c179ba 8c12fdfeb7
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Tue Nov 14 08:14:22 2023 -0800

Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc |  1 +
 .../gremlin-javascript/lib/driver/connection.js|  9 
 .../test/integration/client-tests.js   | 48 ++
 .../python/gremlin_python/driver/connection.py |  1 +
 .../src/main/python/tests/driver/test_client.py| 44 
 .../server/GremlinServerHttpIntegrateTest.java | 12 ++
 6 files changed, 115 insertions(+)

(tinkerpop) 01/01: Merge branch '3.6-dev'

2023-11-08 Thread spmallette 
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 648e26e8988f846df34fc9eba5d4c6dcb8e46be9
Merge: 1e9e18d5d8 473d3fccd6
Author: Stephen Mallette 
AuthorDate: Wed Nov 8 07:44:30 2023 -0500

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |   3 +-
 .../strategy/decoration/SubgraphStrategy.java  | 102 ++---
 .../optimization/InlineFilterStrategy.java |   5 +-
 .../strategy/decoration/SubgraphStrategyTest.java  |  39 
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  38 
 gremlin-go/driver/cucumber/gremlin.go  |  38 
 .../gremlin-javascript/test/cucumber/gremlin.js|  38 
 gremlin-python/src/main/python/radish/gremlin.py   |  38 
 .../decoration/SubgraphStrategyProcessTest.java|   8 +-
 9 files changed, 175 insertions(+), 134 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-26 Thread valentyn 
This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ff1ed06f09bd3cde598c366da05f502861c80678
Merge: f952ed7f01 3f1f28df10
Author: Valentyn Kahamlyk 
AuthorDate: Thu Oct 26 13:40:11 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc  | 1 +
 .../tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java | 2 +-
 .../gremlin/process/traversal/step/filter/WherePredicateStep.java   | 2 +-
 .../apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java   | 2 +-
 .../tinkerpop/gremlin/process/traversal/step/map/ProjectStep.java   | 2 +-
 .../apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java | 2 +-
 .../apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java   | 2 +-
 .../gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java   | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-24 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7bf8cd163d04f5553c55e32e1ff8032b174d0809
Merge: 22759b88d3 f28c1db9bf
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Oct 24 14:15:14 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-23 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9ddeb7e5cbc46ccf180d3a9fa7c92ef611866b34
Merge: f6c15b3d09 ba9d023b75
Author: Cole-Greer 
AuthorDate: Mon Oct 23 10:16:00 2023 -0700

Merge branch '3.6-dev'

 .../gremlin-javascript/package-lock.json   | 74 +-
 1 file changed, 44 insertions(+), 30 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-23 Thread spmallette 
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 6c0254f205f15f3a65c6ba1ddc7db6f1c6c5299d
Merge: 50b43d8ba9 5bf274b03e
Author: Stephen Mallette 
AuthorDate: Mon Oct 23 08:34:18 2023 -0400

Merge branch '3.6-dev'

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-20 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 6a0f254510a6845c77d002a467924718b56729ac
Merge: 8ba85676aa 10d498f338
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Fri Oct 20 12:21:26 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |   2 +
 .../traversal/translator/GroovyTranslator.java |   2 +-
 .../traversal/translator/GroovyTranslatorTest.java |  15 +
 gremlin-python/docker-compose.yml  |   2 +
 .../gremlin_python/driver/aiohttp/transport.py |  98 +++
 .../main/python/gremlin_python/driver/client.py|  33 ++-
 .../main/python/gremlin_python/driver/protocol.py  |  95 ++-
 .../python/gremlin_python/driver/serializer.py |   7 +-
 .../python/gremlin_python/process/translator.py| 200 ++---
 gremlin-python/src/main/python/tests/conftest.py   |  58 +++-
 .../driver/test_driver_remote_connection_http.py   | 232 +++
 .../main/python/tests/process/test_translator.py   | 312 -
 12 files changed, 874 insertions(+), 182 deletions(-)

diff --cc gremlin-python/docker-compose.yml
index dfb7f00f0e,02e693ee5b..5f9ef5dd4c
--- a/gremlin-python/docker-compose.yml
+++ b/gremlin-python/docker-compose.yml
@@@ -61,10 -58,10 +61,12 @@@ services
- KRB5CCNAME=./test-tkt.cc
- GREMLIN_SERVER_URL=ws://gremlin-server-test-python:{}/gremlin
- 
GREMLIN_SERVER_BASIC_AUTH_URL=wss://gremlin-server-test-python:{}/gremlin
+   - GREMLIN_SERVER_URL_HTTP=http://gremlin-server-test-python:{}/
+   - 
GREMLIN_SERVER_BASIC_AUTH_URL_HTTP=https://gremlin-server-test-python:{}/
- KRB_HOSTNAME=${KRB_HOSTNAME:-gremlin-server-test}
- VERSION=${VERSION}
 +  - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-python:{}/gremlin
 +  - 
GREMLIN_SOCKET_SERVER_CONFIG_PATH=/python_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
  working_dir: /python_app
  command: >
bash -c "apt-get update && apt-get -y install libkrb5-dev krb5-user
diff --cc gremlin-python/src/main/python/tests/conftest.py
index 5c655fc8fa,c80d107d26..64fb16f82f
--- a/gremlin-python/src/main/python/tests/conftest.py
+++ b/gremlin-python/src/main/python/tests/conftest.py
@@@ -48,8 -42,11 +48,12 @@@ kerberos_hostname = os.environ.get('KRB
  anonymous_url = gremlin_server_url.format(45940)
  basic_url = gremlin_basic_auth_url.format(45941)
  kerberos_url = gremlin_server_url.format(45942)
 +
  kerberized_service = 'test-service@{}'.format(kerberos_hostname)
+ gremlin_server_url_http = os.environ.get('GREMLIN_SERVER_URL_HTTP', 
'http://localhost:{}/')
+ gremlin_basic_auth_url_http = 
os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL_HTTP', 'https://localhost:{}/')
+ anonymous_url_http = gremlin_server_url_http.format(45940)
+ basic_url_http = gremlin_basic_auth_url_http.format(45941)
  verbose_logging = False
  
  logging.basicConfig(format='%(asctime)s [%(levelname)8s] 
[%(filename)15s:%(lineno)d - %(funcName)10s()] - %(message)s',
diff --cc gremlin-python/src/main/python/tests/process/test_translator.py
index 867a2ae0a8,eb055e2543..14d8c22787
--- a/gremlin-python/src/main/python/tests/process/test_translator.py
+++ b/gremlin-python/src/main/python/tests/process/test_translator.py
@@@ -343,23 -349,18 +349,25 @@@ class TestTranslator(object)
"g.withStrategies(new 
OptionsStrategy(evaluationTimeout:500)).V().count()"])
  # 96
  tests.append([g.withStrategies(OptionsStrategy({'evaluationTimeout': 
500})).V().count(),
-  "g.withStrategies(new 
OptionsStrategy(evaluationTimeout:500)).V().count()"])
+   "g.withStrategies(new 
OptionsStrategy(evaluationTimeout:500)).V().count()"])
  # 97
- 
tests.append([g.withStrategies(PartitionStrategy(partition_key="partition", 
write_partition="a", read_partitions=["a"])).addV('test'),
-  "g.withStrategies(new 
PartitionStrategy(partitionKey:'partition',writePartition:'a',readPartitions:['a'])).addV('test')"])
+ tests.append([g.withStrategies(
+ PartitionStrategy(partition_key="partition", write_partition="a", 
read_partitions=["a"])).addV('test'),
+   "g.withStrategies(new 
PartitionStrategy(partitionKey:'partition',writePartition:'a',readPartitions:['a'])).addV('test')"])
  # 98
- 
tests.append([g.withComputer().V().shortestPath().with_(ShortestPath.target, 
__.has('name','peter')),
-  "g.withStrategies(new 
VertexProgramStrategy()).V().shortestPath().with('~tinkerpop.shortestPath.target',__.has('name','peter'))"])
+ 
tests.append([g.withComputer().V().shortestPath().with_(ShortestPath.target, 
__.has('name', 'peter')),
+

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-19 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9ac7ee8b1b88d1ed4d41a1e4bc4f9c5d9899cfba
Merge: 967b047e6f 054250ffdc
Author: Cole-Greer 
AuthorDate: Thu Oct 19 17:01:01 2023 -0700

Merge branch '3.6-dev'

 .../gremlin-javascript/package-lock.json   | 144 +++--
 1 file changed, 75 insertions(+), 69 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-18 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 3c4418ba249df5f02547e4a702d0fd12bc26a74e
Merge: 3cf2f94446 de4ac90dda
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Wed Oct 18 16:42:15 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 .../process/traversal/step/map/GraphStep.java  |  8 ++---
 .../process/traversal/step/map/PropertiesStep.java | 15 ++--
 .../process/traversal/step/map/VertexStep.java | 15 ++--
 .../step/sideEffect/SideEffectCapStep.java |  9 +++--
 .../process/traversal/step/map/GraphStepTest.java  | 27 ++
 .../traversal/step/map/PropertiesStepTest.java | 42 ++
 .../process/traversal/step/map/VertexStepTest.java | 28 +++
 .../step/sideEffect/SideEffectCapStepTest.java | 28 +++
 9 files changed, 158 insertions(+), 15 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-18 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 1222c257b6861b4d535ee8c8090832618efee3ea
Merge: 78075f37a5 76b4cfab3b
Author: Florian Hockmann 
AuthorDate: Wed Oct 18 15:41:11 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj   | 2 +-
 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-18 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 78075f37a5b38e8a120186cd0f0c7b71680b44f2
Merge: 3fd6e78662 3a5dedb3f5
Author: Florian Hockmann 
AuthorDate: Wed Oct 18 15:02:54 2023 +0200

Merge branch '3.6-dev'

 .../Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj| 4 ++--
 .../Gremlin.Net.Template.IntegrationTest.csproj   | 4 ++--
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index 3a6e7fd422,6f008a8927..d79690df90
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@@ -19,11 -15,10 +19,11 @@@
  
  
  
- 
- 
+ 
+ 
  
  
 +

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-17 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c5488fa19a0bfd7fcf2beecf92cbac2479b12f0d
Merge: 700b7e7784 9c1002054c
Author: Cole-Greer 
AuthorDate: Tue Oct 17 13:41:37 2023 -0700

Merge branch '3.6-dev'

 gremlin-go/go.mod  | 12 ++--
 gremlin-go/go.sum  | 48 ++
 gremlint/package-lock.json | 34 
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --cc gremlin-go/go.mod
index 54582f995f,410c13ee87..d055dddfcc
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
github.com/gorilla/websocket v1.5.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/stretchr/testify v1.8.4
-   golang.org/x/text v0.12.0
+   golang.org/x/text v0.13.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-16 Thread kenhuuu 
This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 32ec7f97c0464cb015bdc7cf766a94e6fbb71210
Merge: f624e37394 4230c97f83
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Mon Oct 16 15:12:04 2023 -0700

Merge branch '3.6-dev'

 .../Gherkin/CommonSteps.cs | 12 ++
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  1 +
 gremlin-go/driver/cucumber/cucumberSteps_test.go   | 28 ++
 gremlin-go/driver/cucumber/gremlin.go  |  1 +
 .../test/cucumber/feature-steps.js |  1 +
 .../gremlin-javascript/test/cucumber/gremlin.js|  1 +
 gremlin-python/src/main/python/radish/gremlin.py   |  1 +
 .../tinkerpop/gremlin/features/StepDefinition.java |  7 +++---
 .../gremlin/test/features/filter/Dedup.feature | 17 +
 9 files changed, 65 insertions(+), 4 deletions(-)

diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 8f8e3eaec1,29e6a1bea4..03c914b51a
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@@ -286,8 -284,20 +286,20 @@@ namespace Gremlin.Net.IntegrationTest.G
  }
  
Assert.True(expectedArrayContainsResultDictionary);
  }
+ else if (resultItem is HashSet 
resultItemSet)
+ {
+ var expectedArrayContainsResultAsSet = false;
+ foreach (var expectedItem in expectedArray)
+ {
+ if (expectedItem is not HashSet 
expectedItemSet) continue;
+ if 
(!expectedItemSet.SetEquals(resultItemSet)) continue;
+ expectedArrayContainsResultAsSet = true;
+ break;
+ }
+ Assert.True(expectedArrayContainsResultAsSet);
+ }
  else if (resultItem is double resultItemDouble &&
 - expectedArray.Select(e => 
e.GetType()).Any(t => t == typeof(decimal)))
 + expectedArray.Select(e => 
e!.GetType()).Any(t => t == typeof(decimal)))
  {
  // Java seems to use BigDecimal by default 
sometimes where .NET uses double, but we only
  // care for the value not its type here. So 
we just convert these to decimal (equivalent

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-12 Thread spmallette 
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 b110ffe88e898e056f025c7fd1f167cf3a0bf7e1
Merge: 652e4eda91 89934d20da
Author: Stephen Mallette 
AuthorDate: Thu Oct 12 18:38:10 2023 -0400

Merge branch '3.6-dev'

 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  3 +-
 gremlin-go/driver/cucumber/gremlin.go  |  3 +-
 .../gremlin-javascript/test/cucumber/gremlin.js|  3 +-
 gremlin-python/src/main/python/radish/gremlin.py   |  3 +-
 .../tinkerpop/gremlin/features/IsInMatcher.java| 56 +
 .../gremlin/features/IsPathEqualToMatcher.java | 57 +
 .../tinkerpop/gremlin/features/StepDefinition.java | 72 +++---
 .../gremlin/test/features/filter/Dedup.feature | 27 +---
 .../test/features/sideEffect/Inject.feature| 17 -
 9 files changed, 220 insertions(+), 21 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-10-04 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 1e3c881d9f157167b53f431898e6d1ee40429cd0
Merge: 70b7b0d8be 5c8ec9150d
Author: Florian Hockmann 
AuthorDate: Wed Oct 4 16:11:36 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-28 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 70b7b0d8be497498d19c429b607c60685f2322b1
Merge: fe70dfb0d7 974b4505d2
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Thu Sep 28 22:08:16 2023 -0700

Merge branch '3.6-dev'

 gremlin-go/driver/translator_test.go | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-28 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit fe70dfb0d7c0a03d07ffda7db4205e67e0909c24
Merge: ca5b9c85a3 4173f4250b
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Thu Sep 28 22:02:03 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc  |  1 +
 .../gremlin/process/traversal/step/map/ProjectStep.java |  7 +++
 .../process/traversal/step/map/ProjectStepTest.java | 17 +
 3 files changed, 25 insertions(+)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-27 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e9d26f7c383cb347b55a31883cdd19dbd92c3d10
Merge: 2bcdb66fda 9c0f89b740
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Wed Sep 27 16:47:49 2023 -0700

Merge branch '3.6-dev'

 docs/src/reference/gremlin-variants.asciidoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-25 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d32ed8512aac9fff99108e19d3eb96dc72641306
Merge: 8da7169ebf 5933fbd53e
Author: Cole-Greer 
AuthorDate: Mon Sep 25 15:05:32 2023 -0700

Merge branch '3.6-dev'

 docs/src/reference/gremlin-variants.asciidoc | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-13 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 306629ea2f645a87eb9b2ff6334e5206484b3a08
Merge: 65acd5dcbf 8acfcb1881
Author: Florian Hockmann 
AuthorDate: Wed Sep 13 16:46:33 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-09-06 Thread spmallette 
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 ac26c70a010aaed01f5e22e70d9bf1228a26c7f9
Merge: cdbebda7d3 e99092fa07
Author: Stephen Mallette 
AuthorDate: Wed Sep 6 09:01:09 2023 -0400

Merge branch '3.6-dev'

 gremlin-language/src/main/antlr4/Gremlin.g4 | 2352 +--
 1 file changed, 1176 insertions(+), 1176 deletions(-)

diff --cc gremlin-language/src/main/antlr4/Gremlin.g4
index 703e7f41aa,baa9498286..d4c4612af2
--- a/gremlin-language/src/main/antlr4/Gremlin.g4
+++ b/gremlin-language/src/main/antlr4/Gremlin.g4
@@@ -93,39 -93,38 +93,39 @@@ traversalSourceSelfMethod_wit
  ;
  
  traversalSourceSpawnMethod
-   : traversalSourceSpawnMethod_addE
-   | traversalSourceSpawnMethod_addV
-   | traversalSourceSpawnMethod_E
-   | traversalSourceSpawnMethod_V
-   | traversalSourceSpawnMethod_mergeE
-   | traversalSourceSpawnMethod_mergeV
-   | traversalSourceSpawnMethod_inject
+ : traversalSourceSpawnMethod_addE
+ | traversalSourceSpawnMethod_addV
+ | traversalSourceSpawnMethod_E
+ | traversalSourceSpawnMethod_V
+ | traversalSourceSpawnMethod_mergeE
+ | traversalSourceSpawnMethod_mergeV
+ | traversalSourceSpawnMethod_inject
  | traversalSourceSpawnMethod_io
  | traversalSourceSpawnMethod_call
 +| traversalSourceSpawnMethod_union
  ;
  
  traversalSourceSpawnMethod_addE
-   : 'addE' LPAREN stringArgument RPAREN
-   | 'addE' LPAREN nestedTraversal RPAREN
-   ;
 -: 'addE' LPAREN stringBasedLiteral RPAREN
++: 'addE' LPAREN stringArgument RPAREN
+ | 'addE' LPAREN nestedTraversal RPAREN
+ ;
  
  traversalSourceSpawnMethod_addV
-   : 'addV' LPAREN RPAREN
-   | 'addV' LPAREN stringArgument RPAREN
-   | 'addV' LPAREN nestedTraversal RPAREN
-   ;
+ : 'addV' LPAREN RPAREN
 -| 'addV' LPAREN stringBasedLiteral RPAREN
++| 'addV' LPAREN stringArgument RPAREN
+ | 'addV' LPAREN nestedTraversal RPAREN
+ ;
  
  traversalSourceSpawnMethod_E
-   : 'E' LPAREN genericLiteralVarargs RPAREN
-   ;
 -: 'E' LPAREN genericLiteralList RPAREN
++: 'E' LPAREN genericLiteralVarargs RPAREN
+ ;
  
  traversalSourceSpawnMethod_V
-   : 'V' LPAREN genericLiteralVarargs RPAREN
-   ;
 -: 'V' LPAREN genericLiteralList RPAREN
++: 'V' LPAREN genericLiteralVarargs RPAREN
+ ;
  
  traversalSourceSpawnMethod_inject
 -: 'inject' LPAREN genericLiteralList RPAREN
 +: 'inject' LPAREN genericLiteralVarargs RPAREN
  ;
  
  traversalSourceSpawnMethod_io
@@@ -175,134 -170,132 +175,134 @@@ terminatedTraversa
  : rootTraversal DOT traversalTerminalMethod
  ;
  
 -/*
 -GENERATED GRAMMAR - DO NOT CHANGE
 -**/
 -
  traversalMethod
-   : traversalMethod_V
-   | traversalMethod_E
-   | traversalMethod_addE
-   | traversalMethod_addV
-   | traversalMethod_mergeE
-   | traversalMethod_mergeV
-   | traversalMethod_aggregate
-   | traversalMethod_and
-   | traversalMethod_as
-   | traversalMethod_barrier
-   | traversalMethod_both
-   | traversalMethod_bothE
-   | traversalMethod_bothV
-   | traversalMethod_branch
-   | traversalMethod_by
-   | traversalMethod_cap
-   | traversalMethod_choose
-   | traversalMethod_coalesce
-   | traversalMethod_coin
-   | traversalMethod_connectedComponent
-   | traversalMethod_constant
-   | traversalMethod_count
-   | traversalMethod_cyclicPath
-   | traversalMethod_dedup
-   | traversalMethod_drop
-   | traversalMethod_elementMap
-   | traversalMethod_emit
-   | traversalMethod_filter
-   | traversalMethod_flatMap
-   | traversalMethod_fold
-   | traversalMethod_from
-   | traversalMethod_group
-   | traversalMethod_groupCount
-   | traversalMethod_has
-   | traversalMethod_hasId
-   | traversalMethod_hasKey
-   | traversalMethod_hasLabel
-   | traversalMethod_hasNot
-   | traversalMethod_hasValue
-   | traversalMethod_id
-   | traversalMethod_identity
-   | traversalMethod_in
-   | traversalMethod_inE
-   | traversalMethod_inV
-   | traversalMethod_index
-   | traversalMethod_inject
-   | traversalMethod_is
-   | traversalMethod_key
-   | traversalMethod_label
-   | traversalMethod_limit
-   | traversalMethod_local
-   | traversalMethod_loops
-   | traversalMethod_map
-   | traversalMethod_match
-   | traversalMethod_math
-   | traversalMethod_max
-   | traversalMethod_mean
-   | traversalMethod_min
-   | traversalMethod_not
-   | traversalMethod_option
-   | traversalMethod_optional
-   | traversalMethod_or
-   | traversalMethod_order
-   |

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-31 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 397eff08f73ae555bd3aab87498b9ff131792741
Merge: 02973f26bf 91e033f183
Author: Cole-Greer 
AuthorDate: Thu Aug 31 14:13:43 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc|   1 +
 docs/src/reference/the-traversal.asciidoc |  31 +-
 gremlin-go/driver/translator.go   | 365 +++
 gremlin-go/driver/translator_test.go  | 720 ++
 4 files changed, 1110 insertions(+), 7 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-31 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 02973f26bf0918b1eea90eb977c208b29708ae84
Merge: a6404b38b2 f2d4ac539f
Author: Cole-Greer 
AuthorDate: Thu Aug 31 13:07:20 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 .../tinkerpop/gremlin/structure/util/star/StarGraph.java   | 10 ++
 2 files changed, 11 insertions(+)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-31 Thread spmallette 
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 a6404b38b264ed0c0fba961fee894bdd65b6fc3f
Merge: 1ddfe46159 b893ea461a
Author: Stephen Mallette 
AuthorDate: Thu Aug 31 13:27:56 2023 -0400

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |   3 +-
 .../tinkerpop/gremlin/driver/Channelizer.java  |  90 +-
 .../apache/tinkerpop/gremlin/driver/Cluster.java   |  27 ++-
 .../gremlin/driver/HandshakeInterceptor.java   |   2 +
 .../org/apache/tinkerpop/gremlin/driver/Host.java  |  14 +-
 ...akeInterceptor.java => RequestInterceptor.java} |  12 +-
 .../driver/handler/HttpGremlinRequestEncoder.java  |  92 +++
 .../driver/handler/HttpGremlinResponseDecoder.java |  53 ++
 .../driver/handler/WebSocketClientHandler.java |   5 +-
 .../language/corpus/DocumentationReader.java   |   6 +-
 .../handler/HttpBasicAuthorizationHandler.java |  16 +-
 .../server/handler/HttpGremlinEndpointHandler.java |  92 ++-
 .../gremlin/server/handler/HttpHandlerUtil.java|  40 +++--
 .../gremlin/server/GremlinDriverIntegrateTest.java |  32 +++-
 .../gremlin/server/HttpDriverIntegrateTest.java| 183 +
 .../gremlin/server/authz/AllowListAuthorizer.java  |   7 +-
 .../search/path/ShortestPathVertexProgramTest.java |   3 +-
 .../tinkerpop/gremlin/util/MessageSerializer.java  |   3 +-
 .../gremlin/util/message/RequestMessage.java   |   8 +
 .../util/ser/GraphBinaryMessageSerializerV1.java   |  10 +-
 .../gremlin/util/ser/AbstractRoundTripTest.java|  44 -
 .../binary/GraphBinaryMessageSerializerV1Test.java |  27 +++
 22 files changed, 669 insertions(+), 100 deletions(-)

diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index 00,2c271cede8..1c15f6162c
mode 00,100644..100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@@ -1,0 -1,92 +1,92 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  */
+ package org.apache.tinkerpop.gremlin.driver.handler;
+ 
+ import io.netty.buffer.ByteBuf;
+ import io.netty.channel.ChannelHandler;
+ import io.netty.channel.ChannelHandlerContext;
+ import io.netty.handler.codec.MessageToMessageEncoder;
+ import io.netty.handler.codec.http.DefaultFullHttpRequest;
+ import io.netty.handler.codec.http.FullHttpRequest;
+ import io.netty.handler.codec.http.HttpHeaderNames;
+ import io.netty.handler.codec.http.HttpMethod;
+ import io.netty.handler.codec.http.HttpVersion;
 -import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 -import org.apache.tinkerpop.gremlin.driver.Tokens;
++import org.apache.tinkerpop.gremlin.util.MessageSerializer;
++import org.apache.tinkerpop.gremlin.util.Tokens;
+ import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 -import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
++import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
++import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+ import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+ import 
org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
+ import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+ 
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.function.UnaryOperator;
+ 
+ /**
+  * Converts {@link RequestMessage} to a {@code HttpRequest}.
+  */
+ @ChannelHandler.Sharable
+ public final class HttpGremlinRequestEncoder extends 
MessageToMessageEncoder {
+ private final MessageSerializer serializer;
+ 
+ private static final ObjectMapper mapper = new ObjectMapper();
+ 
+ private final UnaryOperator interceptor;
+ 
+ public HttpGremlinRequestEncoder(final MessageSerializer serializer, 
final UnaryOperator interceptor) {
+ this.serializer =

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-30 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 1ddfe4615958ee820e6f4aa4fcac5bd70011d6e0
Merge: 02bf879ccb 6017c86ef8
Author: Florian Hockmann 
AuthorDate: Wed Aug 30 11:27:14 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-28 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 02bf879ccb64dce482277c1d7033a19489a2fbef
Merge: fed1ca181b bcb9114b02
Author: Cole-Greer 
AuthorDate: Mon Aug 28 09:28:13 2023 -0700

Merge branch '3.6-dev'

 gremlin-go/go.mod  |  2 +-
 gremlin-go/go.sum  |  4 +--
 .../gremlin-javascript/package-lock.json   | 40 +++---
 3 files changed, 23 insertions(+), 23 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-23 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e79a8cc3a0b37fdb3318bc28fc6bb8e8d05c4b6a
Merge: e0779f7682 2edde0ba8c
Author: Cole-Greer 
AuthorDate: Wed Aug 23 18:14:28 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc  | 1 +
 .../tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-18 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 84093d7a8174014584caab9719dac59d4af47525
Merge: 7869622ff2 4b6e505a98
Author: Florian Hockmann 
AuthorDate: Fri Aug 18 09:00:26 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj   | 2 +-
 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-18 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7869622ff250f5dff0b2a6b0e4f006c23c8adf4f
Merge: e1e90d4d96 a95313bd43
Author: Florian Hockmann 
AuthorDate: Fri Aug 18 08:58:38 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-16 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 448d9024743222482ff130c55fe951f737d5e3ab
Merge: b8838bdbb1 e72fb42433
Author: Cole-Greer 
AuthorDate: Wed Aug 16 14:44:43 2023 -0700

Merge branch '3.6-dev'

 gremlin-console/pom.xml|   2 +-
 gremlin-go/go.mod  |   2 +-
 gremlin-go/go.sum  |   4 +-
 .../gremlin-javascript/package-lock.json   | 150 ++---
 .../javascript/gremlin-javascript/package.json |   2 +-
 gremlint/package-lock.json |  12 +-
 pom.xml|   2 +-
 7 files changed, 87 insertions(+), 87 deletions(-)

diff --cc gremlin-go/go.mod
index fd211b5ecd,5fec618675..d1ad936fb0
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
github.com/gorilla/websocket v1.5.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/stretchr/testify v1.8.4
-   golang.org/x/text v0.11.0
+   golang.org/x/text v0.12.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-15 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 30c9fd3dbacca01d7b7baf349208c669b13489f7
Merge: 1243d2f02a a04a654977
Author: Cole-Greer 
AuthorDate: Tue Aug 15 14:50:17 2023 -0700

Merge branch '3.6-dev'

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

diff --cc pom.xml
index 0d41745146,2ffa3b7d75..b1618a03ad
--- a/pom.xml
+++ b/pom.xml
@@@ -173,11 -172,12 +173,11 @@@ limitations under the License
  2.0.1
  1.2.11
  3.0.2
 -3.3.3
 +4.10.0
- 4.1.86.Final
+ 4.1.96.Final
 -1.7.25
 +1.7.33
  2.0
 -3.2.1
 -2.0.9
 +3.3.2
  
  UTF-8
  
UTF-8

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-15 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit cdb23b24a091e4e64b11556cf1cfcac2269efbc9
Merge: a68b404f93 928cf2d806
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Aug 15 13:42:47 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 gremlin-go/driver/error_codes.go   | 17 +++
 gremlin-go/driver/graphBinary.go   | 32 +++--
 gremlin-go/driver/resources/error-messages/en.json |  1 +
 gremlin-go/driver/serializer.go| 26 ++
 gremlin-go/driver/serializer_test.go   | 55 +-
 6 files changed, 118 insertions(+), 14 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-09 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 56244fbb4b0c5def3d07e06cb2cde4207feeb7ec
Merge: a5f851cf88 ec4e23a63d
Author: Florian Hockmann 
AuthorDate: Wed Aug 9 12:03:08 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-09 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a5f851cf88386b5127d8b0a9b9c970cb3bd815c4
Merge: 51bd0d6e4c 6d007fb3e1
Author: Florian Hockmann 
AuthorDate: Wed Aug 9 10:25:27 2023 +0200

Merge branch '3.6-dev'

 CHANGELOG.asciidoc   |  1 +
 .../IO/GraphBinary/TypeSerializerRegistry.cs | 20 ++--
 .../Structure/IO/GraphSON/GraphSONWriter.cs  |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --cc gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
index 5b1725ffce,a7d4d01128..f62dac2bf7
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
@@@ -133,13 -132,13 +133,13 @@@ namespace Gremlin.Net.Structure.IO.Grap
  return objectData; 
  }
  
 -private IGraphSONSerializer TryGetSerializerFor(Type type)
 +private IGraphSONSerializer? TryGetSerializerFor(Type type)
  {
- if (Serializers.ContainsKey(type))
+ if (Serializers.TryGetValue(type, out var serializer))
  {
- return Serializers[type];
+ return serializer;
  }
- foreach (var supportedType in Serializers.Keys)
+ foreach (var supportedType in new List(Serializers.Keys))
  if (supportedType.IsAssignableFrom(type))
  {
  return Serializers[supportedType];

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-08 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 51bd0d6e4ca13039072063d07441040a3c5f0316
Merge: d431ba5852 67fdacf489
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Tue Aug 8 15:36:48 2023 -0700

Merge branch '3.6-dev'

 .../Optimization/{RangeByIsCountStrategy.cs => CountStrategy.cs}  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-08-04 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9d161a0d6c3142a34cc634f9678d004412c3e157
Merge: 3d42e0c138 b12efc5834
Author: Cole-Greer 
AuthorDate: Fri Aug 4 16:18:03 2023 -0700

Merge branch '3.6-dev'

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-28 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 18ea3d5d2428d1baa1c431b627e1274bce6f95fd
Merge: 0eb52114f6 3f130b4709
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Fri Jul 28 10:58:37 2023 -0700

Merge branch '3.6-dev'

 gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs  | 2 ++
 gremlin-go/driver/cucumber/gremlin.go   | 2 ++
 .../src/main/javascript/gremlin-javascript/docker-compose.yml   | 2 +-
 .../src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js | 2 ++
 gremlin-python/src/main/python/radish/gremlin.py| 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index 0f49157761,591ceca780..957a4fadab
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@@ -738,13 -710,7 +739,14 @@@ namespace Gremlin.Net.IntegrationTest.G
 {"g_mergeV_hidden_label_value_onCreate_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.MergeV((IDictionary) new Dictionary 
{}).Option(Merge.OnCreate, (IDictionary) p["xx1"])}}, 
 {"g_mergeV_hidden_id_key_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary) new 
Dictionary {}).Option(Merge.OnMatch, 
(IDictionary) p["xx1"])}}, 
 
{"g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary) new 
Dictionary {}).Option(Merge.OnMatch, 
(IDictionary) p["xx1"])}}, 
 +   {"g_mergeVXname_markoX_optionXonMatch_age_listX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_setX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age" [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_setX31XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age" [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_singleX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"a [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_33_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"age", 33}},Cardinality.Single),  [...]
 +   
{"g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"name", "allen"}, [...]
 +   
{"g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"name", "allen [...]
+{"g_mergeV_hidden_label_key_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.MergeV((IDictionary) new Dictionary 
{}).Option(Merge.OnMatch, (IDictionary) p["xx1"])}}, 
 {"g_V_age_min", new List, ITraversal>> {(g,p) 
=>g.V().Values("age").Min()}}, 
 {"g_V_foo_min", new List, ITraversal>> {(g,p)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-27 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit de52226885a1de6bfb8909e6ee500f9e96cfff36
Merge: eeaf6b1415 fb01b1b036
Author: Cole-Greer 
AuthorDate: Thu Jul 27 18:11:14 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc| 1 +
 docs/src/reference/the-graphcomputer.asciidoc | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-27 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit de56cc9dea5591a53399f02c56fcba8b5028cb7f
Merge: 077cfe8f8e a7192a28bc
Author: Cole-Greer 
AuthorDate: Thu Jul 27 16:37:06 2023 -0700

Merge branch '3.6-dev'

 .../org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
index 78ea44bc88,f1715c4dcd..3d217726ef
--- 
a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
+++ 
b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
@@@ -43,7 -43,8 +43,7 @@@ public final class LabelP extends Phttps://tinkerpop.apache.org/docs/3.5.7/reference/#neo4j-gremlin
   */
  @Deprecated
--public static final class LabelBiPredicate implements BiPredicate, Serializable {
 -
++public static final class LabelBiPredicate implements 
PBiPredicate, Serializable {
  private static final LabelBiPredicate INSTANCE = new 
LabelBiPredicate();
  
  private LabelBiPredicate() {

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-26 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 2f3304b1e70c7f82462412b46dc1f072a4868183
Merge: 98df6e5d77 428e592eca
Author: Cole-Greer 
AuthorDate: Wed Jul 26 20:12:15 2023 -0700

Merge branch '3.6-dev'

 gremlint/package-lock.json | 43 ++-
 gremlint/package.json  |  3 ++-
 2 files changed, 24 insertions(+), 22 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-26 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ebd3def6139ed05b86f0a8d9b02f3e098a746570
Merge: 3da00e55b9 1dc5fa07cc
Author: Cole-Greer 
AuthorDate: Wed Jul 26 17:01:43 2023 -0700

Merge branch '3.6-dev'

 gremlin-console/pom.xml | 4 ++--
 gremlin-driver/pom.xml  | 4 ++--
 gremlin-shaded/pom.xml  | 4 ++--
 gremlin-shaded/src/main/static/licenses/{minilog => minlog} | 0
 4 files changed, 6 insertions(+), 6 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-26 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 2a60d97b25dcd47743d9ade2c6bbf6ed175b1bdc
Merge: 60cd2f0dd3 a0d5c831ad
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Wed Jul 26 13:52:31 2023 -0700

Merge branch '3.6-dev'

 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  1 -
 gremlin-go/driver/cucumber/gremlin.go  |  1 -
 .../gremlin-javascript/test/cucumber/gremlin.js|  1 -
 gremlin-python/src/main/python/radish/gremlin.py   |  1 -
 .../gremlin/test/features/map/MergeEdge.feature| 18 +++---
 .../gremlin/test/features/map/MergeVertex.feature  | 29 ++
 6 files changed, 16 insertions(+), 35 deletions(-)

diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index d895951fce,7637b3bb86..0f49157761
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@@ -738,14 -709,6 +738,13 @@@ namespace Gremlin.Net.IntegrationTest.G
 {"g_mergeV_hidden_label_value_onCreate_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.MergeV((IDictionary) new Dictionary 
{}).Option(Merge.OnCreate, (IDictionary) p["xx1"])}}, 
 {"g_mergeV_hidden_id_key_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary) new 
Dictionary {}).Option(Merge.OnMatch, 
(IDictionary) p["xx1"])}}, 
 
{"g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary) new 
Dictionary {}).Option(Merge.OnMatch, 
(IDictionary) p["xx1"])}}, 
-{"g_mergeV_hidden_label_value_onMatch_matched_prohibited", new 
List, ITraversal>> 
{(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary) new 
Dictionary {}).Option(Merge.OnMatch, 
(IDictionary) p["xx1"])}}, 
 +   {"g_mergeVXname_markoX_optionXonMatch_age_listX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_setX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age" [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_setX31XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"age" [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_singleX33XX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary) new 
Dictionary {{"a [...]
 +   {"g_mergeVXname_markoX_optionXonMatch_age_33_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"age", 33}},Cardinality.Single),  [...]
 +   
{"g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"name", "allen"}, [...]
 +   
{"g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX", new 
List, ITraversal>> 
{(g,p) 
=>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32),
 (g,p) =>g.MergeV((IDictionary) new Dictionary 
{{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary 
{{"name", "allen [...]
 {"g_V_age_min", new List, ITraversal>> {(g,p) 
=>g.V().Values("age").Min()}}, 
 {"g_V_foo_min", new List, ITraversal>> {(g,p)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-17 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 311dc6274bb64d8e41c6c9d5bf0b656ba1635bd3
Merge: 4cdddebc30 489e00b2a9
Author: Cole-Greer 
AuthorDate: Mon Jul 17 21:04:23 2023 -0700

Merge branch '3.6-dev'

 .../gremlin-javascript/package-lock.json   | 861 -
 .../javascript/gremlin-javascript/package.json |   4 +-
 2 files changed, 832 insertions(+), 33 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-17 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 4cdddebc304cf6d0471a5b724b54ede8a2297611
Merge: 30df50200f 1f99a0a7de
Author: Cole-Greer 
AuthorDate: Mon Jul 17 15:25:02 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  2 +
 docs/src/upgrade/release-3.5.x.asciidoc| 14 
 .../structure/io/graphson/GraphSONMapper.java  | 25 +-
 .../io/graphson/GraphSONStreamConstraintsTest.java | 93 ++
 .../gremlin/driver/ClusterConfigTest.java  | 72 +
 gremlin-shaded/pom.xml |  2 +-
 .../ser/AbstractGraphSONMessageSerializerV1.java   | 16 
 .../ser/AbstractGraphSONMessageSerializerV2.java   | 16 
 .../AbstractGraphSONMessageSerializerV1Test.java   | 53 
 .../AbstractGraphSONMessageSerializerV2Test.java   | 53 
 pom.xml|  5 +-
 11 files changed, 348 insertions(+), 3 deletions(-)

diff --cc 
gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
index 00,4e47684dd7..03b8fce75c
mode 00,100644..100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
@@@ -1,0 -1,72 +1,72 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  */
+ package org.apache.tinkerpop.gremlin.driver;
+ 
+ import org.apache.commons.configuration2.BaseConfiguration;
+ import org.apache.commons.configuration2.Configuration;
 -import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
 -import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
++import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
++import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+ import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
+ import org.junit.Test;
+ 
+ import java.util.Arrays;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ 
+ public class ClusterConfigTest {
+ 
+ @Test
+ public void shouldPropagateSerializerConstraintsForGraphSON3() {
+ final Configuration config = new BaseConfiguration();
+ config.setProperty("serializer.config.maxNumberLength", 999);
+ config.setProperty("serializer.config.maxStringLength", 123456);
+ config.setProperty("serializer.config.maxNestingDepth", 55);
+ config.setProperty("hosts", Arrays.asList("localhost"));
+ 
 -config.setProperty("serializer.className", 
GraphSONMessageSerializerV3d0.class.getCanonicalName());
++config.setProperty("serializer.className", 
GraphSONMessageSerializerV3.class.getCanonicalName());
+ final Cluster cluster = Cluster.open(config);
 -assertTrue(cluster.getSerializer() instanceof 
GraphSONMessageSerializerV3d0);
 -final GraphSONMessageSerializerV3d0 serV3 = 
(GraphSONMessageSerializerV3d0) cluster.getSerializer();
++assertTrue(cluster.getSerializer() instanceof 
GraphSONMessageSerializerV3);
++final GraphSONMessageSerializerV3 serV3 = 
(GraphSONMessageSerializerV3) cluster.getSerializer();
+ final StreamReadConstraints constraints = 
serV3.getMapper().getFactory().streamReadConstraints();
+ 
+ assertEquals(999, constraints.getMaxNumberLength());
+ assertEquals(123456, constraints.getMaxStringLength());
+ assertEquals(55, constraints.getMaxNestingDepth());
+ }
+ 
+ @Test
+ public void shouldPropagateSerializerConstraintsForGraphSON2() {
+ final Configuration config = new BaseConfiguration();
+ config.setProperty("serializer.config.maxNumberLength", 999);
+ config.setProperty("serializer.config.maxStringLength", 123456);
+ config.setProperty("serializer.config.maxNestingDepth", 55);
+ config.setProperty("hosts", Arrays.asList("localhost"));
+ 
 -

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-14 Thread kenhuuu 
This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 30df50200f46a672c23bd67dd9f39d684174389a
Merge: 8fa8b21515 167e86d63b
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Fri Jul 14 14:52:50 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 .../groovy/jsr223/ImportGroovyCustomizer.java  |  2 +-
 .../jsr223/GremlinGroovyScriptEngineTest.java  | 27 ++
 3 files changed, 29 insertions(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-14 Thread xiazcy 
This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 8fa8b2151569c8b35212826c698523e936773ef3
Merge: 8565d43de7 95b48dd915
Author: Yang Xia <55853655+xia...@users.noreply.github.com>
AuthorDate: Fri Jul 14 12:48:43 2023 -0700

Merge branch '3.6-dev'

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-12 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9ec62895f3d8bca91b145a692522d66509618ab6
Merge: 0ca632e8a3 5e1e1195af
Author: Cole-Greer 
AuthorDate: Wed Jul 12 12:38:30 2023 -0700

Merge branch '3.6-dev'

 docs/src/reference/the-traversal.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-12 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 0ca632e8a3438e3aa4d16e4b05da0dd30f32628e
Merge: 7c94ed9239 cd880f9d07
Author: Cole-Greer 
AuthorDate: Wed Jul 12 11:55:27 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc  | 1 +
 .../apache/tinkerpop/gremlin/process/traversal/step/map/LabelStep.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-10 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit eac6b93ffe9212bd563adfd122c385391dbd3459
Merge: 4cb25e3deb 8ea4d1fb6f
Author: Cole Greer 
AuthorDate: Mon Jul 10 11:37:14 2023 -0700

Merge branch '3.6-dev'

 gremlin-go/go.mod  |   2 +-
 gremlin-go/go.sum  |   4 +-
 .../gremlin-javascript/package-lock.json   | 122 ++---
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --cc gremlin-go/go.mod
index 256efa3947,294c394fb0..fd211b5ecd
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
github.com/gorilla/websocket v1.5.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/stretchr/testify v1.8.4
-   golang.org/x/text v0.10.0
+   golang.org/x/text v0.11.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-07-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 39efa09a1083c728e640c5de0ef59990ad124ffe
Merge: dc0cb272fe c18979f0d8
Author: Cole Greer 
AuthorDate: Wed Jul 5 09:58:30 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 gremlin-console/pom.xml|  8 --
 gremlin-console/src/main/static/LICENSE|  2 --
 gremlin-console/src/main/static/licenses/jcabi-log | 27 
 .../src/main/static/licenses/jcabi-manifests   | 27 
 gremlin-core/pom.xml   | 29 --
 .../org/apache/tinkerpop/gremlin/util/Gremlin.java | 15 ++-
 gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs|  5 
 gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs|  4 +--
 gremlin-dotnet/src/pom.xml | 13 ++
 gremlin-driver/pom.xml | 12 -
 gremlin-driver/src/main/static/LICENSE |  6 -
 gremlin-driver/src/main/static/licenses/jcabi-log  | 27 
 .../src/main/static/licenses/jcabi-manifests   | 27 
 gremlin-go/driver/user_agent.go| 16 +++-
 gremlin-go/pom.xml | 13 ++
 gremlin-javascript/pom.xml | 13 ++
 .../javascript/gremlin-javascript/lib/utils.js | 11 +++-
 gremlin-python/pom.xml | 13 ++
 .../main/python/gremlin_python/driver/useragent.py |  8 ++
 gremlin-server/src/main/static/LICENSE |  2 --
 gremlin-server/src/main/static/licenses/jcabi-log  | 27 
 .../src/main/static/licenses/jcabi-manifests   | 27 
 pom.xml| 29 +-
 24 files changed, 103 insertions(+), 259 deletions(-)

diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index 63781e0227,450e03e5f5..16c648f217
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@@ -26,16 -24,7 +24,7 @@@ import java.io.IOException
   * @author Stephen Mallette (http://stephen.genoprime.com)
   */
  public final class Gremlin {
- private static String version;
- 
- static {
- try {
- version = Manifests.read("tinkerpop-version");
- }
- catch (Throwable t) {
- version = "VersionNotFound";
- }
- }
 -private final static String gremlinVersion = "3.6.5-SNAPSHOT"; // DO NOT 
MODIFY - Configured automatically by Maven Replacer Plugin
++private final static String gremlinVersion = "3.7.0-SNAPSHOT"; // DO NOT 
MODIFY - Configured automatically by Maven Replacer Plugin
  
  private Gremlin() {
  }
diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index 8a4e9ba22f,c45e291bd5..299902a187
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@@ -30,6 -30,11 +30,11 @@@ namespace Gremlin.Net.Drive
  /// 
  public class Tokens
  {
+ /// 
+ /// Current TinkerPop version.
+ /// 
 -public static string GremlinVersion = "3.6.5-SNAPSHOT"; // DO NOT 
MODIFY - Configured automatically by Maven Replacer Plugin
++public static string GremlinVersion = "3.7.0-SNAPSHOT"; // DO NOT 
MODIFY - Configured automatically by Maven Replacer Plugin
+ 
  /// 
  /// The key for the unique identifier of the request.
  /// 
diff --cc gremlin-go/driver/user_agent.go
index 334d2a0927,0801e3b214..74135ed313
--- a/gremlin-go/driver/user_agent.go
+++ b/gremlin-go/driver/user_agent.go
@@@ -38,9 -37,10 +37,10 @@@ var userAgent strin
  
  const userAgentHeader = "User-Agent"
  
 -const gremlinVersion = "3.6.5-SNAPSHOT" // DO NOT MODIFY - Configured 
automatically by Maven Replacer Plugin
++const gremlinVersion = "3.7.0-SNAPSHOT" // DO NOT MODIFY - Configured 
automatically by Maven Replacer Plugin
+ 
  func init() {
applicationName := "NotAvailable"
-   driverVersion := "NotAvailable"
  
path, err := os.Executable()
if err == nil {
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
index 2bb3ecd6fb,aeb315aeda..7cb3ea0227
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
@@@ -25,7 -25,8 +25,8 @@@
  
  const crypto = require('crypto');
  const os = require('os');
- const { readFileSync } = require('fs');
+ 
 -const gremlinVersion = '3.6.5-SNAPSHOT'; // DO NOT MODIFY - Configured 
automatically by Maven Replacer Plugin
++const

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-28 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit dadc593d4fa8498c1c9022c9ebc7971a51e02253
Merge: 83d03fcaeb 0903ba7a40
Author: Florian Hockmann 
AuthorDate: Wed Jun 28 09:37:01 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-21 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 668de09d0eb11aa18e88b6c41b10809f1af686d0
Merge: 006f96400f af3759e4be
Author: Florian Hockmann 
AuthorDate: Wed Jun 21 10:46:07 2023 +0200

Merge branch '3.6-dev'

 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-16 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 8d107c3dccc71f72bc42078203a27689056e716a
Merge: a5eec10e04 43f12f2d08
Author: Cole Greer 
AuthorDate: Fri Jun 16 18:43:34 2023 -0700

Merge branch '3.6-dev'

 .../gremlin-javascript/package-lock.json   | 28 +++---
 1 file changed, 14 insertions(+), 14 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-16 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f27a348a3c611b576ba671ffd4d1696b53d9d75c
Merge: 419b2ab558 a32ef75eb7
Author: Cole Greer 
AuthorDate: Fri Jun 16 15:53:39 2023 -0700

Merge branch '3.6-dev'

 gremlin-go/go.mod  |  2 +-
 gremlin-go/go.sum  |  4 ++--
 .../gremlin-javascript/package-lock.json   | 26 +++---
 .../javascript/gremlin-javascript/package.json |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --cc gremlin-go/go.mod
index d0f8068bf2,22b61dccae..256efa3947
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -24,9 -24,8 +24,9 @@@ require 
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
-   github.com/stretchr/testify v1.8.3
+   github.com/stretchr/testify v1.8.4
golang.org/x/text v0.10.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-16 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 419b2ab558a6396dc1d1f1dfb4be0f4505f50916
Merge: 1f770f3b79 9e564ddd1d
Author: Cole Greer 
AuthorDate: Fri Jun 16 14:27:53 2023 -0700

Merge branch '3.6-dev'

 .github/workflows/build-test.yml |  2 +-
 gremlin-go/go.mod|  2 +-
 gremlin-go/go.sum| 11 ++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --cc gremlin-go/go.mod
index 33c85edab1,ec4ee63826..d0f8068bf2
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
github.com/gorilla/websocket v1.5.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/stretchr/testify v1.8.3
-   golang.org/x/text v0.9.0
+   golang.org/x/text v0.10.0
 +  gopkg.in/yaml.v3 v3.0.1
  )
  
  require (

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-16 Thread spmallette 
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 0ec98c65901d0a97035f24e11b3805cad655f0e7
Merge: 21fbcb9955 00c57ac4ff
Author: Stephen Mallette 
AuthorDate: Fri Jun 16 13:41:40 2023 -0400

Merge branch '3.6-dev'

 CHANGELOG.asciidoc|  1 +
 .../src/main/python/gremlin_python/driver/client.py   |  3 +++
 gremlin-python/src/main/python/tests/driver/test_client.py| 11 +++
 3 files changed, 15 insertions(+)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-14 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c067697f6614400ed12c968e21a21f200b3daa03
Merge: 6252226684 f00cfe5592
Author: Florian Hockmann 
AuthorDate: Wed Jun 14 15:11:48 2023 +0200

Merge branch '3.6-dev'

 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-14 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 62522266842ef844e9315b8d8303943efd12f56e
Merge: 6d55564560 29f16dc472
Author: Florian Hockmann 
AuthorDate: Wed Jun 14 09:45:02 2023 +0200

Merge branch '3.6-dev'

 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-12 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 6d55564560bb2210f78e8e0a0bea0e9ce41bd6a1
Merge: fed731ee56 379fa8b7b0
Author: Cole Greer 
AuthorDate: Mon Jun 12 15:49:26 2023 -0700

Merge branch '3.6-dev'

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-08 Thread kenhuuu 
This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit fed731ee56601f3727cdeeeadc926535a7002ff6
Merge: ef088c6e9e 57bca85227
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Thu Jun 8 13:09:13 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc|  1 +
 docs/src/reference/gremlin-applications.asciidoc  |  2 +-
 docs/src/tutorials/getting-started/index.asciidoc |  3 +-
 gremlin-console/src/main/bin/gremlin-java8.bat| 48 +++
 4 files changed, 52 insertions(+), 2 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-07 Thread florianhockmann 
This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f46763ab7ec9c68da18c5ae9e7100fd56ea3a83f
Merge: 882f147321 c24ddc6fcb
Author: Florian Hockmann 
AuthorDate: Wed Jun 7 17:39:58 2023 +0200

Merge branch '3.6-dev'

 .../test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
 .../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
 gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 882f147321f981bb0a225271db0a95fa3ffa3689
Merge: b656230542 df6fde9d92
Author: Cole Greer 
AuthorDate: Mon Jun 5 16:19:22 2023 -0700

Merge branch '3.6-dev'

 docs/src/dev/developer/development-environment.asciidoc | 5 -
 1 file changed, 5 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b656230542a97160e9c22ea163ad37342bed1777
Merge: 92b7e1d94f 66d088733e
Author: Cole Greer 
AuthorDate: Mon Jun 5 15:31:06 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 .../python/gremlin_python/process/translator.py|  8 +---
 .../main/python/tests/process/test_translator.py   | 23 ++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --cc gremlin-python/src/main/python/tests/process/test_translator.py
index 61db50ada3,2afa148372..867a2ae0a8
--- a/gremlin-python/src/main/python/tests/process/test_translator.py
+++ b/gremlin-python/src/main/python/tests/process/test_translator.py
@@@ -350,13 -350,30 +350,36 @@@ class TestTraversalStrategies(object)
  # 98
  
tests.append([g.withComputer().V().shortestPath().with_(ShortestPath.target, 
__.has('name','peter')),
   "g.withStrategies(new 
VertexProgramStrategy()).V().shortestPath().with('~tinkerpop.shortestPath.target',__.has('name','peter'))"])
 +# 99
 +tests.append([g.V().coalesce(__.E(),__.addE('person')),
 + "g.V().coalesce(__.E(),__.addE('person'))"])
 +# 100
 +tests.append([g.inject(1).E(),
 + "g.inject(1).E()"])
  
+ # 99
+ tests.append([g.V().has("p1", starting_with("foo")),
+  "g.V().has('p1',startingWith('foo'))"])
+ 
+ # 100
+ tests.append([g.V().has("p1", ending_with("foo")),
+  "g.V().has('p1',endingWith('foo'))"])
+ 
+ # 101
+ class SuperStr(str):
+ pass
+ tests.append([g.V(SuperStr("foo_id")),
+  "g.V('foo_id')"])
+ 
+ # 102
+ tests.append([g.V().has("p1", containing(SuperStr("foo"))),
+  "g.V().has('p1',containing('foo'))"])
+ 
+ # 103
+ tests.append([g.V().has("p1", None),
+  "g.V().has('p1',null)"])
+ 
+ 
  tlr = Translator().of('g')
  
  for t in range(len(tests)):

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 92b7e1d94f809ce0fdabc6e9d9c7b5b0d5a12cd1
Merge: ae58f4e272 dc6b97cb90
Author: Cole Greer 
AuthorDate: Mon Jun 5 15:20:57 2023 -0700

Merge branch '3.6-dev'

 gremlin-dotnet/src/pom.xml  | 37 +
 gremlin-dotnet/test/pom.xml | 33 +
 gremlin-go/pom.xml  | 33 +
 gremlin-python/pom.xml  | 33 +
 4 files changed, 136 insertions(+)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-06-05 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ae58f4e272299ffccfbb7ea469349058536348cc
Merge: 6a62327d1c b5e78c7d0f
Author: Cole Greer 
AuthorDate: Mon Jun 5 15:19:31 2023 -0700

Merge branch '3.6-dev'

 .github/workflows/build-test.yml   |2 +-
 CHANGELOG.asciidoc |2 +
 .../dev/developer/development-environment.asciidoc |2 +-
 docs/src/upgrade/release-3.5.x.asciidoc|4 +-
 gremlin-go/README.md   |4 +-
 gremlin-go/docker-compose.yml  |2 +-
 gremlin-go/driver/README.md|6 +-
 gremlin-go/example/go.mod  |2 +-
 gremlin-go/go.mod  |2 +-
 gremlin-javascript/pom.xml |4 +-
 .../gremlin-javascript/package-lock.json   | 2078 ++--
 .../javascript/gremlin-javascript/package.json |2 +-
 gremlint/package-lock.json |   15 +-
 gremlint/package.json  |2 +-
 gremlint/pom.xml   |4 +-
 gremlint/tsconfig.json |2 +-
 16 files changed, 1070 insertions(+), 1063 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-05-31 Thread colegreer 
This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d825d3a52434015dffbc873c68e5c637dface517
Merge: b549fc0270 ce14b3a5bf
Author: Cole Greer 
AuthorDate: Wed May 31 16:48:37 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |   1 +
 .../strategy/decoration/VertexProgramStrategy.java |   2 +-
 gremlin-server/pom.xml |   6 +
 .../gremlin/driver/remote/AbstractFeatureTest.java |  50 ++
 .../GraphBinaryRemoteComputerFeatureTest.java  |  51 ++
 .../remote/GraphBinaryRemoteFeatureTest.java   |  51 ++
 .../remote/GraphSONRemoteComputerFeatureTest.java  |  51 ++
 .../driver/remote/GraphSONRemoteFeatureTest.java   |  51 ++
 .../gremlin/driver/remote/RemoteWorld.java | 187 +
 .../io.cucumber.core.backend.ObjectFactory |   4 +
 10 files changed, 453 insertions(+), 1 deletion(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

2023-05-25 Thread valentyn 
This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit cc405454d30491e563f381b0a262b3bd76201dbf
Merge: c230a02c0c 599c4418a7
Author: Valentyn Kahamlyk 
AuthorDate: Thu May 25 16:59:08 2023 -0700

Merge branch '3.6-dev'

 CHANGELOG.asciidoc |  1 +
 gremlin-python/src/main/python/README.rst  | 16 +++
 gremlin-python/src/main/python/example.py  |  2 +-
 .../gremlin_python/process/graph_traversal.py  | 52 +++---
 .../python/gremlin_python/process/traversal.py |  2 +-
 .../apache/tinkerpop/gremlin/hadoop/Constants.java |  1 +
 .../spark/process/computer/SparkGraphComputer.java | 16 ++-
 .../process/computer/SparkHadoopGraphProvider.java | 10 -
 .../SparkCloneVertexProgramInterceptorTest.java| 46 +++
 9 files changed, 107 insertions(+), 39 deletions(-)

  1   2   3   4   >