commit bd6a85560e397c31740227fd4b926a02e27baba9
author stephen <spmallette@gmail.com> Tue Jan 21 11:26:10 2020 -0500
committer stephen <spmallette@gmail.com> Tue Jan 21 11:26:10 2020 -0500
tree ea90a7a499b1574288063441eada806cc2fe1f73
parent 4bf2cbd24bb709e106259155660e43a82f50616f
parent 0f03b032679635782ce21bedd90b9448eb3b5f72

Merge branch 'TINKERPOP-2323' into 3.3-dev

gremlin-javascript/glv/PackageJson.template

diff --git a/gremlin-javascript/glv/PackageJson.template b/gremlin-javascript/glv/PackageJson.template
index 8bc2905..4089dc2 100644
--- a/gremlin-javascript/glv/PackageJson.template
+++ b/gremlin-javascript/glv/PackageJson.template
@@ -33,15 +33,15 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "ws": "^3.0.0"
+    "ws": "^6.2.1"
   },
   "devDependencies": {
-    "mocha": "~4.0.1",
-    "cucumber": "~3.1.0",
     "chai": "~4.1.2",
-    "grunt": "~1.0.2",
-    "grunt-cli": "~1.2.0",
-    "grunt-jsdoc": "~2.3.0"
+    "cucumber": "~4.2.1",
+    "grunt": "~1.0.4",
+    "grunt-cli": "~1.3.2",
+    "grunt-jsdoc": "~2.3.1",
+    "mocha": "~5.2.0"
   },
   "repository": {
     "type": "git",
@@ -52,9 +52,9 @@
     "url": "https://issues.apache.org/jira/browse/TINKERPOP"
   },
   "scripts": {
-    "test": "mocha test/unit test/integration -t 5000",
-    "features": "cucumber.js --require test/cucumber ../../../../../gremlin-test/features/",
-    "unit-test": "mocha test/unit"
+    "test": "./node_modules/mocha/bin/mocha test/unit test/integration -t 5000",
+    "features": "./node_modules/.bin/cucumber-js --require test/cucumber ../../../../../gremlin-test/features/",
+    "unit-test": "./node_modules/mocha/bin/mocha test/unit"
   },
   "engines": {
     "node": ">=6"

gremlin-javascript/src/main/javascript/gremlin-javascript/package.json

diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 9aa5a2b..6485f9b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -14,15 +14,15 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "ws": "^3.0.0"
+    "ws": "^6.2.1"
   },
   "devDependencies": {
-    "mocha": "~4.0.1",
-    "cucumber": "~3.1.0",
     "chai": "~4.1.2",
-    "grunt": "~1.0.2",
-    "grunt-cli": "~1.2.0",
-    "grunt-jsdoc": "~2.3.0"
+    "cucumber": "~4.2.1",
+    "grunt": "~1.0.4",
+    "grunt-cli": "~1.3.2",
+    "grunt-jsdoc": "~2.3.1",
+    "mocha": "~5.2.0"
   },
   "repository": {
     "type": "git",
@@ -33,9 +33,9 @@
     "url": "https://issues.apache.org/jira/browse/TINKERPOP"
   },
   "scripts": {
-    "test": "mocha test/unit test/integration -t 5000",
-    "features": "cucumber.js --require test/cucumber ../../../../../gremlin-test/features/",
-    "unit-test": "mocha test/unit"
+    "test": "./node_modules/mocha/bin/mocha test/unit test/integration -t 5000",
+    "features": "./node_modules/.bin/cucumber-js --require test/cucumber ../../../../../gremlin-test/features/",
+    "unit-test": "./node_modules/mocha/bin/mocha test/unit"
   },
   "engines": {
     "node": ">=6"