Merge pull request #552 from zowe/users/jstruga/merge-staging-into-rc

Merge staging into RC
zowe · May 2, 2024 · d1460e0 · d1460e0
2 parents e1fd845 + 5e6323b
commit d1460e0
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 135 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -19,7 +19,6 @@ if (!global.COM_RS_COMMON_LOGGER) {
 
 const path = require('path');
 const fs = require('fs');
-const fsPromises = require('node:fs/promises');
 const Promise = require('bluebird');
 const ipaddr = require('ipaddr.js');
 const dns = require('dns');
@@ -97,7 +96,7 @@ let zoweVersion = "0.0.0";
 module.exports.setZoweVersionFromManifest = function setZoweVersionFromManifest(zoweConfig) {
   if (zoweConfig.zowe.runtimeDirectory) {
     try {
-      const contents = fsPromises.readFileSync(path.join(zoweConfig.zowe.runtimeDirectory, 'manifest.json'), {encoding: 'utf8'});
+      const contents = fs.readFileSync(path.join(zoweConfig.zowe.runtimeDirectory, 'manifest.json'), {encoding: 'utf8'});
       if (contents) {
         const asJson = JSON.parse(contents);
         if (asJson.version) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,12 +40,12 @@
     "@rocketsoftware/eureka-js-client": "~4.5.6",
     "@rocketsoftware/express-ws": "^5.0.0",
     "accept-language-parser": "~1.5.0",
-    "axios": "^1.6.7",
+    "axios": "^1.6.8",
     "bluebird": "~3.5.1",
     "body-parser": "~1.20.0",
     "cookie-parser": "~1.4.3",
     "diffie-hellman": "^5.0.3",
-    "express": "~4.18.0",
+    "express": "~4.19.2",
     "express-session": "~1.15.6",
     "express-static-gzip": "~1.1.3",
     "glob": "~7.1.3",