atlas git commit: ATLAS-2520: Introduce JanusGraphTraversal to deprecate use of GremlinScriptEngine
Repository: atlas
Updated Branches:
refs/heads/master 927753159 -> 5317a7215
ATLAS-2520: Introduce JanusGraphTraversal to deprecate use of
GremlinScriptEngine
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/5317a721
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/5317a721
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/5317a721
Branch: refs/heads/master
Commit: 5317a7215e21321235c1b9cc99d61d78b10659eb
Parents: 9277531
Author: apoorvnaik
Authored: Tue Oct 23 15:39:29 2018 -0700
Committer: apoorvnaik
Committed: Thu Oct 25 11:29:55 2018 -0700
--
graphdb/api/pom.xml | 5 +
.../atlas/repository/graphdb/AtlasGraph.java| 21 +-
.../repository/graphdb/AtlasGraphTraversal.java | 91
.../graphdb/AtlasGraphTraversalSource.java | 40
.../graphdb/janus/AtlasJanusGraph.java | 19 ++
.../graphdb/janus/AtlasJanusGraphTraversal.java | 232 +++
.../org/apache/atlas/query/GremlinQuery.java| 38 ---
7 files changed, 401 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/5317a721/graphdb/api/pom.xml
--
diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml
index 14b273f..58ca51a 100644
--- a/graphdb/api/pom.xml
+++ b/graphdb/api/pom.xml
@@ -46,6 +46,11 @@
org.codehaus.jettison
jettison
+
+org.apache.tinkerpop
+gremlin-core
+3.3.3
+
http://git-wip-us.apache.org/repos/asf/atlas/blob/5317a721/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java
--
diff --git
a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java
b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java
index 31d2085..09eab28 100644
---
a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java
+++
b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java
@@ -17,18 +17,17 @@
*/
package org.apache.atlas.repository.graphdb;
+import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.groovy.GroovyExpression;
+import org.apache.atlas.type.AtlasType;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
import java.util.Set;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.apache.atlas.exception.AtlasBaseException;
-import org.apache.atlas.groovy.GroovyExpression;
-import org.apache.atlas.type.AtlasType;
-
/**
* Represents a graph.
*
@@ -144,6 +143,14 @@ public interface AtlasGraph {
AtlasGraphQuery query();
/**
+ * Start a graph traversal
+ * @return
+ */
+AtlasGraphTraversal V(Object ... vertexIds);
+
+AtlasGraphTraversal E(Object ... edgeIds);
+
+/**
* Creates an index query.
*
* @param indexName index name
http://git-wip-us.apache.org/repos/asf/atlas/blob/5317a721/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraphTraversal.java
--
diff --git
a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraphTraversal.java
b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraphTraversal.java
new file mode 100644
index 000..881bb1e
--- /dev/null
+++
b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraphTraversal.java
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.atlas.repository.graphdb;
+
+import
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
+import
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import
atlas git commit: ATLAS-2934: utility to detect and repair incorrect entity state - #2
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 5c3afa68b -> ccd417abc
ATLAS-2934: utility to detect and repair incorrect entity state - #2
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/ccd417ab
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/ccd417ab
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/ccd417ab
Branch: refs/heads/branch-0.8
Commit: ccd417abc82485769982169f0b17c53070b7e0bc
Parents: 5c3afa6
Author: Madhan Neethiraj
Authored: Thu Oct 25 10:03:35 2018 -0700
Committer: Madhan Neethiraj
Committed: Thu Oct 25 10:47:03 2018 -0700
--
.../store/graph/v1/EntityStateChecker.java | 33 ++--
1 file changed, 17 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/ccd417ab/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java
--
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java
index 3f87f56..dd30969 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java
@@ -42,6 +42,7 @@ import org.springframework.stereotype.Component;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -233,30 +234,30 @@ public final class EntityStateChecker {
}
}
+if (traitVertexNames == null) {
+traitVertexNames = Collections.emptyList();
+}
+
List traitNamesToRemove = null;
List traitNamesToAdd= null;
-if (traitNames != null) {
-for (String traitName : traitNames) {
-if (traitVertexNames == null ||
!traitVertexNames.contains(traitName)) {
-if (traitNamesToRemove == null) {
-traitNamesToRemove = new ArrayList<>();
-}
-
-traitNamesToRemove.add(traitName);
+for (String traitName : traitNames) {
+if (!traitVertexNames.contains(traitName)) {
+if (traitNamesToRemove == null) {
+traitNamesToRemove = new ArrayList<>();
}
+
+traitNamesToRemove.add(traitName);
}
}
-if (traitVertexNames != null) {
-for (String traitVertexName : traitVertexNames) {
-if (traitNames == null ||
!traitNames.contains(traitVertexName)) {
-if (traitNamesToAdd == null) {
-traitNamesToAdd = new ArrayList<>();
-}
-
-traitNamesToAdd.add(traitVertexName);
+for (String traitVertexName : traitVertexNames) {
+if (!traitNames.contains(traitVertexName)) {
+if (traitNamesToAdd == null) {
+traitNamesToAdd = new ArrayList<>();
}
+
+traitNamesToAdd.add(traitVertexName);
}
}
[2/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
http://git-wip-us.apache.org/repos/asf/atlas/blob/92775315/dashboardv2/package-lock.json
--
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
new file mode 100644
index 000..2d715ed
--- /dev/null
+++ b/dashboardv2/package-lock.json
@@ -0,0 +1,7378 @@
+{
+ "name": "atlas-metadata",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+"abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz;,
+ "integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+},
+"accepts": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz;,
+ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+ "dev": true,
+ "requires": {
+"mime-types": "2.1.21",
+"negotiator": "0.6.1"
+ }
+},
+"ajv": {
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz;,
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+ "dev": true,
+ "requires": {
+"co": "4.6.0",
+"fast-deep-equal": "1.1.0",
+"fast-json-stable-stringify": "2.0.0",
+"json-schema-traverse": "0.3.1"
+ }
+},
+"align-text": {
+ "version": "0.1.4",
+ "resolved":
"https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz;,
+ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+ "dev": true,
+ "requires": {
+"kind-of": "3.2.2",
+"longest": "1.0.1",
+"repeat-string": "1.6.1"
+ }
+},
+"almond": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz;,
+ "integrity": "sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA="
+},
+"amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz;,
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+},
+"ansi-regex": {
+ "version": "2.1.1",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+},
+"ansi-styles": {
+ "version": "2.2.1",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz;,
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "dev": true
+},
+"aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz;,
+ "integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+ "dev": true
+},
+"are-we-there-yet": {
+ "version": "1.1.5",
+ "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz;,
+ "integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+ "dev": true,
+ "requires": {
+"delegates": "1.0.0",
+"readable-stream": "2.3.6"
+ }
+},
+"argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz;,
+ "integrity":
"sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "requires": {
+"sprintf-js": "1.0.3"
+ }
+},
+"array-differ": {
+ "version": "1.0.0",
+ "resolved":
"https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz;,
+ "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+ "dev": true
+},
+"array-find-index": {
+ "version": "1.0.2",
+ "resolved":
"https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz;,
+ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+ "dev": true
+},
+"array-union": {
+ "version": "1.0.2",
+ "resolved":
"https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz;,
+ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+ "dev": true,
+ "requires": {
+"array-uniq": "1.0.3"
+ }
+},
+"array-uniq": {
+ "version": "1.0.3",
+ "resolved":
"https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz;,
+ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+ "dev": true
+},
+"arrify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz;,
+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+ "dev": true
+},
+"asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz;,
+ "integrity":
"sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "dev": true,
+ "requires": {
+
[3/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
ATLAS-2935 : UI: Update node/NPM version and add package-lock.json Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/92775315 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/92775315 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/92775315 Branch: refs/heads/master Commit: 927753159b12d7415bd891a67b94c39cbc133689 Parents: 756c272 Author: kevalbhatt Authored: Thu Oct 25 10:25:17 2018 +0530 Committer: nixonrodrigues Committed: Thu Oct 25 12:56:14 2018 +0530 -- dashboardv2/package-lock.json | 7378 dashboardv2/package.json |4 - dashboardv2/pom.xml |2 +- pom.xml |3 +- 4 files changed, 7381 insertions(+), 6 deletions(-) --
[3/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
ATLAS-2935 : UI: Update node/NPM version and add package-lock.json Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/7aebca8a Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/7aebca8a Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/7aebca8a Branch: refs/heads/branch-1.0 Commit: 7aebca8ad1146ed289bd6e22eebe95894e2198fd Parents: 9653cc5 Author: kevalbhatt Authored: Thu Oct 25 10:25:17 2018 +0530 Committer: nixonrodrigues Committed: Thu Oct 25 14:21:01 2018 +0530 -- dashboardv2/package-lock.json | 7378 dashboardv2/package.json |4 - dashboardv2/pom.xml |2 +- pom.xml |3 +- 4 files changed, 7381 insertions(+), 6 deletions(-) --
[3/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
ATLAS-2935 : UI: Update node/NPM version and add package-lock.json Signed-off-by: nixonrodrigues Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/5c3afa68 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/5c3afa68 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/5c3afa68 Branch: refs/heads/branch-0.8 Commit: 5c3afa68bf1adc8e6d35876a01fd3e837aa1b823 Parents: 8f99ffe Author: kevalbhatt Authored: Thu Oct 25 10:41:50 2018 +0530 Committer: nixonrodrigues Committed: Thu Oct 25 14:19:57 2018 +0530 -- dashboardv2/package-lock.json | 4629 dashboardv2/package.json | 22 +- dashboardv2/pom.xml |2 +- pom.xml |3 +- 4 files changed, 4641 insertions(+), 15 deletions(-) --
[2/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
http://git-wip-us.apache.org/repos/asf/atlas/blob/7aebca8a/dashboardv2/package-lock.json
--
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
new file mode 100644
index 000..2d715ed
--- /dev/null
+++ b/dashboardv2/package-lock.json
@@ -0,0 +1,7378 @@
+{
+ "name": "atlas-metadata",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+"abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz;,
+ "integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+},
+"accepts": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz;,
+ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+ "dev": true,
+ "requires": {
+"mime-types": "2.1.21",
+"negotiator": "0.6.1"
+ }
+},
+"ajv": {
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz;,
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+ "dev": true,
+ "requires": {
+"co": "4.6.0",
+"fast-deep-equal": "1.1.0",
+"fast-json-stable-stringify": "2.0.0",
+"json-schema-traverse": "0.3.1"
+ }
+},
+"align-text": {
+ "version": "0.1.4",
+ "resolved":
"https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz;,
+ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+ "dev": true,
+ "requires": {
+"kind-of": "3.2.2",
+"longest": "1.0.1",
+"repeat-string": "1.6.1"
+ }
+},
+"almond": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz;,
+ "integrity": "sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA="
+},
+"amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz;,
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+},
+"ansi-regex": {
+ "version": "2.1.1",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+},
+"ansi-styles": {
+ "version": "2.2.1",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz;,
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "dev": true
+},
+"aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz;,
+ "integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+ "dev": true
+},
+"are-we-there-yet": {
+ "version": "1.1.5",
+ "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz;,
+ "integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+ "dev": true,
+ "requires": {
+"delegates": "1.0.0",
+"readable-stream": "2.3.6"
+ }
+},
+"argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz;,
+ "integrity":
"sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "requires": {
+"sprintf-js": "1.0.3"
+ }
+},
+"array-differ": {
+ "version": "1.0.0",
+ "resolved":
"https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz;,
+ "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+ "dev": true
+},
+"array-find-index": {
+ "version": "1.0.2",
+ "resolved":
"https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz;,
+ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+ "dev": true
+},
+"array-union": {
+ "version": "1.0.2",
+ "resolved":
"https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz;,
+ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+ "dev": true,
+ "requires": {
+"array-uniq": "1.0.3"
+ }
+},
+"array-uniq": {
+ "version": "1.0.3",
+ "resolved":
"https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz;,
+ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+ "dev": true
+},
+"arrify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz;,
+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+ "dev": true
+},
+"asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz;,
+ "integrity":
"sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "dev": true,
+ "requires": {
+
[2/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
http://git-wip-us.apache.org/repos/asf/atlas/blob/5c3afa68/dashboardv2/package-lock.json
--
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
new file mode 100644
index 000..10c0f8e
--- /dev/null
+++ b/dashboardv2/package-lock.json
@@ -0,0 +1,4629 @@
+{
+ "name": "atlas-metadata",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+"abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz;,
+ "integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+},
+"accepts": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz;,
+ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+ "dev": true,
+ "requires": {
+"mime-types": "2.1.21",
+"negotiator": "0.6.1"
+ }
+},
+"ajv": {
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz;,
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+ "dev": true,
+ "requires": {
+"co": "4.6.0",
+"fast-deep-equal": "1.1.0",
+"fast-json-stable-stringify": "2.0.0",
+"json-schema-traverse": "0.3.1"
+ }
+},
+"align-text": {
+ "version": "0.1.4",
+ "resolved":
"https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz;,
+ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+ "dev": true,
+ "requires": {
+"kind-of": "3.2.2",
+"longest": "1.0.1",
+"repeat-string": "1.6.1"
+ },
+ "dependencies": {
+"kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz;,
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+"is-buffer": "1.1.6"
+ }
+}
+ }
+},
+"almond": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz;,
+ "integrity": "sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA="
+},
+"amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz;,
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+},
+"ansi-regex": {
+ "version": "2.1.1",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+},
+"ansi-styles": {
+ "version": "3.2.1",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz;,
+ "integrity":
"sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+"color-convert": "1.9.3"
+ }
+},
+"aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz;,
+ "integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+ "dev": true
+},
+"are-we-there-yet": {
+ "version": "1.1.5",
+ "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz;,
+ "integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+ "dev": true,
+ "requires": {
+"delegates": "1.0.0",
+"readable-stream": "2.3.6"
+ }
+},
+"argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz;,
+ "integrity":
"sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "requires": {
+"sprintf-js": "1.0.3"
+ },
+ "dependencies": {
+"sprintf-js": {
+ "version": "1.0.3",
+ "resolved":
"https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz;,
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "dev": true
+}
+ }
+},
+"arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz;,
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "dev": true
+},
+"arr-flatten": {
+ "version": "1.1.0",
+ "resolved":
"https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz;,
+ "integrity":
"sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "dev": true
+},
+"arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz;,
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+ "dev": true
+},
+
[1/3] atlas git commit: ATLAS-2935 : UI: Update node/NPM version and add package-lock.json
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 8f99ffedf -> 5c3afa68b
http://git-wip-us.apache.org/repos/asf/atlas/blob/5c3afa68/dashboardv2/package.json
--
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index 7144e67..b6643df 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -12,10 +12,6 @@
"dev-minify": "grunt dev-minify",
"build-minify": "grunt build-minify"
},
- "engines": {
-"node": "4.4.x",
-"npm": "3.8.x"
- },
"keywords": [
"Apache",
"Atlas"
@@ -54,18 +50,18 @@
"underscore": "1.8.3"
},
"devDependencies": {
-"grunt": "^1.0.1",
-"grunt-cli": "^1.2.0",
-"grunt-contrib-clean": "^1.1.0",
-"grunt-contrib-connect": "^1.0.0",
-"grunt-contrib-copy": "^1.0.0",
+"grunt": "1.0.2",
+"grunt-cli": "1.2.0",
+"grunt-contrib-clean": "1.1.0",
+"grunt-contrib-connect": "1.0.2",
+"grunt-contrib-copy": "1.0.0",
"grunt-contrib-cssmin": "2.0.0",
"grunt-contrib-htmlmin": "2.2.0",
"grunt-contrib-uglify": "2.1.0",
-"grunt-contrib-watch": "^1.0.0",
-"grunt-middleware-proxy": "^1.0.7",
-"grunt-sass": "^1.1.0",
+"grunt-contrib-watch": "1.0.0",
+"grunt-middleware-proxy": "1.0.7",
+"grunt-sass": "2.1.0",
"grunt-template": "1.0.0",
-"load-grunt-tasks": "^3.1.0"
+"load-grunt-tasks": "3.5.2"
}
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/5c3afa68/dashboardv2/pom.xml
--
diff --git a/dashboardv2/pom.xml b/dashboardv2/pom.xml
index 9c5a676..53430e5 100644
--- a/dashboardv2/pom.xml
+++ b/dashboardv2/pom.xml
@@ -95,7 +95,7 @@
${node-for-v2.version}
-3.8.5
+${npm-for-v2.version}
http://git-wip-us.apache.org/repos/asf/atlas/blob/5c3afa68/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 40d483b..1609bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,7 +502,8 @@
UTF-8
UTF-8
v0.10.30
-v4.4.2
+v8.9.0
+5.5.1
1.7.21
8.1.19.v20160209
9.2.12.v20150709
