From 9cfe10b3b897ee3a956b2f1c6f4983b10a54cc79 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Tue, 5 Oct 2021 12:38:02 +0200
Subject: [PATCH 1/2] Fix npm audit issues

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 Gruntfile.js | 23 +----------------------
 package.json | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 89a9b6f..513ab1d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -119,26 +119,6 @@ module.exports = function(grunt) {
                 }
             },
             file: 'package.json'
-        },
-        mocha_istanbul: {
-            local: {
-                src: 'test/', // the folder, not the files
-                options: {
-                    ui: 'bdd',
-                    coverage: true,
-                    recursive: true,
-                    reporter: 'list',
-                    timeout: 20000,
-                    check: {
-                        lines: 60,
-                        statements: 60,
-                        function: 60
-                    },
-                    root: '.', // define where the cover task should consider the root of libraries that are covered by tests
-                    coverageFolder: 'dist/coverage',
-                    reportFormats: ['lcov']
-                }
-            }
         }
     });
 
@@ -147,7 +127,6 @@ module.exports = function(grunt) {
         done();
     });
 
-    grunt.loadNpmTasks('grunt-mocha-istanbul');
     // Load the plugin that provides the "uglify" task.
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-eslint');
@@ -156,7 +135,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-shell');
 
     // Default task(s).
-    grunt.registerTask('default', ['eslint:local', 'jshint:local', 'mocha_istanbul:local']);
+    grunt.registerTask('default', ['eslint:local', 'jshint:local']);
     grunt.registerTask('validate', ['eslint:local', 'jshint:local']);
     grunt.registerTask('teamcity_codevalidation', ['jshint:teamcity']);
 
diff --git a/package.json b/package.json
index 0b51661..4865ee9 100644
--- a/package.json
+++ b/package.json
@@ -1,41 +1,41 @@
 {
   "name": "iotkit-websocket-server",
   "version": "0.13.0",
-  "date": "2015-10-09T16:41:13.796Z",
+  "date": "2021-10-05T10:32:39.504Z",
   "description": "Websocket server for iotkit agents",
   "main": "server.js",
   "dependencies": {
-    "request": "^2.34.0",
     "async": "^2.6.1",
-    "log4js": "^3.0.5",
     "hooker": "^0.2.3",
-    "websocket": "^1.0.18",
-    "winston": "^3.1.0",
-    "pg-hstore": "2.3.2",
-    "pg": "7.5.0",
-    "kafka-node": "^3.0.1",
+    "kafka-node": "^5.0.0",
     "keycloak-connect": "^12.0.2",
+    "log4js": "^3.0.5",
+    "pg": "7.5.0",
+    "pg-hstore": "2.3.2",
+    "redis": "^3.1.2",
+    "request": "^2.34.0",
     "uuid": "3.3.2",
-    "redis": "^2.8.0"
+    "websocket": "^1.0.18",
+    "winston": "^3.1.0"
   },
   "author": "Intel, CPG",
   "devDependencies": {
+    "asserts": "^4.0.0",
+    "chai": "^4.2.0",
     "grunt": "^1.0.3",
-    "mocha": "^5.2.0",
-    "istanbul": "^0.4.5",
-    "rewire": "^4.0.1",
+    "grunt-bumpup": "^0.6.3",
     "grunt-cli": "^1.3.1",
+    "grunt-contrib-compress": "^1.4.3",
     "grunt-contrib-jshint": "^2.0.0",
     "grunt-eslint": "^21.0.0",
-    "mocha-teamcity-reporter": "2.5.1",
-    "jshint-teamcity": "^1.0.4",
-    "asserts": "^4.0.0",
-    "chai": "^4.2.0",
-    "grunt-contrib-compress": "^1.4.3",
-    "grunt-mocha-istanbul": "^5.0.2",
     "grunt-istanbul": "^0.8.0",
-    "sinon": "^6.3.5",
-    "grunt-bumpup": "^0.6.3",
-    "grunt-shell": "^2.1.0"
+    "grunt-mocha-istanbul": "^5.0.2",
+    "grunt-shell": "^2.1.0",
+    "istanbul": "^0.4.5",
+    "jshint-teamcity": "^1.0.4",
+    "mocha": "^9.1.2",
+    "mocha-teamcity-reporter": "2.5.1",
+    "rewire": "^4.0.1",
+    "sinon": "^6.3.5"
   }
 }

From e408b2575c8dde2eaecb8831dce5e83f5a3e0a5a Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Thu, 7 Oct 2021 09:50:02 +0200
Subject: [PATCH 2/2] Update circleci scripts to use ubuntu20.04 setup script

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e11b660..cefadf6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ commands:
           name: Setup build environment
           command: |
             cd platform-launcher/util && \
-            bash setup-ubuntu18.04.sh
+            bash setup-ubuntu20.04.sh
   checkout-e2e:
     description: "Checkout E2E test"
     parameters: