You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2022/06/14 21:26:18 UTC

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

This is an automated email from the ASF dual-hosted git repository.

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

commit 97a7ffff2edf86d48f6543d78004f65c645e54b6
Merge: a94a2b93dd ea5e5ce6c0
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Jun 14 16:37:33 2022 -0400

    Merge branch '3.6-dev'

 docs/gremlint/package.json |   6 +-
 gremlint/package-lock.json | 182 ++++++++++++++++++++++++++++++++++++++-------
 gremlint/package.json      |   6 +-
 3 files changed, 163 insertions(+), 31 deletions(-)

diff --cc gremlint/package-lock.json
index 45a50a27c2,091d2c867c..6d227a66ad
--- a/gremlint/package-lock.json
+++ b/gremlint/package-lock.json
@@@ -6,12 -6,12 +6,12 @@@
    "packages": {
      "": {
        "name": "gremlint",
 -      "version": "3.6.1-alpha1",
 +      "version": "3.7.0-alpha1",
        "license": "Apache-2.0",
        "devDependencies": {
-         "@types/jest": "^26.0.15",
+         "@types/jest": "^27.5.0",
          "jest": "^26.6.1",
-         "prettier": "^2.1.2",
+         "prettier": "^2.7.0",
          "ts-jest": "^26.4.2",
          "tslint": "^6.1.3",
          "tslint-config-prettier": "^1.18.0",