Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge staging into RC #552

Merged
merged 11 commits into from
May 2, 2024
Merged

Merge staging into RC #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fbad8fb
Proper read file
Martin-Zeithaml Apr 10, 2024
4555e87
Merge pull request #545 from zowe/readManifest
1000TurquoisePogs Apr 12, 2024
96db748
bump axios 1.6.8 to resolve follow-redirects vuln
timgerstel Apr 23, 2024
15480b2
Bump express 4.18.0 -> 4.19.2
timgerstel Apr 23, 2024
c0a2358
Merge pull request #547 from zowe/deps/axios1.6.8v2
timgerstel Apr 25, 2024
e4dd4c9
Merge branch 'v2.x/staging' into deps/express4.19.2
timgerstel Apr 25, 2024
0924297
Axios update
Martin-Zeithaml Apr 30, 2024
a1180c0
Merge pull request #548 from zowe/deps/express4.19.2
1000TurquoisePogs Apr 30, 2024
d05c04e
Merge branch 'v2.x/staging' into v2.x/axiosUpdate
1000TurquoisePogs Apr 30, 2024
806be15
Merge pull request #550 from zowe/v2.x/axiosUpdate
1000TurquoisePogs Apr 30, 2024
5e6323b
fix merge
May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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) {
Expand Down
131 changes: 32 additions & 99 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading