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 403b12af895da6f9020a697a4bb673108cd227de Merge: 2f54a5413f ab6297a7c8 Author: Cole-Greer <[email protected]> AuthorDate: Thu Oct 3 13:24:55 2024 -0700 Merge branch '3.6-dev' into 3.7-dev .github/workflows/build-test.yml | 2 +- CHANGELOG.asciidoc | 1 + .../dev/developer/development-environment.asciidoc | 2 +- docs/src/upgrade/release-3.6.x.asciidoc | 4 +++ gremlin-go/README.md | 2 +- gremlin-go/driver/README.md | 6 ++--- gremlin-go/examples/go.mod | 11 ++++---- gremlin-go/examples/go.sum | 27 +++++++++++-------- gremlin-go/go.mod | 8 +++--- gremlin-go/go.sum | 10 +++----- .../gremlin-javascript/package-lock.json | 30 +++++++++++----------- .../javascript/gremlin-javascript/package.json | 2 +- .../src/main/python/examples/requirements.txt | 4 +-- gremlint/package-lock.json | 12 ++++----- 14 files changed, 65 insertions(+), 56 deletions(-) diff --cc gremlin-go/examples/go.mod index 4ac05244c2,e98e33db09..c3a6c6de3c --- a/gremlin-go/examples/go.mod +++ b/gremlin-go/examples/go.mod @@@ -17,13 -17,13 +17,14 @@@ module example - go 1.21 + go 1.22 -require github.com/apache/tinkerpop/gremlin-go/v3 v3.6.6 +require github.com/apache/tinkerpop/gremlin-go/v3 v3.7.1 require ( - github.com/google/uuid v1.3.0 // indirect - github.com/gorilla/websocket v1.5.0 // indirect - github.com/nicksnyder/go-i18n/v2 v2.2.1 // indirect - golang.org/x/text v0.11.0 // indirect + github.com/google/uuid v1.4.0 // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/nicksnyder/go-i18n/v2 v2.2.2 // indirect ++ golang.org/x/net v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect ) diff --cc gremlin-go/examples/go.sum index 5aa72a5d11,a811f5c79d..e6b284e33b --- a/gremlin-go/examples/go.sum +++ b/gremlin-go/examples/go.sum @@@ -1,17 -1,21 +1,21 @@@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= - github.com/apache/tinkerpop/gremlin-go/v3 v3.7.0 h1:WSHdJ/UKSSYZj8E2QzEdUsaV54rWAoNlQSPm4x/o/sY= - github.com/apache/tinkerpop/gremlin-go/v3 v3.7.0/go.mod h1:3cydTAyTJzOEI4RWqbNHtsbtnUuYmBR8ZeAxNs+yRcw= -github.com/apache/tinkerpop/gremlin-go/v3 v3.6.5 h1:JafEkhoITZ+0W9/U6uow7zWTqfdZwgFNPPzxM+53C+E= -github.com/apache/tinkerpop/gremlin-go/v3 v3.6.5/go.mod h1:yGalCq736URRMAzVMI6hrMMzaW/fsg4cwXfLRI7uhMw= -github.com/apache/tinkerpop/gremlin-go/v3 v3.6.6/go.mod h1:Sr7xrVX+mZZiehhcesgJQbPfeZtYXi+O8uZOUdrUeyA= ++github.com/apache/tinkerpop/gremlin-go/v3 v3.7.1 h1:WFdFnZ8Jrwu/leSrfj4UxMtJb+HAvK6dI6m/nEsydiU= ++github.com/apache/tinkerpop/gremlin-go/v3 v3.7.1/go.mod h1:o5KMbggLt/XrlFE4Rwp3aLqcDg37Ef6IAXSixbutIKg= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= --github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= --github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= - github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= - github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA= - github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= + github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= ++github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= + github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA= -github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= ++github.com/nicksnyder/go-i18n/v2 v2.2.2 h1:Iv/FL6pvYmDqybEZkr4TrOv8jSHezwpE77K68kcaft8= + github.com/nicksnyder/go-i18n/v2 v2.2.2/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= ++github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= ++github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@@ -19,6 -23,6 +23,8 @@@ golang.org/x/mod v0.6.0-dev.0.202204192 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= ++golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= ++golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@@ -32,8 -36,9 +38,8 @@@ golang.org/x/text v0.3.0/go.mod h1:NqM8 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= --golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= ++golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= + golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= @@@ -42,3 -47,3 +48,4 @@@ gopkg.in/check.v1 v0.0.0-20161208181325 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= ++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --cc gremlin-go/go.mod index 5264554bd6,5900cb9545..2310a1636b --- a/gremlin-go/go.mod +++ b/gremlin-go/go.mod @@@ -22,11 -22,10 +22,11 @@@ go 1.2 require ( github.com/cucumber/godog v0.14.1 github.com/google/uuid v1.6.0 - github.com/gorilla/websocket v1.5.2 + github.com/gorilla/websocket v1.5.3 github.com/nicksnyder/go-i18n/v2 v2.4.0 github.com/stretchr/testify v1.9.0 - golang.org/x/text v0.17.0 + golang.org/x/text v0.18.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@@ -40,6 -39,5 +40,4 @@@ 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.23.0 // indirect -- gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json index 4c1e1ee4eb,04a3450c7d..2c9589cd70 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json @@@ -6,17 -6,13 +6,17 @@@ "packages": { "": { "name": "gremlin", - "version": "3.6.8-alpha1", + "version": "3.7.3-alpha1", "license": "Apache-2.0", "dependencies": { - "ws": "^8.11.0" + "buffer": "^6.0.3", + "eventemitter3": "^5.0.1", + "readable-stream": "^4.5.2", + "uuid": "^9.0.1", + "ws": "^8.16.0" }, "devDependencies": { - "chai": "~4.4.1", + "chai": "~4.5.0", "chai-string": "~1.5.0", "colors": "1.4.0", "cross-env": "^7.0.3", diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json index 0f5c55d2be,2d0c1a6494..cd028a100b --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json @@@ -14,14 -14,10 +14,14 @@@ ], "license": "Apache-2.0", "dependencies": { - "ws": "^8.11.0" + "buffer": "^6.0.3", + "eventemitter3": "^5.0.1", + "readable-stream": "^4.5.2", + "uuid": "^9.0.1", + "ws": "^8.16.0" }, "devDependencies": { - "chai": "~4.4.1", + "chai": "~4.5.0", "chai-string": "~1.5.0", "colors": "1.4.0", "cross-env": "^7.0.3",
