You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by oy...@apache.org on 2021/06/02 18:53:24 UTC
[tinkerpop] branch master updated (e897f40 -> f4e60f7)
This is an automated email from the ASF dual-hosted git repository.
oyvindsabo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from e897f40 Merge branch '3.5-dev'
add c488677 Generate updated package-lock.json for gremlin-javascript CTR
new 375d720 Merge branch '3.5-dev'
new f4e60f7 Generate updated package-lock.json for gremlin-javascript CTR
The 2 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/package-lock.json | 1453 +++++---------------
1 file changed, 346 insertions(+), 1107 deletions(-)
[tinkerpop] 02/02: Generate updated package-lock.json for
gremlin-javascript CTR
Posted by oy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
oyvindsabo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f4e60f7cf167c6d1690bcbb351164ff877433d68
Author: oyvindsabo <oy...@gmail.com>
AuthorDate: Wed Jun 2 20:47:27 2021 +0200
Generate updated package-lock.json for gremlin-javascript CTR
The current package-lock.json file in gremlin-javascript was merged
from 3.5-dev, which means it was generated based on the package.json
file in 3.5-dev. The package.json file in master is not identical, so
this commit makes sure the package-lock.json file is correctly derived
from the package.json file.
When the package-lock.json file conflicts with the package.json file,
a new package-lock.json file will be generated when running npm
install. This is not a big deal, but it can be annoying to get an
unstaged change that will have to be stashed or committed whenever
you run mvn clean install (which runs npm install behind the scenes).
---
.../src/main/javascript/gremlin-javascript/package-lock.json | 4 ++--
1 file changed, 2 insertions(+), 2 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 6fa1b3a..f76b288 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "gremlin",
- "version": "3.5.1-alpha1",
+ "version": "3.6.0-alpha1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "gremlin",
- "version": "3.5.1-alpha1",
+ "version": "3.6.0-alpha1",
"license": "Apache-2.0",
"dependencies": {
"ws": "^6.2.1"
[tinkerpop] 01/02: Merge branch '3.5-dev'
Posted by oy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
oyvindsabo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 375d7209140b12234df783ec3e2c5e4eb919d1ae
Merge: e897f40 c488677
Author: oyvindsabo <oy...@gmail.com>
AuthorDate: Wed Jun 2 20:45:49 2021 +0200
Merge branch '3.5-dev'
.../gremlin-javascript/package-lock.json | 1453 +++++---------------
1 file changed, 346 insertions(+), 1107 deletions(-)