From b87133c3d3c0508e2926adba90f618ea67cd062f Mon Sep 17 00:00:00 2001 From: "whitesource-demo[bot]" <84482073+whitesource-demo[bot]@users.noreply.github.com> Date: Sat, 20 Nov 2021 05:38:13 +0000 Subject: [PATCH 1/9] Add .whitesource configuration file --- .whitesource | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .whitesource diff --git a/.whitesource b/.whitesource new file mode 100644 index 00000000..a7b9e85a --- /dev/null +++ b/.whitesource @@ -0,0 +1,3 @@ +{ + "settingsInheritedFrom": "rjg-ws-demo/whitesource-config@main" +} \ No newline at end of file From 591ecd55a807c4e18a6767a45c36e169e579ec4e Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Thu, 20 Jan 2022 16:20:40 -0600 Subject: [PATCH 2/9] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7841e55c..ef30a55b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "node server.js" + "start": "node server.js", + "install": "echo \"install script running...\" && exit 0" }, "author": "sns", "license": "MIT", From 980c0952db89c14b682fd00da6ccd97dde3a06fd Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Thu, 20 Jan 2022 16:22:18 -0600 Subject: [PATCH 3/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef30a55b..e6cfd8c0 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ejs": "^2.5.7", "express": "^4.16.2", "express-fileupload": "^0.4.0", - "express-flash": "0.0.2", + "express-flash": "0.0.3", "express-session": "^1.15.6", "flash": "^1.1.0", "libxmljs": "^0.19.1", From f2636080bc8a44a76bb7dec05677ec437993a754 Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Thu, 20 Jan 2022 16:25:33 -0600 Subject: [PATCH 4/9] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e6cfd8c0..5b235582 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "start": "node server.js", - "install": "echo \"install script running...\" && exit 0" + "preinstall": "echo \"install script running...\" && exit 0" }, "author": "sns", "license": "MIT", @@ -19,7 +19,7 @@ "ejs": "^2.5.7", "express": "^4.16.2", "express-fileupload": "^0.4.0", - "express-flash": "0.0.3", + "express-flash": "0.0.2", "express-session": "^1.15.6", "flash": "^1.1.0", "libxmljs": "^0.19.1", From 503bfe2b225a58f0ca9225e756fcd5fbaccc5d86 Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Thu, 20 Jan 2022 16:33:43 -0600 Subject: [PATCH 5/9] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5b235582..3705fd78 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "start": "node server.js", - "preinstall": "echo \"install script running...\" && exit 0" + "preinstall": "echo \"install script running...\" && exit 1" }, "author": "sns", "license": "MIT", @@ -27,7 +27,7 @@ "md5": "^2.2.1", "morgan": "^1.9.0", "mysql2": "^1.4.2", - "node-serialize": "0.0.4", + "node-serialize": "0.0.3", "passport": "^0.4.0", "passport-local": "^1.0.0", "sequelize": "^4.13.10", From 2697ebb8e169e361090911ccc47bcc6eafe44e07 Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Thu, 20 Jan 2022 16:42:39 -0600 Subject: [PATCH 6/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3705fd78..d4e13989 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "author": "sns", "license": "MIT", "dependencies": { - "bcrypt": "^1.0.3", + "bcrypt": "^5.0.0", "csurf": "^1.9.0", "ejs": "^2.5.7", "express": "^4.16.2", From ff3c27856fb8c2ee8161be42928eb84863d38772 Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Tue, 25 Jan 2022 11:01:31 -0600 Subject: [PATCH 7/9] Update .whitesource Add dev to baseBranches --- .whitesource | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index a7b9e85a..2557eba9 100644 --- a/.whitesource +++ b/.whitesource @@ -1,3 +1,6 @@ { "settingsInheritedFrom": "rjg-ws-demo/whitesource-config@main" -} \ No newline at end of file + "scanSettings": { + "baseBranches": ["master","dev"] + } +} From 5e015f5562076f6e3488fa550b346cebc526f65b Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Tue, 25 Jan 2022 11:39:35 -0600 Subject: [PATCH 8/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d4e13989..9662c869 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "flash": "^1.1.0", "libxmljs": "^0.19.1", "mathjs": "3.10.1", - "md5": "^2.2.1", + "md5": "^2.2.2", "morgan": "^1.9.0", "mysql2": "^1.4.2", "node-serialize": "0.0.3", From 56e2694d413d47bb98aef0c035799c193b30b0af Mon Sep 17 00:00:00 2001 From: Randy Geyer - WS Date: Tue, 25 Jan 2022 11:41:03 -0600 Subject: [PATCH 9/9] Update .whitesource fix json --- .whitesource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.whitesource b/.whitesource index 2557eba9..ecc1e280 100644 --- a/.whitesource +++ b/.whitesource @@ -1,5 +1,5 @@ { - "settingsInheritedFrom": "rjg-ws-demo/whitesource-config@main" + "settingsInheritedFrom": "rjg-ws-demo/whitesource-config@main", "scanSettings": { "baseBranches": ["master","dev"] }