(tinkerpop) branch master-http-pre-rebase created (now e4fd11ffee)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master-http-pre-rebase in repository https://gitbox.apache.org/repos/asf/tinkerpop.git at e4fd11ffee Merge pull request #2669 No new revisions were added by this update.
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 ae9a5c42df7618c700d684386bb7ed57436e8a8d
Merge: 580cfa146e 7584e69f73
Author: Cole-Greer
AuthorDate: Tue Jun 11 13:22:20 2024 -0700
Merge branch '3.7-dev'
.../process/traversal/step/filter/SampleGlobalStep.java | 4
.../gremlin/process/traversal/step/map/SampleLocalStep.java | 4
gremlin-go/go.mod| 4 ++--
gremlin-go/go.sum| 8
.../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++--
5 files changed, 20 insertions(+), 12 deletions(-)
diff --cc gremlin-go/go.mod
index d073088c4d,3659929472..a1b8cfb5be
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -40,5 -40,6 +40,5 @@@ require
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
- golang.org/x/net v0.17.0 // indirect
+ golang.org/x/net v0.23.0 // indirect
- gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --cc
gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 8d31d2e0d2,345382c6e7..b5abbdde6c
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@@ -3982,2176 -3908,65 +3982,2176 @@@
"node": ">=10"
},
"funding": {
-"url": "https://github.com/chalk/wrap-ansi?sponsor=1;
+"url": "https://github.com/sponsors/sindresorhus;
}
},
-"node_modules/wrap-ansi/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz;,
- "integrity":
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+"node_modules/mocha/node_modules/glob": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz;,
+ "integrity":
"sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
"dev": true,
"dependencies": {
-"color-convert": "^2.0.1"
+"fs.realpath": "^1.0.0",
+"inflight": "^1.0.4",
+"inherits": "2",
+"minimatch": "^5.0.1",
+"once": "^1.3.0"
},
"engines": {
-"node": ">=8"
+"node": ">=12"
},
"funding": {
-"url": "https://github.com/chalk/ansi-styles?sponsor=1;
+"url": "https://github.com/sponsors/isaacs;
+ }
+},
+"node_modules/mocha/node_modules/js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz;,
+ "integrity":
"sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "dev": true,
+ "dependencies": {
+"argparse": "^2.0.1"
+ },
+ "bin": {
+"js-yaml": "bin/js-yaml.js"
+ }
+},
+"node_modules/mocha/node_modules/minimatch": {
+ "version": "5.0.1",
+ "resolved":
"https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz;,
+ "integrity":
"sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+ "dev": true,
+ "dependencies": {
+"brace-expansion": "^2.0.1"
+ },
+ "engines": {
+"node": ">=10"
+ }
+},
+"node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion":
{
+ "version": "2.0.1",
+ "resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz;,
+ "integrity":
"sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+"balanced-match": "^1.0.0"
+ }
+},
+"node_modules/mocha/node_modules/ms": {
+
(tinkerpop) branch master updated (580cfa146e -> ae9a5c42df)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 580cfa146e CTR Squashed docs/gremlint dependabots add 8623b2e05a adding getters for internal fields inside sample step. (#2649) add 16b871959d Bump github.com/gorilla/websocket from 1.5.1 to 1.5.2 in /gremlin-go (#2647) add 08dea3489a Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2577) add 7584e69f73 Merge branch '3.6-dev' into 3.7-dev new ae9a5c42df Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../process/traversal/step/filter/SampleGlobalStep.java | 4 .../gremlin/process/traversal/step/map/SampleLocalStep.java | 4 gremlin-go/go.mod| 4 ++-- gremlin-go/go.sum| 8 .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++-- 5 files changed, 20 insertions(+), 12 deletions(-)
(tinkerpop) branch 3.7-dev updated (8623b2e05a -> 7584e69f73)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 8623b2e05a adding getters for internal fields inside sample step. (#2649) add 16b871959d Bump github.com/gorilla/websocket from 1.5.1 to 1.5.2 in /gremlin-go (#2647) add 08dea3489a Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2577) new 7584e69f73 Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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
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) branch 3.6-dev updated: Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2577)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new 08dea3489a Bump ws in
/gremlin-javascript/src/main/javascript/gremlin-javascript (#2577)
08dea3489a is described below
commit 08dea3489aeb697f470f1c9093f8b719271849a9
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 11 13:12:29 2024 -0700
Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript
(#2577)
Bumps [ws](https://github.com/websockets/ws) from 8.16.0 to 8.17.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.16.0...8.17.0)
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 1f1dc77a8e..20f9151e51 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -3812,9 +3812,9 @@
"dev": true
},
"node_modules/ws": {
- "version": "8.16.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz;,
- "integrity":
"sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+ "version": "8.17.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz;,
+ "integrity":
"sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
"engines": {
"node": ">=10.0.0"
},
@@ -6762,9 +6762,9 @@
"dev": true
},
"ws": {
- "version": "8.16.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz;,
- "integrity":
"sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+ "version": "8.17.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz;,
+ "integrity":
"sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
"requires": {}
},
"xregexp": {
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/ws-8.17.0 deleted (was 938abe8739)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/ws-8.17.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 938abe8739 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/gorilla/websocket-1.5.2 deleted (was ac2b05864d)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/gorilla/websocket-1.5.2 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was ac2b05864d Bump github.com/gorilla/websocket from 1.5.1 to 1.5.2 in /gremlin-go The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (b43c90962a -> 16b871959d)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from b43c90962a CTR minor docs update add 16b871959d Bump github.com/gorilla/websocket from 1.5.1 to 1.5.2 in /gremlin-go (#2647) No new revisions were added by this update. Summary of changes: gremlin-go/go.mod | 4 ++-- gremlin-go/go.sum | 8 2 files changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch 3.7-dev updated: adding getters for internal fields inside sample step. (#2649)
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
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 8623b2e05a adding getters for internal fields inside sample step.
(#2649)
8623b2e05a is described below
commit 8623b2e05a483eb5a49fbb6a878ad8cfcf1a313c
Author: Prashant Upadhyay
AuthorDate: Tue Jun 11 13:10:37 2024 -0700
adding getters for internal fields inside sample step. (#2649)
---
.../gremlin/process/traversal/step/filter/SampleGlobalStep.java | 4
.../tinkerpop/gremlin/process/traversal/step/map/SampleLocalStep.java | 4
2 files changed, 8 insertions(+)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
index 20c8396a6b..82d566f4b2 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
@@ -52,6 +52,10 @@ public final class SampleGlobalStep extends
CollectingBarrierStep implemen
this.amountToSample = amountToSample;
}
+public int getAmountToSample() {
+return amountToSample;
+}
+
@Override
public void resetSeed(final long seed) {
random.setSeed(seed);
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SampleLocalStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SampleLocalStep.java
index 87a5ea4493..bce081d9ed 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SampleLocalStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SampleLocalStep.java
@@ -49,6 +49,10 @@ public final class SampleLocalStep extends
ScalarMapStep implements See
this.amountToSample = amountToSample;
}
+public int getAmountToSample() {
+return amountToSample;
+}
+
@Override
public void resetSeed(final long seed) {
this.random.setSeed(seed);
(tinkerpop) branch master updated: CTR Squashed docs/gremlint dependabots
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
The following commit(s) were added to refs/heads/master by this push:
new 580cfa146e CTR Squashed docs/gremlint dependabots
580cfa146e is described below
commit 580cfa146e438398262718a96aa4b90eaa4a2208
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 11 14:38:26 2024 +
CTR Squashed docs/gremlint dependabots
Bump prettier from 3.2.5 to 3.3.2 in /docs/gremlint
Bumps [prettier](https://github.com/prettier/prettier) from 3.2.5 to 3.3.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.2.5...3.3.2)
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Bump @types/node from 20.11.23 to 20.14.2 in /docs/gremlint
Bumps
[@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node)
from 20.11.23 to 20.14.2.
- [Release
notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
-
[Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
updated-dependencies:
- dependency-name: "@types/node"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
docs/gremlint/package-lock.json | 28 ++--
docs/gremlint/package.json | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/gremlint/package-lock.json b/docs/gremlint/package-lock.json
index 67f6ed5c3c..723c612217 100644
--- a/docs/gremlint/package-lock.json
+++ b/docs/gremlint/package-lock.json
@@ -25,12 +25,12 @@
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.4",
-"@types/node": "^20.11.23",
+"@types/node": "^20.14.2",
"@types/react": "^17.0.38",
"@types/react-dom": "^17.0.11",
"@types/styled-components": "^5.1.26",
"gh-pages": "^6.1.1",
-"prettier": "^3.2.5",
+"prettier": "^3.3.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
},
@@ -4544,9 +4544,9 @@
"integrity":
"sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
},
"node_modules/@types/node": {
- "version": "20.11.23",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.23.tgz;,
- "integrity":
"sha512-ZUarKKfQuRILSNYt32FuPL20HS7XwNT7/uRwSV8tiHWfyyVwDLYZNF6DZKc2bove++pgfsXn9sUwII/OsQ82cQ==",
+ "version": "20.14.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz;,
+ "integrity":
"sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
"dependencies": {
"undici-types": "~5.26.4"
}
@@ -15498,9 +15498,9 @@
}
},
"node_modules/prettier": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz;,
- "integrity":
"sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz;,
+ "integrity":
"sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
@@ -23357,9 +23357,9 @@
"integrity":
"sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
},
"@types/node": {
- "version": "20.11.23",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.23.tgz;,
- "integrity":
"sha512-ZUarKKfQuRILSNYt32FuPL20HS7XwNT7/uRwS
(tinkerpop) branch master updated (75a32d6efd -> 89aa5dbbf1)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 75a32d6efd CTR minor docs update add b43c90962a CTR minor docs update add ba70d5dc2a Merge branch '3.6-dev' into 3.7-dev new 89aa5dbbf1 Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/src/dev/developer/for-committers.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 89aa5dbbf1741a1992738717631e05a554b7c99a Merge: 75a32d6efd ba70d5dc2a Author: Cole-Greer AuthorDate: Tue Jun 11 10:00:15 2024 -0700 Merge branch '3.7-dev' docs/src/dev/developer/for-committers.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc docs/src/dev/developer/for-committers.asciidoc index 79825e1051,ac9281d0d5..aaf92442ca --- a/docs/src/dev/developer/for-committers.asciidoc +++ b/docs/src/dev/developer/for-committers.asciidoc @@@ -139,10 -139,10 +139,10 @@@ TinkerPop has several release branches * `3.2-dev` - 3.2.x (no longer maintained) * `3.3-dev` - 3.3.x (no longer maintained) * `3.4-dev` - 3.4.x (no longer maintained) - * `3.5-dev` - 3.5.x (non-breaking bug fixes and enhancements) + * `3.5-dev` - 3.5.x (no longer maintained) * `3.6-dev` - 3.6.x (non-breaking bug fixes and enhancements) * `3.7-dev` - 3.7.x (non-breaking bug fixes and enhancements) -* `master` - 4.x (current development) +* `master` - 4.x.x (current development) The branch description above that reads "non-breaking bug fixes and enhancements" simply means that within that release line (i.e. patch version) changes should not alter existing behavior, introduce new APIs, change serialization formats,
(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev
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) branch 3.7-dev updated (8d9f63ce4e -> ba70d5dc2a)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 8d9f63ce4e Merge pull request #2634 add b43c90962a CTR minor docs update new ba70d5dc2a Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/src/dev/developer/for-committers.asciidoc | 9 - 1 file changed, 4 insertions(+), 5 deletions(-)
(tinkerpop) branch 3.6-dev updated: CTR minor docs update
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/3.6-dev by this push: new b43c90962a CTR minor docs update b43c90962a is described below commit b43c90962a954ff607deb3d0057eaa911669f7e1 Author: Cole-Greer AuthorDate: Tue Jun 11 09:56:22 2024 -0700 CTR minor docs update --- docs/src/dev/developer/for-committers.asciidoc | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc index 12d2e3ea31..2b60ddd74e 100644 --- a/docs/src/dev/developer/for-committers.asciidoc +++ b/docs/src/dev/developer/for-committers.asciidoc @@ -139,10 +139,10 @@ TinkerPop has several release branches: * `3.2-dev` - 3.2.x (no longer maintained) * `3.3-dev` - 3.3.x (no longer maintained) * `3.4-dev` - 3.4.x (no longer maintained) -* `3.5-dev` - 3.5.x (non-breaking bug fixes and enhancements) +* `3.5-dev` - 3.5.x (no longer maintained) * `3.6-dev` - 3.6.x (non-breaking bug fixes and enhancements) -* `master` - 3.7.x (current development) -* `4.0-dev` - 4.0.x (future development) +* `3.7-dev` - 3.7.x (non-breaking bug fixes and enhancements) +* `master` - 4.x (current development) The branch description above that reads "non-breaking bug fixes and enhancements" simply means that within that release line (i.e. patch version) changes should not alter existing behavior, introduce new APIs, change serialization formats, @@ -152,8 +152,7 @@ client of one version within a release line can interact properly with a server it is likely an acceptable change within that branch. Changes to earlier branches should merge forward toward `master` (e.g. `3.6-dev` should merge to `master`). Please read -more about this process in the <> section. Note that `4.0-dev` is rebased on `master` -and currently behaves as a fresh repository as all 3.x content was removed. +more about this process in the <> section. As described in <>, it is possible to do a "partial" release which will utilize a four-digit version that starts with a "1" (e.g. `3.6.0.1`). The branching strategy for a partial release requires that a `-dev`
(tinkerpop) branch master updated: CTR minor docs update
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
The following commit(s) were added to refs/heads/master by this push:
new 75a32d6efd CTR minor docs update
75a32d6efd is described below
commit 75a32d6efd28dc1f75e00f2611b4b265fb84285c
Author: Cole-Greer
AuthorDate: Mon Jun 10 14:30:56 2024 -0700
CTR minor docs update
---
docs/src/dev/io/graphbinary.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/src/dev/io/graphbinary.asciidoc
b/docs/src/dev/io/graphbinary.asciidoc
index 410cc6f845..56fde6a0e6 100644
--- a/docs/src/dev/io/graphbinary.asciidoc
+++ b/docs/src/dev/io/graphbinary.asciidoc
@@ -470,7 +470,7 @@ Format: `{length}{value}`
Where:
-- `{length}` is an `Int`.
+- `{length}` is an `Int` describing the size of `{value}` in bytes.
- `{value}` is the two's complement of the `BigInteger`.
Example values of the two's complement `{value}`:
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 3409f4aec8cfc7dabd6aa13184acdb87f2405103
Merge: bac6c3b570 404ae62163
Author: Cole-Greer
AuthorDate: Wed Jun 5 12:08:22 2024 -0700
Merge branch '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-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 12573045af,1675be8610..8d31d2e0d2
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@@ -3680,2478 -3741,232 +3680,2478 @@@
"node": ">=8.0"
}
},
-"node_modules/tslib": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz;,
- "integrity":
"sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+"node_modules/lines-and-columns": {
+ "version": "1.2.4",
+ "resolved":
"https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz;,
+ "integrity":
"sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
"dev": true
},
-"node_modules/type": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz;,
- "integrity":
"sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+"node_modules/locate-path": {
+ "version": "6.0.0",
+ "resolved":
"https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz;,
+ "integrity":
"sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+ "dev": true,
+ "dependencies": {
+"p-locate": "^5.0.0"
+ },
+ "engines": {
+"node": ">=10"
+ },
+ "funding": {
+"url": "https://github.com/sponsors/sindresorhus;
+ }
+},
+"node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz;,
+ "integrity":
"sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
-"node_modules/type-check": {
- "version": "0.4.0",
- "resolved":
"https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz;,
- "integrity":
"sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+"node_modules/lodash.merge": {
+ "version": "4.6.2",
+ "resolved":
"https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz;,
+ "integrity":
"sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+ "dev": true
+},
+"node_modules/lodash.mergewith": {
+ "version": "4.6.2",
+ "resolved":
"https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz;,
+ "integrity":
"sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+ "dev": true
+},
+"node_modules/log-symbols": {
+ "version": "4.1.0",
+ "resolved":
"https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz;,
+ "integrity":
"sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
"dev": true,
"dependencies": {
-"prelude-ls": "^1.2.1"
+"chalk": "^4.1.0",
+"is-unicode-supported": "^0.1.0"
},
"engines": {
-"node": ">= 0.8.0"
+"node": ">=10"
+ },
+ "fund
(tinkerpop) branch master updated (bac6c3b570 -> 3409f4aec8)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from bac6c3b570 Merge branch '3.7-dev' add e22c798962 Bump prettier (#2643) add 9d64496ba2 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2530) add 0c5291b5fa Bump prettier from 3.2.4 to 3.3.1 in /gremlint (#2642) add a12ce294d2 Bump golang.org/x/text from 0.15.0 to 0.16.0 in /gremlin-go (#2637) add e12d6bdaa9 Bump @types/node from 20.11.10 to 20.14.2 in /gremlint (#2641) add 404ae62163 Merge branch '3.6-dev' into 3.7-dev new 3409f4aec8 Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-)
(tinkerpop) branch 3.7-dev updated (97fc494228 -> 404ae62163)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 97fc494228 TINKERPOP-3041 Consistent construction of SeedStrategy add e22c798962 Bump prettier (#2643) add 9d64496ba2 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2530) add 0c5291b5fa Bump prettier from 3.2.4 to 3.3.1 in /gremlint (#2642) add a12ce294d2 Bump golang.org/x/text from 0.15.0 to 0.16.0 in /gremlin-go (#2637) add e12d6bdaa9 Bump @types/node from 20.11.10 to 20.14.2 in /gremlint (#2641) new 404ae62163 Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-)
(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev
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) branch dependabot/npm_and_yarn/gremlint/3.6-dev/prettier-3.3.1 deleted (was 5d8674cc9e)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlint/3.6-dev/prettier-3.3.1 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 5d8674cc9e Bump prettier from 3.2.4 to 3.3.1 in /gremlint The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (e22c798962 -> 9d64496ba2)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from e22c798962 Bump prettier (#2643) add 9d64496ba2 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2530) No new revisions were added by this update. Summary of changes: .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/mocha-10.4.0 deleted (was 1c6e4a0607)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/mocha-10.4.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 1c6e4a0607 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/npm_and_yarn/gremlint/3.6-dev/types/node-20.14.2 deleted (was 4585099b1a)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlint/3.6-dev/types/node-20.14.2 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 4585099b1a Bump @types/node from 20.11.10 to 20.14.2 in /gremlint The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated: Bump @types/node from 20.11.10 to 20.14.2 in /gremlint (#2641)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new e12d6bdaa9 Bump @types/node from 20.11.10 to 20.14.2 in /gremlint
(#2641)
e12d6bdaa9 is described below
commit e12d6bdaa944897c840dc28ba9a08a2ff03ff71b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 5 11:56:33 2024 -0700
Bump @types/node from 20.11.10 to 20.14.2 in /gremlint (#2641)
Bumps
[@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node)
from 20.11.10 to 20.14.2.
- [Release
notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
-
[Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
updated-dependencies:
- dependency-name: "@types/node"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
gremlint/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gremlint/package-lock.json b/gremlint/package-lock.json
index 37306a46b1..e8746e3aa8 100644
--- a/gremlint/package-lock.json
+++ b/gremlint/package-lock.json
@@ -968,9 +968,9 @@
}
},
"node_modules/@types/node": {
- "version": "20.11.10",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz;,
- "integrity":
"sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
+ "version": "20.14.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz;,
+ "integrity":
"sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
@@ -7004,9 +7004,9 @@
}
},
"@types/node": {
- "version": "20.11.10",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz;,
- "integrity":
"sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
+ "version": "20.14.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz;,
+ "integrity":
"sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
"dev": true,
"requires": {
"undici-types": "~5.26.4"
(tinkerpop) branch dependabot/go_modules/gremlin-go/3.6-dev/golang.org/x/text-0.16.0 deleted (was 347dd4c501)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/go_modules/gremlin-go/3.6-dev/golang.org/x/text-0.16.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 347dd4c501 Bump golang.org/x/text from 0.15.0 to 0.16.0 in /gremlin-go The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (0c5291b5fa -> a12ce294d2)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 0c5291b5fa Bump prettier from 3.2.4 to 3.3.1 in /gremlint (#2642) add a12ce294d2 Bump golang.org/x/text from 0.15.0 to 0.16.0 in /gremlin-go (#2637) No new revisions were added by this update. Summary of changes: gremlin-go/go.mod | 2 +- gremlin-go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(tinkerpop) branch 3.6-dev updated (9d64496ba2 -> 0c5291b5fa)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 9d64496ba2 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2530) add 0c5291b5fa Bump prettier from 3.2.4 to 3.3.1 in /gremlint (#2642) No new revisions were added by this update. Summary of changes: gremlint/package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/prettier-3.3.1 deleted (was ffc39af77a)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/prettier-3.3.1 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was ffc39af77a Bump prettier The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (9341370c21 -> e22c798962)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 9341370c21 Merge branch 'dependabot/nuget/gremlin-dotnet/3.6-dev/xunit.runner.visualstudio-2.8.1' into 3.6-dev add e22c798962 Bump prettier (#2643) No new revisions were added by this update. Summary of changes: .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch master updated: Disable LazyBarrierStrategy for failing JDK8 test (#2536)
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
The following commit(s) were added to refs/heads/master by this push:
new b0c4a7d57f Disable LazyBarrierStrategy for failing JDK8 test (#2536)
b0c4a7d57f is described below
commit b0c4a7d57f733028b0b8dad2b8b77ec77b4cf5c4
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Fri Apr 5 11:51:25 2024 -0700
Disable LazyBarrierStrategy for failing JDK8 test (#2536)
---
gremlin-dotnet/build/generate.groovy | 14 --
.../Gherkin/GherkinTestRunner.cs | 3 ++-
.../test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs| 2 +-
gremlin-go/build/generate.groovy | 11 ++-
gremlin-go/driver/cucumber/gremlin.go | 2 +-
.../gremlin-javascript/test/cucumber/feature-steps.js | 1 +
.../javascript/gremlin-javascript/test/cucumber/gremlin.js | 2 +-
gremlin-python/src/main/python/radish/feature_steps.py | 3 ++-
gremlin-python/src/main/python/radish/gremlin.py | 2 +-
.../tinkerpop/gremlin/test/features/map/Select.feature | 7 ---
.../gremlin/tinkergraph/TinkerGraphFeatureTest.java| 3 ++-
11 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/gremlin-dotnet/build/generate.groovy
b/gremlin-dotnet/build/generate.groovy
index ca19e50e1d..4db65801bf 100644
--- a/gremlin-dotnet/build/generate.groovy
+++ b/gremlin-dotnet/build/generate.groovy
@@ -17,15 +17,15 @@
* under the License.
*/
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph
-import
org.apache.tinkerpop.gremlin.process.traversal.translator.DotNetTranslator
+
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine
+import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCustomizer
import
org.apache.tinkerpop.gremlin.groovy.jsr223.ast.AmbiguousMethodASTTransformation
-import
org.apache.tinkerpop.gremlin.groovy.jsr223.ast.VarAsBindingASTTransformation
import
org.apache.tinkerpop.gremlin.groovy.jsr223.ast.RepeatASTTransformationCustomizer
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCustomizer
-import org.codehaus.groovy.control.customizers.CompilationCustomizer
+import
org.apache.tinkerpop.gremlin.groovy.jsr223.ast.VarAsBindingASTTransformation
import org.apache.tinkerpop.gremlin.language.corpus.FeatureReader
+import
org.apache.tinkerpop.gremlin.process.traversal.translator.DotNetTranslator
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph
import javax.script.SimpleBindings
import java.nio.file.Paths
@@ -127,7 +127,9 @@ radishGremlinFile.withWriter('UTF-8') { Writer writer ->
// Groovy can't process certain null oriented calls because it gets
confused with the right overload to call
// at runtime. using this approach for now as these are the only such
situations encountered so far. a better
// solution may become necessary as testing of nulls expands.
-def staticTranslate = [g_withoutStrategiesXCountStrategyX_V_count: "
{\"g_withoutStrategiesXCountStrategyX_V_count\", new
List, ITraversal>>
{(g,p) =>g.WithoutStrategies(typeof(CountStrategy)).V().Count()}}, "]
+def staticTranslate = [g_withoutStrategiesXCountStrategyX_V_count: "
{\"g_withoutStrategiesXCountStrategyX_V_count\", new
List, ITraversal>>
{(g,p) =>g.WithoutStrategies(typeof(CountStrategy)).V().Count()}}, ",
+
g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX:
"
{\"g_withoutStrategiesXLazyBarrierStrategyX_V_asXlabelX_aggregateXlocal_xX_selectXxX_selectXlabelX\",
new List, ITraversal>>
{(g,p)
=>g.WithoutStrategies(typeof(LazyBarrierStrategy)).V().As(\"label\").Aggregate(Scope.Local,\"x\").Select(\"x\").Select(\"label\")}},
"
+]
// SAMPLE: g_injectXnull_nullX: " {\"g_injectXnull_nullX\",
new List, ITraversal>>
{(g,p) =>g.Inject(null,null)}},
",1\"]).Values(\"age\").Inject(null,null)}}, "
gremlins.each { k,v ->
diff --git
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index f9c761c575..12c47a0918 100644
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -50,7 +50,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
// Add here the name of scenarios to ignore and the reason,
e.g.:
{"g_withStrategiesXProductive
(tinkerpop) branch master updated (2dbdd31039 -> 8b51edae3f)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 2dbdd31039 Merge branch '3.7-dev' add 7776458585 Allow aliased client to pass along options (#2524) add 0b8b7ec4c5 Temporary fix to failing JDK8 test (#2529) add c5c9baa86b Merge branch '3.6-dev' into 3.7-dev new 8b51edae3f Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-) create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 8b51edae3f858e518dbaa3b2ffd348bc82cee593 Merge: 2dbdd31039 c5c9baa86b Author: Cole-Greer AuthorDate: Mon Mar 25 15:53:02 2024 -0700 Merge branch '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(-)
(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev
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 stat
(tinkerpop) branch 3.7-dev updated (e39ef4fcce -> c5c9baa86b)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from e39ef4fcce Merge branch '3.6-dev' into 3.7-dev add 7776458585 Allow aliased client to pass along options (#2524) add 0b8b7ec4c5 Temporary fix to failing JDK8 test (#2529) new c5c9baa86b Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-) create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ClientWithOptionsIntegrateTest.java
(tinkerpop) branch 3.6-dev updated: Temporary fix to failing JDK8 test (#2529)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new 0b8b7ec4c5 Temporary fix to failing JDK8 test (#2529)
0b8b7ec4c5 is described below
commit 0b8b7ec4c5b57095f16464565e86c8f00c1f274f
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Mon Mar 25 15:17:36 2024 -0700
Temporary fix to failing JDK8 test (#2529)
A new SelectStep test is failing in JDK8 tests due to a difference in
hashing between Java 8 and 11. In Java 8, the hash used to identify the
traverser to be removed from the no-op barrier is recomputed at removal, and
can't find a match due to other traversal branches having added vertices to the
bulkset, thus changing its potential hash value. Java 11 simply uses the hash
field stored at creation instead of recomputing it which avoids this problem.
This additional barrier step is a temporary fix that helps the query wait
until all the vertices have been added to the bulkset before adding traversals
to the no-op barrier so that hashing stays consistent.
---
.../org/apache/tinkerpop/gremlin/test/features/map/Select.feature | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
index b2f8ef8dc5..6229fa1935 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
@@ -906,7 +906,7 @@ Feature: Step - select()
Given the modern graph
And the traversal of
"""
- g.V().as("label").aggregate(local,"x").select("x").select("label")
+
g.V().as("label").aggregate(local,"x").barrier().select("x").select("label")
"""
When iterated to list
Then the result should be unordered
(tinkerpop) branch 3.6-dev updated: Allow aliased client to pass along options (#2524)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new 7776458585 Allow aliased client to pass along options (#2524)
7776458585 is described below
commit 777645858590475b8d612d6c1d4cdf63443cde3b
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Mon Mar 25 15:16:59 2024 -0700
Allow aliased client to pass along options (#2524)
Refactored DriverRemoteConnection.getRequestOptions() to be a public static
method in RequestOptions so that Client.submitAsync() can get and pass along
options with it. This fixes the issue where aliased clients submitting
traversals containing with() configurations would ignore sending these options
as part of the request in https://issues.apache.org/jira/browse/TINKERPOP-3039.
---
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/driver/Client.java| 9 ++-
.../tinkerpop/gremlin/driver/RequestOptions.java | 27 +++
.../driver/remote/DriverRemoteConnection.java | 28 +--
.../driver/remote/DriverRemoteConnectionTest.java | 5 +-
.../server/ClientWithOptionsIntegrateTest.java | 87 ++
6 files changed, 124 insertions(+), 33 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index eceb847c17..a41951c2c1 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -37,6 +37,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in `EarlyLimitStrategy` which was too aggressive when promoting
`limit()` before `map()`.
* Prevented mid-traversal `mergeE()` and `mergeV()` from operating on an
incoming `Traverser` that contains an `Element`.
* Improved performance of the application of `FilterRankingStrategy` for large
traversals with deeply nested traversals by improving the cache operation.
+* Updated aliased client to pass along options via `with()` when submitting
traversals.
[[release-3-6-6]]
=== TinkerPop 3.6.6 (November 20, 2023)
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 513ec92096..415edde664 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -19,8 +19,6 @@
package org.apache.tinkerpop.gremlin.driver;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
@@ -30,6 +28,8 @@ import
org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLException;
import java.net.ConnectException;
@@ -51,7 +51,8 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+
+import static
org.apache.tinkerpop.gremlin.driver.RequestOptions.getRequestOptions;
/**
* A {@code Client} is constructed from a {@link Cluster} and represents a way
to send messages to Gremlin Server.
@@ -642,7 +643,7 @@ public abstract class Client {
@Override
public CompletableFuture submitAsync(final Bytecode
bytecode) {
-return submitAsync(bytecode, RequestOptions.EMPTY);
+return submitAsync(bytecode, getRequestOptions(bytecode));
}
@Override
diff --git
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
index ac923f99ed..cd5c2b68e0 100644
---
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
@@ -19,12 +19,21 @@
package org.apache.tinkerpop.gremlin.driver;
import org.apache.tinkerpop.gremlin.driver.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;
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 2dbdd310391482effba77ea750a547b9520fdf5a Merge: 3015f37043 e39ef4fcce Author: Cole-Greer AuthorDate: Fri Mar 22 14:00:01 2024 -0700 Merge branch '3.7-dev' CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(tinkerpop) branch master updated (3015f37043 -> 2dbdd31039)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 3015f37043 TINKERPOP-3056 Consistently promoting matched/created edge/vertex add dd7cb24669 CTR touchup docs and comments add e39ef4fcce Merge branch '3.6-dev' into 3.7-dev new 2dbdd31039 Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(tinkerpop) branch 3.7-dev updated (20443b0d7b -> e39ef4fcce)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 20443b0d7b Merge branch '3.6-dev' into 3.7-dev add dd7cb24669 CTR touchup docs and comments new e39ef4fcce Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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
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) branch 3.6-dev updated: CTR touchup docs and comments
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new dd7cb24669 CTR touchup docs and comments
dd7cb24669 is described below
commit dd7cb2466986b9a2665ee6f3bdc917e76c9f691e
Author: Cole-Greer
AuthorDate: Fri Mar 22 13:57:16 2024 -0700
CTR touchup docs and comments
---
CHANGELOG.asciidoc| 2 +-
.../tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b813d15ae7..eceb847c17 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,7 +29,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in bytecode translation of `g.tx().commit()` and
`g.tx().rollback()` in all languages.
* Improved error message from `JavaTranslator` by including exception source.
* Added missing `short` serialization (`gx:Int16`) to GraphSONV2 and
GraphSONV3 in `gremlin-python`.
-* Added tests for error handling for GLV's if `tx.commit()`` is called
remotely for graphs without transactions support.
+* Added tests for error handling for GLV's if `tx.commit()` is called remotely
for graphs without transactions support.
* Introduced multi-architecture AMD64/ARM64 docker images for gremlin-console.
* Fixed bug in `JavaTranslator` where `has(String, null)` could call
`has(String, Traversal)` to generate an error.
* Fixed issue where server errors weren't being properly parsed when sending
bytecode over HTTP.
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
index 132adf3e7c..70eca71f64 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
@@ -93,10 +93,10 @@ public class MergeVertexStep extends MergeStep {
// attach the onMatch properties
vertices = IteratorUtils.peek(vertices, v -> {
-// override current traverser with the matched Edge so that
the option() traversal can operate
+// override current traverser with the matched Vertex so that
the option() traversal can operate
// on it properly. this should only work this way for the
start step form to retain the original
// behavior for 3.6.0 where you might do
g.inject(Map).mergeV() and want that Map to pass through.
-// in 4.x this will be rectified such that the edge will
always be promoted and you will be forced
+// in 4.x this will be rectified such that the vertex will
always be promoted and you will be forced
// to select() the map if you did want the behavior.
if (isStart) traverser.set((S) v);
(tinkerpop) branch master updated: CTR add missing require to gremlin-js SetSerializer
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
The following commit(s) were added to refs/heads/master by this push:
new 6bd2c92f63 CTR add missing require to gremlin-js SetSerializer
6bd2c92f63 is described below
commit 6bd2c92f6366b3645af82ad0aff485a0c01832cc
Author: Cole-Greer
AuthorDate: Wed Mar 6 09:27:47 2024 -0800
CTR add missing require to gremlin-js SetSerializer
---
.../lib/structure/io/binary/internals/SetSerializer.js | 1 +
1 file changed, 1 insertion(+)
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
index 6cbcce44dc..221a77a978 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/SetSerializer.js
@@ -22,6 +22,7 @@
*/
'use strict';
+const { Buffer } = require('buffer');
module.exports = class SetSerializer {
constructor(ioc, ID) {
this.ioc = ioc;
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 f3c551f538e92be5f3b995685529633b0683c374
Merge: 615027de37 4e99e77f6a
Author: Cole-Greer
AuthorDate: Wed Mar 6 08:26:38 2024 -0800
Merge branch '3.7-dev'
gremlin-javascript/examples/browser/.gitignore | 32 +
gremlin-javascript/examples/browser/.yarnrc.yml|1 +
gremlin-javascript/examples/browser/index.css | 30 +
gremlin-javascript/examples/browser/index.html | 32 +
gremlin-javascript/examples/browser/index.js | 92 ++
gremlin-javascript/examples/browser/package.json | 22 +
gremlin-javascript/examples/browser/utils.js | 74 +
gremlin-javascript/examples/browser/yarn.lock | 1498
gremlin-javascript/examples/{ => node}/.gitignore |0
.../examples/{ => node}/basic-gremlin.js |0
.../examples/{ => node}/connections.js |0
.../examples/{ => node}/modern-traversals.js |0
.../examples/{ => node}/package-lock.json |0
.../examples/{ => node}/package.json |0
.../javascript/gremlin-javascript/.eslintrc.js |7 +-
.../src/main/javascript/gremlin-javascript/.nvmrc |1 +
.../main/javascript/gremlin-javascript/README.md |2 +-
.../driver/auth/mechanisms/sasl-mechanism-plain.js |1 +
.../gremlin-javascript/lib/driver/client.js|3 -
.../gremlin-javascript/lib/driver/connection.js| 196 ++-
.../lib/driver/driver-remote-connection.js |3 -
.../gremlin-javascript/lib/driver/result-set.js|9 -
.../structure/io/binary/internals/AnySerializer.js |2 +
.../io/binary/internals/ArraySerializer.js |2 +
.../io/binary/internals/BigIntegerSerializer.js|2 +
.../io/binary/internals/BooleanSerializer.js |2 +
.../io/binary/internals/BulkSetSerializer.js |2 +
.../io/binary/internals/ByteBufferSerializer.js|2 +
.../io/binary/internals/ByteSerializer.js |2 +
.../io/binary/internals/BytecodeSerializer.js |1 +
.../io/binary/internals/DateSerializer.js |2 +
.../io/binary/internals/DoubleSerializer.js|2 +
.../io/binary/internals/EdgeSerializer.js |1 +
.../io/binary/internals/EnumSerializer.js |1 +
.../io/binary/internals/FloatSerializer.js |2 +
.../io/binary/internals/GraphBinaryReader.js |2 +
.../io/binary/internals/GraphBinaryWriter.js |2 +
.../structure/io/binary/internals/IntSerializer.js |2 +
.../io/binary/internals/LambdaSerializer.js|1 +
.../io/binary/internals/LongSerializer.js |2 +
.../io/binary/internals/LongSerializerNg.js|2 +
.../structure/io/binary/internals/MapSerializer.js |2 +
.../structure/io/binary/internals/PSerializer.js |1 +
.../io/binary/internals/PathSerializer.js |1 +
.../io/binary/internals/PropertySerializer.js |1 +
.../io/binary/internals/ShortSerializer.js |2 +
.../io/binary/internals/StringSerializer.js|2 +
.../io/binary/internals/TextPSerializer.js |1 +
.../internals/TraversalStrategySerializer.js |2 +
.../io/binary/internals/TraverserSerializer.js |1 +
.../binary/internals/UnspecifiedNullSerializer.js |2 +
.../io/binary/internals/UuidSerializer.js |2 +
.../binary/internals/VertexPropertySerializer.js |1 +
.../io/binary/internals/VertexSerializer.js|1 +
.../lib/structure/io/binary/internals/utils.js |2 +
.../lib/structure/io/graph-serializer.js |1 +
.../javascript/gremlin-javascript/lib/utils.js | 67 +-
.../gremlin-javascript/package-lock.json | 218 ++-
.../javascript/gremlin-javascript/package.json |6 +-
.../test/integration/client-behavior-tests.js |2 +-
.../test/integration/traversal-test.js |2 +-
.../test/unit/result-set-test.js | 17 +-
pom.xml|4 +
63 files changed, 2196 insertions(+), 179 deletions(-)
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
index 1a568e5377,bf5fc3f8a7..bb5b58751a
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
@@@ -23,10 -23,9 +23,9 @@@
*/
'use strict';
- const crypto = require('crypto');
- const os = require('os');
+ const uuid = require('uuid');
-const gremlinVersion = '3.7.2-SNAPSHOT'; // DO NOT MODIFY - Configured
automatically by Maven Replacer Plugin
+const gremlinVersion = '4.0.0-SNAPSHOT'; // DO NOT MODIFY - Configured
automatically by Maven Replacer Plugin
exports.toLong = function toLong(value) {
return new
(tinkerpop) branch master updated (615027de37 -> f3c551f538)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 615027de37 Merge branch '3.7-dev'
add 4e99e77f6a feat: `gremlin.js` browser support (#2506)
new f3c551f538 Merge branch '3.7-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gremlin-javascript/examples/browser/.gitignore | 32 +
gremlin-javascript/examples/browser/.yarnrc.yml|1 +
.../examples/browser/index.css | 15 +-
.../examples/browser/index.html| 28 +-
gremlin-javascript/examples/browser/index.js | 92 ++
gremlin-javascript/examples/browser/package.json | 22 +
gremlin-javascript/examples/browser/utils.js | 74 +
gremlin-javascript/examples/browser/yarn.lock | 1498
gremlin-javascript/examples/{ => node}/.gitignore |0
.../examples/{ => node}/basic-gremlin.js |0
.../examples/{ => node}/connections.js |0
.../examples/{ => node}/modern-traversals.js |0
.../examples/{ => node}/package-lock.json |0
.../examples/{ => node}/package.json |0
.../javascript/gremlin-javascript/.eslintrc.js |7 +-
.../src/main/javascript/gremlin-javascript/.nvmrc |1 +
.../main/javascript/gremlin-javascript/README.md |2 +-
.../driver/auth/mechanisms/sasl-mechanism-plain.js |1 +
.../gremlin-javascript/lib/driver/client.js|3 -
.../gremlin-javascript/lib/driver/connection.js| 196 ++-
.../lib/driver/driver-remote-connection.js |3 -
.../gremlin-javascript/lib/driver/result-set.js|9 -
.../structure/io/binary/internals/AnySerializer.js |2 +
.../io/binary/internals/ArraySerializer.js |2 +
.../io/binary/internals/BigIntegerSerializer.js|2 +
.../io/binary/internals/BooleanSerializer.js |2 +
.../io/binary/internals/BulkSetSerializer.js |2 +
.../io/binary/internals/ByteBufferSerializer.js|2 +
.../io/binary/internals/ByteSerializer.js |2 +
.../io/binary/internals/BytecodeSerializer.js |1 +
.../io/binary/internals/DateSerializer.js |2 +
.../io/binary/internals/DoubleSerializer.js|2 +
.../io/binary/internals/EdgeSerializer.js |1 +
.../io/binary/internals/EnumSerializer.js |1 +
.../io/binary/internals/FloatSerializer.js |2 +
.../io/binary/internals/GraphBinaryReader.js |2 +
.../io/binary/internals/GraphBinaryWriter.js |2 +
.../structure/io/binary/internals/IntSerializer.js |2 +
.../io/binary/internals/LambdaSerializer.js|1 +
.../io/binary/internals/LongSerializer.js |2 +
.../io/binary/internals/LongSerializerNg.js|2 +
.../structure/io/binary/internals/MapSerializer.js |2 +
.../structure/io/binary/internals/PSerializer.js |1 +
.../io/binary/internals/PathSerializer.js |1 +
.../io/binary/internals/PropertySerializer.js |1 +
.../io/binary/internals/ShortSerializer.js |2 +
.../io/binary/internals/StringSerializer.js|2 +
.../io/binary/internals/TextPSerializer.js |1 +
.../internals/TraversalStrategySerializer.js |2 +
.../io/binary/internals/TraverserSerializer.js |1 +
.../binary/internals/UnspecifiedNullSerializer.js |2 +
.../io/binary/internals/UuidSerializer.js |2 +
.../binary/internals/VertexPropertySerializer.js |1 +
.../io/binary/internals/VertexSerializer.js|1 +
.../lib/structure/io/binary/internals/utils.js |2 +
.../lib/structure/io/graph-serializer.js |1 +
.../javascript/gremlin-javascript/lib/utils.js | 67 +-
.../gremlin-javascript/package-lock.json | 218 ++-
.../javascript/gremlin-javascript/package.json |6 +-
.../test/integration/client-behavior-tests.js |2 +-
.../test/integration/traversal-test.js |2 +-
.../test/unit/result-set-test.js | 17 +-
pom.xml|4 +
63 files changed, 2158 insertions(+), 198 deletions(-)
create mode 100644 gremlin-javascript/examples/browser/.gitignore
create mode 100644 gremlin-javascript/examples/browser/.yarnrc.yml
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/wrapped/WrappedVariables.java
=> gremlin-javascript/examples/browser/index.css (79%)
copy gremlin-go/driver/resources/resources.go =>
gremlin-javascript/examples/browser/index.html (67%)
create mode 100644 gremlin-javascript/examples/
(tinkerpop) branch 3.7-dev updated: feat: `gremlin.js` browser support (#2506)
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
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 4e99e77f6a feat: `gremlin.js` browser support (#2506)
4e99e77f6a is described below
commit 4e99e77f6a7bf91037d6fa310c4bc64eb4ee87b4
Author: Tiến Nguyễn Khắc
AuthorDate: Thu Mar 7 05:24:23 2024 +1300
feat: `gremlin.js` browser support (#2506)
- Replace node APIs that have cross runtime equivalent
- For those that can't be replaced, use `node:` prefix so that environment
that does polyfill automatically can easily do so
- Remove manual ping/pong logic, this is already handled internally by
browser or `ws` library
---
gremlin-javascript/examples/browser/.gitignore | 32 +
gremlin-javascript/examples/browser/.yarnrc.yml|1 +
gremlin-javascript/examples/browser/index.css | 30 +
gremlin-javascript/examples/browser/index.html | 32 +
gremlin-javascript/examples/browser/index.js | 92 ++
gremlin-javascript/examples/browser/package.json | 22 +
gremlin-javascript/examples/browser/utils.js | 74 +
gremlin-javascript/examples/browser/yarn.lock | 1498
gremlin-javascript/examples/{ => node}/.gitignore |0
.../examples/{ => node}/basic-gremlin.js |0
.../examples/{ => node}/connections.js |0
.../examples/{ => node}/modern-traversals.js |0
.../examples/{ => node}/package-lock.json |0
.../examples/{ => node}/package.json |0
.../javascript/gremlin-javascript/.eslintrc.js |7 +-
.../src/main/javascript/gremlin-javascript/.nvmrc |1 +
.../main/javascript/gremlin-javascript/README.md |2 +-
.../driver/auth/mechanisms/sasl-mechanism-plain.js |1 +
.../gremlin-javascript/lib/driver/client.js|3 -
.../gremlin-javascript/lib/driver/connection.js| 196 ++-
.../lib/driver/driver-remote-connection.js |3 -
.../gremlin-javascript/lib/driver/result-set.js|9 -
.../structure/io/binary/internals/AnySerializer.js |2 +
.../io/binary/internals/ArraySerializer.js |2 +
.../io/binary/internals/BigIntegerSerializer.js|2 +
.../io/binary/internals/BooleanSerializer.js |2 +
.../io/binary/internals/BulkSetSerializer.js |2 +
.../io/binary/internals/ByteBufferSerializer.js|2 +
.../io/binary/internals/ByteSerializer.js |2 +
.../io/binary/internals/BytecodeSerializer.js |1 +
.../io/binary/internals/DateSerializer.js |2 +
.../io/binary/internals/DoubleSerializer.js|2 +
.../io/binary/internals/EdgeSerializer.js |1 +
.../io/binary/internals/EnumSerializer.js |1 +
.../io/binary/internals/FloatSerializer.js |2 +
.../io/binary/internals/GraphBinaryReader.js |2 +
.../io/binary/internals/GraphBinaryWriter.js |2 +
.../structure/io/binary/internals/IntSerializer.js |2 +
.../io/binary/internals/LambdaSerializer.js|1 +
.../io/binary/internals/LongSerializer.js |2 +
.../io/binary/internals/LongSerializerNg.js|2 +
.../structure/io/binary/internals/MapSerializer.js |2 +
.../structure/io/binary/internals/PSerializer.js |1 +
.../io/binary/internals/PathSerializer.js |1 +
.../io/binary/internals/PropertySerializer.js |1 +
.../io/binary/internals/ShortSerializer.js |2 +
.../io/binary/internals/StringSerializer.js|2 +
.../io/binary/internals/TextPSerializer.js |1 +
.../internals/TraversalStrategySerializer.js |2 +
.../io/binary/internals/TraverserSerializer.js |1 +
.../binary/internals/UnspecifiedNullSerializer.js |2 +
.../io/binary/internals/UuidSerializer.js |2 +
.../binary/internals/VertexPropertySerializer.js |1 +
.../io/binary/internals/VertexSerializer.js|1 +
.../lib/structure/io/binary/internals/utils.js |2 +
.../lib/structure/io/graph-serializer.js |1 +
.../javascript/gremlin-javascript/lib/utils.js | 67 +-
.../gremlin-javascript/package-lock.json | 218 ++-
.../javascript/gremlin-javascript/package.json |6 +-
.../test/integration/client-behavior-tests.js |2 +-
.../test/integration/traversal-test.js |2 +-
.../test/unit/result-set-test.js | 17 +-
pom.xml|4 +
63 files changed, 2196 insertions(+), 179 deletions(-)
diff --git a/gremlin-javascript/examples/browser/.gitignore
b/gremlin-javascript/examples/browser/.gitignore
new file mode 100644
index 00..1839250265
--- /dev/null
+++ b/gremlin-javascript/examples/browser/.gitignore
@@ -0,0 +1,32 @@
+# Logs
(tinkerpop) branch master updated (77e4f71647 -> 03e9f24f06)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 77e4f71647 Merge branch '3.7-dev' add 1efe40b288 TINKERPOP-3054 Fix requestId Deserialization in `gremlin-python` (#2494) add cc9b3cf02c Merge branch '3.6-dev' into 3.7-dev new 03e9f24f06 Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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.7-dev'
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 03e9f24f062c507ed665c5700a90235249e652a9 Merge: 77e4f71647 cc9b3cf02c Author: Cole-Greer AuthorDate: Thu Feb 29 09:02:27 2024 -0800 Merge branch '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
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) branch 3.7-dev updated (88acbad25a -> cc9b3cf02c)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 88acbad25a Change edge weights to double in feature tests (#2503) add 1efe40b288 TINKERPOP-3054 Fix requestId Deserialization in `gremlin-python` (#2494) new cc9b3cf02c Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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) branch 3.6-dev updated (3166f1b347 -> 1efe40b288)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 3166f1b347 Bump github.com/nicksnyder/go-i18n/v2 from 2.3.0 to 2.4.0 in /gremlin-go (#2469) add 1efe40b288 TINKERPOP-3054 Fix requestId Deserialization in `gremlin-python` (#2494) No new revisions were added by this update. Summary of changes: 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) branch master updated (83e66fdc5a -> 77e4f71647)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 83e66fdc5a Merge branch '3.7-dev' add 3976dbf884 Add true case tests for checkAdjacentVertices configuration (#2502) add 88acbad25a Change edge weights to double in feature tests (#2503) new 77e4f71647 Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 28 ++- gremlin-go/driver/cucumber/gremlin.go | 28 ++- .../gremlin-javascript/test/cucumber/gremlin.js| 28 ++- gremlin-python/src/main/python/radish/gremlin.py | 28 ++- .../features/integrated/PartitionStrategy.feature | 56 +++--- .../features/integrated/SubgraphStrategy.feature | 32 - .../gremlin/test/features/map/MergeEdge.feature| 2 +- 7 files changed, 120 insertions(+), 82 deletions(-)
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 77e4f716474b802b06f1de37427b18baf63dfc9c Merge: 83e66fdc5a 88acbad25a Author: Cole-Greer AuthorDate: Thu Feb 29 08:40:31 2024 -0800 Merge branch '3.7-dev' .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 28 ++- gremlin-go/driver/cucumber/gremlin.go | 28 ++- .../gremlin-javascript/test/cucumber/gremlin.js| 28 ++- gremlin-python/src/main/python/radish/gremlin.py | 28 ++- .../features/integrated/PartitionStrategy.feature | 56 +++--- .../features/integrated/SubgraphStrategy.feature | 32 - .../gremlin/test/features/map/MergeEdge.feature| 2 +- 7 files changed, 120 insertions(+), 82 deletions(-)
(tinkerpop) branch 3.7-dev updated: Change edge weights to double in feature tests (#2503)
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
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 88acbad25a Change edge weights to double in feature tests (#2503)
88acbad25a is described below
commit 88acbad25a4f07fbc28bf761a09def3d5805c562
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Thu Feb 29 08:31:42 2024 -0800
Change edge weights to double in feature tests (#2503)
https://issues.apache.org/jira/browse/TINKERPOP-3020 Updated all edge
weights to use type double in PartitionStrategy and SideEffect feature tests.
---
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 26 +-
gremlin-go/driver/cucumber/gremlin.go | 26 +-
.../gremlin-javascript/test/cucumber/gremlin.js| 26 +-
gremlin-python/src/main/python/radish/gremlin.py | 26 +-
.../features/integrated/PartitionStrategy.feature | 56 +++---
.../gremlin/test/features/map/MergeEdge.feature| 2 +-
6 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index fd96bdc6ea..d99f0d1672 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -399,18 +399,18 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name",
new List, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"),
(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false,
partitionKey: "_partition", readPartitions: new HashSet {"a"},
writePartition: "a")).V().Values("na [...]
{"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name", new
List, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"),
(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false,
partitionKey: "_partition", readPartitions: new HashSet {"a", "b"},
writePartition: "a")).V().Values, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"),
(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false,
partitionKey: "_partition", readPartitions: new HashSet {"c"},
writePartition: "a")).V().Values("na [...]
-
{"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight", new
List, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2),
(g,p) => [...]
-
{"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight", new
List, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2),
(g,p) => [...]
-
{"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight",
new List, ITraversal>>
{(g,p)
=>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV(&q
(tinkerpop) branch 3.7-dev updated: Add true case tests for checkAdjacentVertices configuration (#2502)
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
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 3976dbf884 Add true case tests for checkAdjacentVertices configuration
(#2502)
3976dbf884 is described below
commit 3976dbf88446969be4f40d213a02b72d1324888a
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Thu Feb 29 08:31:14 2024 -0800
Add true case tests for checkAdjacentVertices configuration (#2502)
https://issues.apache.org/jira/browse/TINKERPOP-3026 Added tests to cover
checkAdjacentVertices = true in SubgraphStrategy configuration.
---
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 2 ++
gremlin-go/driver/cucumber/gremlin.go | 2 ++
.../gremlin-javascript/test/cucumber/gremlin.js| 2 ++
gremlin-python/src/main/python/radish/gremlin.py | 2 ++
.../features/integrated/SubgraphStrategy.feature | 32 +-
5 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index ccfa82b240..fd96bdc6ea 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -478,6 +478,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{"g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold",
new List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true,
edges:
__.HasLabel("uses").Has("skill",5))).V().OutE().ValueMap().Select(Column.Values).Unfold()}},
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_V", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".V()}},
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_E", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".E()}},
+
{"g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".E()}},
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".V(p["vid4"]).OutE()}},
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_inE", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".V(p["vid4"]).InE()}},
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_out", new
List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has("name",P.Within(new List {"josh", "lop", "ripple"})),
edges:
__.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created".V(p["vid4"]).Out()}},
@@ -488,6 +489,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX11X_bothV",
new List, ITraversal>>
{(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false,
vertices: __.Has(&qu
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 83e66fdc5a88446f4bc763f7e15d9ad911cf7516 Merge: 98236ba70a 7f73599f74 Author: Cole-Greer AuthorDate: Thu Feb 29 08:27:29 2024 -0800 Merge branch '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(-)
(tinkerpop) branch master updated (98236ba70a -> 83e66fdc5a)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 98236ba70a Squash of 3 docs/gremlint dependabots add b7115b57d3 Bump eslint (#2507) add af5c9148b6 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2484) add ddb646e51e Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /gremlin-go (#2471) add 3166f1b347 Bump github.com/nicksnyder/go-i18n/v2 from 2.3.0 to 2.4.0 in /gremlin-go (#2469) add 7f73599f74 Merge branch '3.6-dev' into 3.7-dev new 83e66fdc5a Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gremlin-go/go.mod | 4 +- gremlin-go/go.sum | 8 +- .../gremlin-javascript/package-lock.json | 151 +++-- 3 files changed, 57 insertions(+), 106 deletions(-)
(tinkerpop) branch 3.7-dev updated (a919b90ebe -> 7f73599f74)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from a919b90ebe Merge branch '3.6-dev' into 3.7-dev add b7115b57d3 Bump eslint (#2507) add af5c9148b6 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2484) add ddb646e51e Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /gremlin-go (#2471) add 3166f1b347 Bump github.com/nicksnyder/go-i18n/v2 from 2.3.0 to 2.4.0 in /gremlin-go (#2469) new 7f73599f74 Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gremlin-go/go.mod | 4 +- gremlin-go/go.sum | 8 +- .../gremlin-javascript/package-lock.json | 151 +++-- 3 files changed, 57 insertions(+), 106 deletions(-)
(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev
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) branch 3.6-dev updated (af5c9148b6 -> ddb646e51e)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from af5c9148b6 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2484) add ddb646e51e Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /gremlin-go (#2471) No new revisions were added by this update. Summary of changes: gremlin-go/go.mod | 2 +- gremlin-go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(tinkerpop) branch 3.6-dev updated (b7115b57d3 -> af5c9148b6)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from b7115b57d3 Bump eslint (#2507) add af5c9148b6 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2484) No new revisions were added by this update. Summary of changes: .../gremlin-javascript/package-lock.json | 87 +- 1 file changed, 19 insertions(+), 68 deletions(-)
(tinkerpop) branch 3.6-dev updated: Bump eslint (#2507)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new b7115b57d3 Bump eslint (#2507)
b7115b57d3 is described below
commit b7115b57d314c0c616585a84495bd0d14ea8dd29
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Feb 29 08:07:52 2024 -0800
Bump eslint (#2507)
Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.56.0...v8.57.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.../gremlin-javascript/package-lock.json | 64 +++---
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 0b86446496..4dcb4a385e 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -130,22 +130,22 @@
}
},
"node_modules/@eslint/js": {
- "version": "8.56.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz;,
- "integrity":
"sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz;,
+ "integrity":
"sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.11.13",
- "resolved":
"https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz;,
- "integrity":
"sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+ "version": "0.11.14",
+ "resolved":
"https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz;,
+ "integrity":
"sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
"dev": true,
"dependencies": {
-"@humanwhocodes/object-schema": "^2.0.1",
-"debug": "^4.1.1",
+"@humanwhocodes/object-schema": "^2.0.2",
+"debug": "^4.3.1",
"minimatch": "^3.0.5"
},
"engines": {
@@ -166,9 +166,9 @@
}
},
"node_modules/@humanwhocodes/object-schema": {
- "version": "2.0.1",
- "resolved":
"https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz;,
- "integrity":
"sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+ "version": "2.0.2",
+ "resolved":
"https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz;,
+ "integrity":
"sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
"dev": true
},
"node_modules/@nodelib/fs.scandir": {
@@ -1044,16 +1044,16 @@
}
},
"node_modules/eslint": {
- "version": "8.56.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz;,
- "integrity":
"sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz;,
+ "integrity":
"sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
"dev": true,
"dependencies"
(tinkerpop) branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/nicksnyder/go-i18n/v2-2.4.0 deleted (was d1c5140815)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/nicksnyder/go-i18n/v2-2.4.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was d1c5140815 Bump github.com/nicksnyder/go-i18n/v2 from 2.3.0 to 2.4.0 in /gremlin-go The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (ddb646e51e -> 3166f1b347)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from ddb646e51e Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /gremlin-go (#2471) add 3166f1b347 Bump github.com/nicksnyder/go-i18n/v2 from 2.3.0 to 2.4.0 in /gremlin-go (#2469) No new revisions were added by this update. Summary of changes: gremlin-go/go.mod | 2 +- gremlin-go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(tinkerpop) branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/cucumber/godog-0.14.0 deleted (was 0bcf319771)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/cucumber/godog-0.14.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 0bcf319771 Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /gremlin-go The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/mocha-10.3.0 deleted (was f0aab3941b)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/mocha-10.3.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was f0aab3941b Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/eslint-8.57.0 deleted (was 72d63b47aa)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/eslint-8.57.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 72d63b47aa Bump eslint The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch master updated: Squash of 3 docs/gremlint dependabots
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
The following commit(s) were added to refs/heads/master by this push:
new 98236ba70a Squash of 3 docs/gremlint dependabots
98236ba70a is described below
commit 98236ba70a4f43cbda880ff8f78234f49dd6cc45
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Feb 29 14:14:16 2024 +
Squash of 3 docs/gremlint dependabots
Bump @types/node from 20.10.3 to 20.11.23 in /docs/gremlint
Bumps
[@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node)
from 20.10.3 to 20.11.23.
- [Release
notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
-
[Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
updated-dependencies:
- dependency-name: "@types/node"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Bump @testing-library/jest-dom from 6.2.0 to 6.4.2 in /docs/gremlint
Bumps
[@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from
6.2.0 to 6.4.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
-
[Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/testing-library/jest-dom/compare/v6.2.0...v6.4.2)
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Bump prettier from 3.1.0 to 3.2.5 in /docs/gremlint
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.2.5.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.2.5)
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
docs/gremlint/package-lock.json | 46 ++---
docs/gremlint/package.json | 6 +++---
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/docs/gremlint/package-lock.json b/docs/gremlint/package-lock.json
index 42424b04a8..6eaad07ad1 100644
--- a/docs/gremlint/package-lock.json
+++ b/docs/gremlint/package-lock.json
@@ -21,16 +21,16 @@
"web-vitals": "^3.5.1"
},
"devDependencies": {
-"@testing-library/jest-dom": "^6.2.0",
+"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.4",
-"@types/node": "^20.10.3",
+"@types/node": "^20.11.23",
"@types/react": "^17.0.38",
"@types/react-dom": "^17.0.11",
"@types/styled-components": "^5.1.26",
"gh-pages": "^6.1.1",
-"prettier": "^3.1.0",
+"prettier": "^3.2.5",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
},
@@ -4189,9 +4189,9 @@
}
},
"node_modules/@testing-library/jest-dom": {
- "version": "6.2.0",
- "resolved":
"https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.2.0.tgz;,
- "integrity":
"sha512-+BVQlJ9cmEn5RDMUS8c2+TU6giLvzaHZ8sU/x0Jj7fk+6/46wPdwlgOPcpxS17CjcanBi/3VmGMqVr2rmbUmNw==",
+ "version": "6.4.2",
+ "resolved":
"https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz;,
+ "integrity":
"sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==",
"dev": true,
"dependencies": {
"@adobe/css-tools": "^4.3.2",
@@ -4210,6 +4210,7 @@
},
"peerDependencies": {
"@jest/globals": ">= 28",
+"@types/bun": "latest",
"@types/jest": ">= 28",
"jest": ">= 28",
"vitest": ">= 0.32"
@@ -4218,6 +4219,9 @@
(tinkerpop) branch master updated: Remove gremlin-archetype (#2486)
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
The following commit(s) were added to refs/heads/master by this push:
new a8f90ea959 Remove gremlin-archetype (#2486)
a8f90ea959 is described below
commit a8f90ea959b0eb11a699f39d64ae274eb01e513d
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Fri Feb 23 09:53:34 2024 -0800
Remove gremlin-archetype (#2486)
---
CHANGELOG.asciidoc | 1 +
docs/src/reference/gremlin-variants.asciidoc | 28 +-
docs/src/upgrade/release-4.x.x.asciidoc| 6 ++
gremlin-archetype/gremlin-archetype-dsl/pom.xml| 59
.../META-INF/maven/archetype-metadata.xml | 38
.../resources/archetype-resources/README.asciidoc | 32 ---
.../src/main/resources/archetype-resources/pom.xml | 95 ---
.../src/main/java/SocialTraversalDsl.java | 76 ---
.../src/main/java/SocialTraversalSourceDsl.java| 72 --
.../src/test/java/SocialDslTest.java | 58
.../projects/standard/archetype.properties | 21 -
.../src/test/resources/projects/standard/goal.txt | 1 -
gremlin-archetype/gremlin-archetype-server/pom.xml | 59
.../META-INF/maven/archetype-metadata.xml | 47 -
.../resources/archetype-resources/README.asciidoc | 66 -
.../archetype-resources/conf/logback-test.xml | 26 -
.../resources/archetype-resources/conf/logback.xml | 26 -
.../conf/tinkergraph-empty.properties | 18
.../src/main/resources/archetype-resources/pom.xml | 105 -
.../scripts/generate-modern.groovy | 33 ---
.../archetype-resources/src/main/java/App.java | 43 -
.../archetype-resources/src/main/java/Service.java | 65 -
.../src/test/java/ServiceTest.java | 84 -
.../src/test/resources/gremlin-server.yaml | 41
.../projects/standard/archetype.properties | 21 -
.../src/test/resources/projects/standard/goal.txt | 1 -
.../gremlin-archetype-tinkergraph/pom.xml | 59
.../META-INF/maven/archetype-metadata.xml | 38
.../resources/archetype-resources/README.asciidoc | 32 ---
.../src/main/resources/archetype-resources/pom.xml | 89 -
.../archetype-resources/src/main/java/App.java | 79
.../archetype-resources/src/test/java/AppTest.java | 40
.../projects/standard/archetype.properties | 21 -
.../src/test/resources/projects/standard/goal.txt | 1 -
gremlin-archetype/pom.xml | 73 --
pom.xml| 1 -
36 files changed, 9 insertions(+), 1546 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 382adccd27..1b49095b63 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -33,6 +33,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Renamed the traversal discarding `none()` step to `discard()`.
* Added new list filtering step `none()`.
* Removed the deprecated `withGraph()` option from `AnonymousTraversalSource`.
+* Removed the `gremlin-archetype` module in favor of newer sample applications
in each GLV's `examples` folder.
* Bumped to `commons-collection4`.
* Added `withoutStrategies()` syntax to the Gremlin ANTLR grammar.
* Modified the Gremlin ANTLR grammar to more dynamically interact with any
strategies registered globally to the `TraversalStrategies` cache sets.
diff --git a/docs/src/reference/gremlin-variants.asciidoc
b/docs/src/reference/gremlin-variants.asciidoc
index 53b0692c46..777cbfe81b 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -1160,8 +1160,8 @@ SocialTraversalSource social =
traversal(SocialTraversalSource.class).with(graph
social.persons("marko").knows("josh");
-NOTE: Using Maven, as shown in the `gremlin-archetype-dsl` module, makes
developing DSLs with the annotation processor
-straightforward in that it sets up appropriate paths to the generated code
automatically.
+NOTE: Using Maven makes developing DSLs with the annotation processor
straightforward in that it sets up appropriate
+paths to the generated code automatically.
[[gremlin-java-troubleshooting]]
=== Troubleshooting
@@ -1223,30 +1223,6 @@ Connection Pool Status (size=1 max=5 min=1 toCreate=0
bin=0)
anchor:java-application-examples[]
-anchor:gremlin-archetypes[]
-[[gremlin-java-archetypes]]
-=== Application Archetypes
-
-The available
link:https://maven.apache.org/guides/introduction/introduction-to-archetypes.html[Maven
a
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 573ff8e8bd9f487b10ac04f6cde83d790dda0daa Merge: 936258e052 c0d704cb37 Author: Cole-Greer AuthorDate: Mon Jan 29 17:15:04 2024 -0800 Merge branch '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) branch master updated (936258e052 -> 573ff8e8bd)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 936258e052 Regenerate tests after merge CTR add 1a00f1ae33 Bump eslint-plugin-prettier (#2434) add 2f2a08a0ac Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2437) add 325055b472 Bump prettier from 3.1.0 to 3.2.4 in /gremlint (#2451) add d78b35e9c9 Bump prettier (#2453) add a6c8108a5a Bump actions/cache from 3 to 4 (#2456) add 8ef689557e Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go (#2457) add d2303d5fad Bump @types/node from 20.10.3 to 20.11.10 in /gremlint (#2463) add c0d704cb37 Merge branch '3.6-dev' into 3.7-dev new 573ff8e8bd Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .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
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) branch 3.7-dev updated (804eeab954 -> c0d704cb37)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 804eeab954 TINKERPOP-2456 Added a few language tests CTR add 1a00f1ae33 Bump eslint-plugin-prettier (#2434) add 2f2a08a0ac Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2437) add 325055b472 Bump prettier from 3.1.0 to 3.2.4 in /gremlint (#2451) add d78b35e9c9 Bump prettier (#2453) add a6c8108a5a Bump actions/cache from 3 to 4 (#2456) add 8ef689557e Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go (#2457) add d2303d5fad Bump @types/node from 20.10.3 to 20.11.10 in /gremlint (#2463) new c0d704cb37 Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .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) branch 3.6-dev updated: Bump @types/node from 20.10.3 to 20.11.10 in /gremlint (#2463)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new d2303d5fad Bump @types/node from 20.10.3 to 20.11.10 in /gremlint
(#2463)
d2303d5fad is described below
commit d2303d5fad750a2741016babcdba441b57883643
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jan 29 16:57:40 2024 -0800
Bump @types/node from 20.10.3 to 20.11.10 in /gremlint (#2463)
Bumps
[@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node)
from 20.10.3 to 20.11.10.
- [Release
notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
-
[Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
updated-dependencies:
- dependency-name: "@types/node"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
gremlint/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gremlint/package-lock.json b/gremlint/package-lock.json
index 0a5109e36d..10805201ca 100644
--- a/gremlint/package-lock.json
+++ b/gremlint/package-lock.json
@@ -968,9 +968,9 @@
}
},
"node_modules/@types/node": {
- "version": "20.10.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.3.tgz;,
- "integrity":
"sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==",
+ "version": "20.11.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz;,
+ "integrity":
"sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
@@ -7004,9 +7004,9 @@
}
},
"@types/node": {
- "version": "20.10.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.3.tgz;,
- "integrity":
"sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==",
+ "version": "20.11.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz;,
+ "integrity":
"sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
"dev": true,
"requires": {
"undici-types": "~5.26.4"
(tinkerpop) branch dependabot/npm_and_yarn/gremlint/3.6-dev/types/node-20.11.10 deleted (was 419bb565e9)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlint/3.6-dev/types/node-20.11.10 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 419bb565e9 Bump @types/node from 20.10.3 to 20.11.10 in /gremlint The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/google/uuid-1.6.0 deleted (was 32b67896a3)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/go_modules/gremlin-go/3.6-dev/github.com/google/uuid-1.6.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 32b67896a3 Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated: Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go (#2457)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/3.6-dev by this push: new 8ef689557e Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go (#2457) 8ef689557e is described below commit 8ef689557e82c18997ceb9c92085bb215e97d948 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jan 29 16:57:21 2024 -0800 Bump github.com/google/uuid from 1.5.0 to 1.6.0 in /gremlin-go (#2457) Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/uuid/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: github.com/google/uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gremlin-go/go.mod | 2 +- gremlin-go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gremlin-go/go.mod b/gremlin-go/go.mod index 796653fdfc..a3209ee976 100644 --- a/gremlin-go/go.mod +++ b/gremlin-go/go.mod @@ -21,7 +21,7 @@ go 1.20 require ( github.com/cucumber/godog v0.13.0 - github.com/google/uuid v1.5.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/stretchr/testify v1.8.4 diff --git a/gremlin-go/go.sum b/gremlin-go/go.sum index 4eead3f4ae..4f1476ca0d 100644 --- a/gremlin-go/go.sum +++ b/gremlin-go/go.sum @@ -13,8 +13,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.1+incompatible h1:0/KbAdpx3UXAx1kEOWHJeOkpbgRFGHVgv+CFIY7dBJI= github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
(tinkerpop) branch dependabot/github_actions/3.6-dev/actions/cache-4 deleted (was eb7b48b85f)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/github_actions/3.6-dev/actions/cache-4 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was eb7b48b85f Bump actions/cache from 3 to 4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated: Bump actions/cache from 3 to 4 (#2456)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/3.6-dev by this push: new a6c8108a5a Bump actions/cache from 3 to 4 (#2456) a6c8108a5a is described below commit a6c8108a5a91aa9cf4cca9f860b8dfb8cfebe010 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jan 29 16:56:54 2024 -0800 Bump actions/cache from 3 to 4 (#2456) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-test.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ef18acddab..d336ed9691 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -97,7 +97,7 @@ jobs: - name: Save Docker image working-directory: ./gremlin-server run: docker save --output gremlin-server.tar tinkerpop/gremlin-server -- uses: actions/cache@v3 +- uses: actions/cache@v4 id: gremlin-server-test-docker-image with: path: | @@ -211,7 +211,7 @@ jobs: distribution: 'temurin' - name: Get Cached Server Base Image if: matrix.os == 'ubuntu-latest' -uses: actions/cache@v3 +uses: actions/cache@v4 id: gremlin-server-test-docker-image with: path: | @@ -269,7 +269,7 @@ jobs: with: dotnet-version: '6.0.x' - name: Get Cached Server Base Image -uses: actions/cache@v3 +uses: actions/cache@v4 id: gremlin-server-test-docker-image with: path: | @@ -314,7 +314,7 @@ jobs: with: go-version: '1.20' - name: Get Cached Server Base Image -uses: actions/cache@v3 +uses: actions/cache@v4 id: gremlin-server-test-docker-image with: path: |
(tinkerpop) branch 3.6-dev updated (325055b472 -> d78b35e9c9)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 325055b472 Bump prettier from 3.1.0 to 3.2.4 in /gremlint (#2451) add d78b35e9c9 Bump prettier (#2453) No new revisions were added by this update. Summary of changes: .../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/prettier-3.2.4 deleted (was f6552b844a)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/prettier-3.2.4 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was f6552b844a Bump prettier The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch dependabot/npm_and_yarn/gremlint/3.6-dev/prettier-3.2.4 deleted (was cb0128a4ee)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlint/3.6-dev/prettier-3.2.4 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was cb0128a4ee Bump prettier from 3.1.0 to 3.2.4 in /gremlint The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (2f2a08a0ac -> 325055b472)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 2f2a08a0ac Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2437) add 325055b472 Bump prettier from 3.1.0 to 3.2.4 in /gremlint (#2451) No new revisions were added by this update. Summary of changes: gremlint/package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/chai-4.4.1 deleted (was dae725b59c)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/chai-4.4.1 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was dae725b59c Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated (1a00f1ae33 -> 2f2a08a0ac)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 1a00f1ae33 Bump eslint-plugin-prettier (#2434) add 2f2a08a0ac Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2437) No new revisions were added by this update. Summary of changes: .../main/javascript/gremlin-javascript/package-lock.json | 14 +++--- .../src/main/javascript/gremlin-javascript/package.json| 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
(tinkerpop) branch 3.6-dev updated (a1a3009b71 -> 1a00f1ae33)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from a1a3009b71 Improved contains check for bulkset with elements (#2425) add 1a00f1ae33 Bump eslint-plugin-prettier (#2434) No new revisions were added by this update. Summary of changes: .../gremlin-javascript/package-lock.json | 807 + 1 file changed, 35 insertions(+), 772 deletions(-)
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/eslint-plugin-prettier-5.1.3 deleted (was 350771fa38)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/eslint-plugin-prettier-5.1.3 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 350771fa38 Bump eslint-plugin-prettier The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch master updated (e1dacc3024 -> ef7ade2fdd)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from e1dacc3024 Merge branch '3.7-dev' add db4807d5ae Bump gremlin-python example dependencies (#2438) add ddf32174d7 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2419) add 2f606812bd Merge branch '3.6-dev' into 3.7-dev new ef7ade2fdd Merge branch '3.7-dev' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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.7-dev'
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 ef7ade2fdd74401579a4e201268aea1d0d9bb02b Merge: e1dacc3024 2f606812bd Author: Cole-Greer AuthorDate: Mon Jan 15 09:49:32 2024 -0800 Merge branch '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
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) branch 3.7-dev updated (821bf60d41 -> 2f606812bd)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch 3.7-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git from 821bf60d41 Merge branch '3.6-dev' into 3.7-dev add db4807d5ae Bump gremlin-python example dependencies (#2438) add ddf32174d7 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2419) new 2f606812bd Merge branch '3.6-dev' into 3.7-dev The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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) branch 3.6-dev updated: Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2419)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push:
new ddf32174d7 Bump ws in
/gremlin-javascript/src/main/javascript/gremlin-javascript (#2419)
ddf32174d7 is described below
commit ddf32174d7a767ca15b15a2a7825cf947cd00207
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jan 15 09:40:30 2024 -0800
Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript
(#2419)
Bumps [ws](https://github.com/websockets/ws) from 8.15.1 to 8.16.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.15.1...8.16.0)
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.../src/main/javascript/gremlin-javascript/package-lock.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 9bdf86dbdf..279b0b64cc 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -4287,9 +4287,9 @@
"dev": true
},
"node_modules/ws": {
- "version": "8.15.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz;,
- "integrity":
"sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
+ "version": "8.16.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz;,
+ "integrity":
"sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
"engines": {
"node": ">=10.0.0"
},
@@ -7548,9 +7548,9 @@
"dev": true
},
"ws": {
- "version": "8.15.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz;,
- "integrity":
"sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
+ "version": "8.16.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz;,
+ "integrity":
"sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
"requires": {}
},
"xregexp": {
(tinkerpop) branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/ws-8.16.0 deleted (was 7b45abc17d)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a change to branch dependabot/npm_and_yarn/gremlin-javascript/src/main/javascript/gremlin-javascript/3.6-dev/ws-8.16.0 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git was 7b45abc17d Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(tinkerpop) branch 3.6-dev updated: Bump gremlin-python example dependencies (#2438)
This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git The following commit(s) were added to refs/heads/3.6-dev by this push: new db4807d5ae Bump gremlin-python example dependencies (#2438) db4807d5ae is described below commit db4807d5ae52df958932685af3d833a29f637ce1 Author: Ryan Tan <65996005+r...@users.noreply.github.com> AuthorDate: Mon Jan 15 09:37:36 2024 -0800 Bump gremlin-python example dependencies (#2438) --- gremlin-python/src/main/python/examples/requirements.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gremlin-python/src/main/python/examples/requirements.txt b/gremlin-python/src/main/python/examples/requirements.txt index 64f860071b..aac2e56d11 100644 --- a/gremlin-python/src/main/python/examples/requirements.txt +++ b/gremlin-python/src/main/python/examples/requirements.txt @@ -20,10 +20,10 @@ aiohttp==3.8.0 aiosignal==1.3.1 async-timeout==4.0.3 attrs==23.1.0 -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 frozenlist==1.4.0 -idna==3.4 +idna==3.6 isodate==0.6.1 -multidict==4.7.6 -six==1.15.0 -yarl==1.9.2 \ No newline at end of file +multidict==6.0.4 +six==1.16.0 +yarl==1.9.4
(tinkerpop) branch master updated (a7781f56be -> a056d082cf)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from a7781f56be CTR docs/gremlint dependabots
add 3a071afda8 [TINKERPOP-3025] Add missing l_trim() and r_trim() to
python (#2432)
add d2eaf93dd5 [TINKERPOP-2872] Change JS tests to compare elements by ID
for consistency with other GLVs (#2422)
add fed30eec62 CTR Update LICENSE file bundled dependencies
new a056d082cf Merge branch '3.7-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 2 +
LICENSE| 5 +-
.../src/main/javascript/gremlin-javascript/LICENSE | 10 +-
.../javascript/gremlin-javascript/licenses/chai| 12 +-
.../test/cucumber/element-comparison.js| 123 +
.../test/cucumber/feature-steps.js | 10 +-
.../test/unit/element-comparison-test.js | 299 +
.../gremlin_python/process/graph_traversal.py | 44 ++-
licenses/{prism => chai} | 12 +-
9 files changed, 496 insertions(+), 21 deletions(-)
copy licenses/prism =>
gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai (86%)
create mode 100644
gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
create mode 100644
gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
copy licenses/{prism => chai} (86%)
(tinkerpop) 01/01: Merge branch '3.7-dev'
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 a056d082cfd617cc11c603d8a1e6dc20d6b68c6a Merge: a7781f56be fed30eec62 Author: Cole-Greer AuthorDate: Thu Jan 11 15:54:00 2024 -0800 Merge branch '3.7-dev' CHANGELOG.asciidoc | 2 + LICENSE| 5 +- .../src/main/javascript/gremlin-javascript/LICENSE | 10 +- .../javascript/gremlin-javascript/licenses/chai| 21 ++ .../test/cucumber/element-comparison.js| 123 + .../test/cucumber/feature-steps.js | 10 +- .../test/unit/element-comparison-test.js | 299 + .../gremlin_python/process/graph_traversal.py | 44 ++- licenses/chai | 21 ++ 9 files changed, 526 insertions(+), 9 deletions(-)
(tinkerpop) branch 3.7-dev updated: CTR Update LICENSE file bundled dependencies
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 The following commit(s) were added to refs/heads/3.7-dev by this push: new fed30eec62 CTR Update LICENSE file bundled dependencies fed30eec62 is described below commit fed30eec6265f2ee790f35711c1e2b4a41a21a3b Author: Cole-Greer AuthorDate: Thu Jan 11 15:52:43 2024 -0800 CTR Update LICENSE file bundled dependencies --- LICENSE | 1 + licenses/chai | 21 + 2 files changed, 22 insertions(+) diff --git a/LICENSE b/LICENSE index 6317047c22..56d9bf7647 100644 --- a/LICENSE +++ b/LICENSE @@ -212,3 +212,4 @@ The Apache TinkerPop project bundles the following components under the MIT Lice normalize.css 2.1.2 (https://necolas.github.io/normalize.css/) - for details, see licenses/normalize prism.css/js 1.27.0 (https://prismjs.com/) - for details, see licenses/prism wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow + chai 5.0.0 (https://www.chaijs.com/) - for details, see licenses/chai diff --git a/licenses/chai b/licenses/chai new file mode 100644 index 00..eedbe238ac --- /dev/null +++ b/licenses/chai @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Chai.js Assertion Library + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
(tinkerpop) branch 3.7-dev updated: [TINKERPOP-2872] Change JS tests to compare elements by ID for consistency with other GLVs (#2422)
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 The following commit(s) were added to refs/heads/3.7-dev by this push: new d2eaf93dd5 [TINKERPOP-2872] Change JS tests to compare elements by ID for consistency with other GLVs (#2422) d2eaf93dd5 is described below commit d2eaf93dd5af64c05395d9dea9c572443ff4b1b0 Author: Ryan Tan <65996005+r...@users.noreply.github.com> AuthorDate: Thu Jan 11 15:50:50 2024 -0800 [TINKERPOP-2872] Change JS tests to compare elements by ID for consistency with other GLVs (#2422) Passes an ID comparator for deep-eql to use when object is type Element, then overwrites chai's members() and isSubsetOf() to use this comparator. --- CHANGELOG.asciidoc | 1 + LICENSE| 4 +- .../src/main/javascript/gremlin-javascript/LICENSE | 10 +- .../javascript/gremlin-javascript/licenses/chai| 21 ++ .../test/cucumber/element-comparison.js| 123 + .../test/cucumber/feature-steps.js | 10 +- .../test/unit/element-comparison-test.js | 299 + 7 files changed, 463 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bf47d7849e..7d725351cc 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -55,6 +55,7 @@ This release also includes changes from <> and <http://getbootstrap.com/) - for details, see licenses/bootstrap jquery 1.11.0 (https://jquery.com/) - for details, see licenses/jquery normalize.css 2.1.2 (https://necolas.github.io/normalize.css/) - for details, see licenses/normalize - prism.css/js 1.27.0 (https://prismjs.com) - for details, see licenses/prism - wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow \ No newline at end of file + prism.css/js 1.27.0 (https://prismjs.com/) - for details, see licenses/prism + wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE b/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE index 7a4a3ea242..1a1a07d01d 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE @@ -199,4 +199,12 @@ 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. \ No newline at end of file + limitations under the License. + + + MIT Licenses + + + The Apache TinkerPop project bundles the following components under the MIT License: + +chai 5.0.0 (https://www.chaijs.com/) - for details, see licenses/chai diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai b/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai new file mode 100644 index 00..eedbe238ac --- /dev/null +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Chai.js Assertion Library + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js new file mode 100644 index 00..7f60f47396 --- /dev/null +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js @@ -0,0 +1,123 @@ +/* + * Li
(tinkerpop) branch 3.7-dev updated: [TINKERPOP-3025] Add missing l_trim() and r_trim() to python (#2432)
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
The following commit(s) were added to refs/heads/3.7-dev by this push:
new 3a071afda8 [TINKERPOP-3025] Add missing l_trim() and r_trim() to
python (#2432)
3a071afda8 is described below
commit 3a071afda8cac27b101ffd42d365d1b3916c7f5d
Author: Ryan Tan <65996005+r...@users.noreply.github.com>
AuthorDate: Thu Jan 11 15:50:09 2024 -0800
[TINKERPOP-3025] Add missing l_trim() and r_trim() to python (#2432)
---
CHANGELOG.asciidoc | 2 +-
.../gremlin_python/process/graph_traversal.py | 44 --
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c1b4fccaec..bf47d7849e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,7 +23,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-7-2]]
=== TinkerPop 3.7.2 (NOT OFFICIALLY RELEASED YET)
-
+* Deprecated `ltrim()` and `rTrim()` in favor of `l_trim()` and `r_trim` in
Python.
[[release-3-7-1]]
=== TinkerPop 3.7.1 (November 20, 2023)
diff --git
a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
index 46c7b63844..c5c30097cf 100644
--- a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
@@ -659,6 +659,10 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("lTrim", *args)
return self
+def l_trim(self, *args):
+self.bytecode.add_step("lTrim", *args)
+return self
+
def map(self, *args):
self.bytecode.add_step("map", *args)
return self
@@ -841,6 +845,10 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("rTrim", *args)
return self
+def r_trim(self, *args):
+self.bytecode.add_step("rTrim", *args)
+return self
+
def sack(self, *args):
self.bytecode.add_step("sack", *args)
return self
@@ -1413,7 +1421,15 @@ class __(object, metaclass=MagicType):
@classmethod
def ltrim(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).ltrim(*args)
+warnings.warn(
+"gremlin_python.process.__.ltrim will be replaced by "
+"gremlin_python.process.__.l_trim.",
+DeprecationWarning)
+return cls.l_trim(*args)
+
+@classmethod
+def l_trim(cls, *args):
+return cls.graph_traversal(None, None, Bytecode()).l_trim(*args)
@classmethod
def map(cls, *args):
@@ -1557,7 +1573,15 @@ class __(object, metaclass=MagicType):
@classmethod
def rTrim(cls, *args):
-return cls.graph_traversal(None, None, Bytecode()).rTrim(*args)
+warnings.warn(
+"gremlin_python.process.__.rTrim will be replaced by "
+"gremlin_python.process.__.r_trim.",
+DeprecationWarning)
+return cls.r_trim(*args)
+
+@classmethod
+def r_trim(cls, *args):
+return cls.graph_traversal(None, None, Bytecode()).r_trim(*args)
@classmethod
def sack(cls, *args):
@@ -2084,7 +2108,11 @@ def loops(*args):
def ltrim(*args):
-return __.ltrim(*args)
+return __.l_trim(*args)
+
+
+def l_trim(*args):
+return __.l_trim(*args)
def map(*args):
@@ -2204,7 +2232,11 @@ def reverse(*args):
def rTrim(*args):
-return __.rTrim(*args)
+return __.r_trim(*args)
+
+
+def r_trim(*args):
+return __.r_trim(*args)
def sack(*args):
@@ -2485,6 +2517,8 @@ statics.add_static('loops', loops)
statics.add_static('ltrim', ltrim)
+statics.add_static('l_trim', l_trim)
+
statics.add_static('map', map)
statics.add_static('match', match)
@@ -2545,6 +2579,8 @@ statics.add_static('reverse', reverse)
statics.add_static('rTrim', rTrim)
+statics.add_static('r_trim', r_trim)
+
statics.add_static('sack', sack)
statics.add_static('sample', sample)
