diff --git a/system-apps/web-browser-app/nodeServer/package-lock.json b/system-apps/web-browser-app/nodeServer/package-lock.json index dd6a09591..9d62586f4 100644 --- a/system-apps/web-browser-app/nodeServer/package-lock.json +++ b/system-apps/web-browser-app/nodeServer/package-lock.json @@ -8,7 +8,7 @@ "name": "org.zowe.zlux.ng2desktop.webbrowser.nodeserver", "version": "1.1.1", "dependencies": { - "http-proxy": "^1.18.0" + "http-proxy": "^1.18.1" }, "devDependencies": { "@types/express": "^4.16.1", @@ -108,9 +108,9 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "node_modules/follow-redirects": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", - "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -250,9 +250,9 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "follow-redirects": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", - "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "http-proxy": { "version": "1.18.1", @@ -260,7 +260,7 @@ "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", + "follow-redirects": ">=1.15.6", "requires-port": "^1.0.0" } }, diff --git a/system-apps/web-browser-app/nodeServer/package.json b/system-apps/web-browser-app/nodeServer/package.json index a809278b4..bf954d433 100644 --- a/system-apps/web-browser-app/nodeServer/package.json +++ b/system-apps/web-browser-app/nodeServer/package.json @@ -7,12 +7,17 @@ "start": "tsc --watch" }, "dependencies": { - "http-proxy": "^1.18.0" + "http-proxy": "^1.18.1" }, "devDependencies": { "@types/express": "^4.16.1", "@types/http-proxy": "^1.17.3", "@types/node": "8.10.59", "typescript": "~4.2.0" - } + }, + "overrides": { + "http-proxy": { + "follow-redirects": ">=1.15.6" + } +} } diff --git a/virtual-desktop/src/app/authentication-manager/login/login.component.html b/virtual-desktop/src/app/authentication-manager/login/login.component.html index 6968f1b83..5775206a7 100644 --- a/virtual-desktop/src/app/authentication-manager/login/login.component.html +++ b/virtual-desktop/src/app/authentication-manager/login/login.component.html @@ -69,6 +69,7 @@ +

The Version 2 Desktop is now in maintenance status for the duration of the Zowe Version 2 maintenance schedule.

{{getPluginVersion()}}