From 25a6e68eaec3ccdb9e3c3a27415240c028b7618b Mon Sep 17 00:00:00 2001
From: vamsee <vamseerama_c@infosys.com>
Date: Wed, 17 Jul 2019 19:37:46 +0530
Subject: [PATCH 1/2] Updated version to 2.1.0

---
 .gitlab-ci.yml             | 9 ++++-----
 package.json               | 8 ++++----
 test/component-config.json | 3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc32285..ab1f5d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,11 +33,10 @@ npminstall:
     - time npm install --no-optional
     - echo "Node Modules Installed"
     - npm config delete registry
-    - npm audit --json >vulnerabilities.json
-    - status_vulnerabilities=`echo $?`
-    - npm audit
-    - if [ $status_vulnerabilities == 1 ]; then exit_status=1 && echo "Dependency vulnerabilities exist"; fi
-    - if [ $exit_status == 1 ]; then exit $exit_status; fi    
+    - npm audit --json > ./artifacts/${CI_PROJECT_NAME}/vulnerabilities.json || true
+    - if npm audit; then status_vulnerabilities=0; else status_vulnerabilities=1; fi
+    - if [ $status_vulnerabilities == 1 ]; then echo "Dependency vulnerabilities exist"; fi
+    - if [ $exit_status == 1 ]; then exit $exit_status; fi
   artifacts:
     untracked: true
     expire_in: 2h
diff --git a/package.json b/package.json
index 5d6a937..0e8444f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oe-migration",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "This module is an app-list module for oe-Cloud based applications. It provides the ability to perform data migration and/or data seeding into the app db from json files",
   "engines": {
     "node": ">=6"
@@ -24,7 +24,7 @@
     "chai-things": "0.2.0",
     "chalk": "1.1.1",
     "eslint": "4.10.0",
-    "grunt": "1.0.3",
+    "grunt": "1.0.4",
     "grunt-banner": "0.6.0",
     "grunt-cli": "1.3.2",
     "grunt-contrib-clean": "2.0.0",
@@ -35,10 +35,10 @@
     "grunt-mocha-test": "0.13.3",
     "istanbul": "0.4.5",
     "mocha": "5.2.0",
-    "oe-cloud": "git+http://evgit/oecloud.io/oe-cloud.git#2.0.0",
+    "oe-cloud": "git+http://evgit/oecloud.io/oe-cloud.git#2.1.0",
     "loopback-connector-mongodb": "3.9.2",
     "oe-connector-postgresql": "git+http://evgit/oecloud.io/oe-connector-postgresql.git#2.0.0",
-    "oe-multi-tenancy": "git+http://evgit/oecloud.io/oe-multi-tenancy.git#2.0.0",
+    "oe-multi-tenancy": "git+http://evgit/oecloud.io/oe-multi-tenancy.git#2.1.0",
     "superagent-defaults": "0.1.14",
     "supertest": "3.4.2"
   },
diff --git a/test/component-config.json b/test/component-config.json
index f36959a..2c63c08 100644
--- a/test/component-config.json
+++ b/test/component-config.json
@@ -1,5 +1,2 @@
 {
-  "loopback-component-explorer": {
-    "mountPath": "/explorer"
-  }
 }

From 342f69320e61c8e710f9e36e699207315b4a6cf3 Mon Sep 17 00:00:00 2001
From: vamsee <vamseerama_c@infosys.com>
Date: Thu, 18 Jul 2019 11:52:30 +0530
Subject: [PATCH 2/2] creating artifacts folder to store audit info

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab1f5d7..a01d059 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ npminstall:
     - time npm install --no-optional
     - echo "Node Modules Installed"
     - npm config delete registry
+    - mkdir -p ./artifacts/${CI_PROJECT_NAME}/
     - npm audit --json > ./artifacts/${CI_PROJECT_NAME}/vulnerabilities.json || true
     - if npm audit; then status_vulnerabilities=0; else status_vulnerabilities=1; fi
     - if [ $status_vulnerabilities == 1 ]; then echo "Dependency vulnerabilities exist"; fi