Merge branch '3.6-dev' into 3.7-dev

.github/workflows/codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -60,7 +60,7 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
 
@@ -79,7 +79,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: 'csharp'
 
@@ -94,7 +94,7 @@ jobs:
 #          dotnet build gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:csharp"
 
@@ -113,7 +113,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: 'java'
 
@@ -125,6 +125,6 @@ jobs:
           -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:java"

bin/run-examples.sh

@@ -36,15 +36,15 @@ docker pull tinkerpop/gremlin-server
 docker run -d --rm -p 8182:8182 --name glv-examples --health-cmd="curl -f http://localhost:8182/ || exit 1" --health-interval=5s --health-timeout=3s tinkerpop/gremlin-server
 
 echo
-echo "Not having docker open initially may cause an error loop. If so, simply restart this script."
+echo "Not having Docker open initially or occupying port 8182 may cause an error loop. If so, simply restart this script."
 echo -n "Starting Gremlin server on port 8182..."
 until docker inspect --format '{{.State.Health.Status}}' glv-examples | grep -q "healthy"; do
      echo -n "."
      sleep 1
 done
 echo
 
-cd ../gremlin-driver/src/main/java/examples || exit
+cd gremlin-driver/src/main/java/examples || exit
 mvn clean install
 
 echo

docs/src/dev/developer/release.asciidoc

@@ -80,7 +80,7 @@ Take care to commit or not commit changes related to that as necessary.
 
 == Release Manager Requirements
 
-If this is your first time as release manager, you will need to setup keys for signing purposes per the Apache
+If this is your first time as release manager, you will need to set up keys for signing purposes per the Apache
 release process. Generally speaking, this will mean that you will need to generate a key-pair and then publish your
 public key.
 
@@ -120,7 +120,6 @@ during this period.
 .. Run the full integration test suite: `docker/build.sh -t -i -n`
 .. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -DdockerImages`
 .. Ensure that the Gremlin.Net.Template gets packaged successfully: `mvn clean install -pl :gremlin-dotnet-source -Dnuget`
-.. Ensure that the GLV examples are compiling and running successfully: `bin/run-examples.sh`
 .. Deploy a final SNAPSHOT to the Apache snapshot repository for Java.
 .. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
@@ -327,6 +326,8 @@ the help of a PMC member for those steps.
 . Examine the `future.asciidoc` and update the "Roadmap" as needed.
 . Send email to advise that code freeze is lifted.
 . Consider the changes made to Gremlin and determine if the community needs to organize a PR to [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/gremlin) to keep TypeScript up to date.
+. Ensure that the GLV examples compile and run with the latest image and dependencies: `bin/run-examples.sh`.
+.. Make changes as necessary to update the examples.
 . Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
 . Set up the IO tests for the current `SNAPSHOT` as discussed in the <<io,IO Documentation and Testing Section>>
 

gremlin-go/go.mod

@@ -21,7 +21,7 @@ go 1.20
 
 require (
 	github.com/cucumber/godog v0.13.0
-	github.com/google/uuid v1.4.0
+	github.com/google/uuid v1.5.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/nicksnyder/go-i18n/v2 v2.3.0
 	github.com/stretchr/testify v1.8.4

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.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/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=

gremlin-javascript/examples/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "example",
+  "name": "examples",
   "version": "1.0.0",
   "description": "GLV example for JavaScript with Node",
-  "main": "example.js",
+  "main": "connections.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },