diff --git a/.dependency/zwe_doc_generation/md-content.js b/.dependency/zwe_doc_generation/md-content.js index 736cb5f496..bc0e6bd11b 100644 --- a/.dependency/zwe_doc_generation/md-content.js +++ b/.dependency/zwe_doc_generation/md-content.js @@ -46,7 +46,7 @@ function generateDocumentationForNode(curNode, assembledParentNode) { docContent += createDocContent(assembledDocNode[docType.fileName].content, docType); const parentDocContent = createDocContent(assembledDocNode[docType.fileName].parentContent, docType); if (parentDocContent) { - docContent += SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent; + docContent += SEPARATOR + SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent; } } diff --git a/bin/commands/components/search/.parameters b/bin/commands/components/search/.parameters index 2d659cee46..d24d7ca8ad 100644 --- a/bin/commands/components/search/.parameters +++ b/bin/commands/components/search/.parameters @@ -1,5 +1,5 @@ component-name,component|o|string|||||Component name to search for. component-id,id|d|string|||||Component id to search for. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. diff --git a/bin/commands/components/uninstall/.parameters b/bin/commands/components/uninstall/.parameters index 38f0184402..d5cc61584c 100644 --- a/bin/commands/components/uninstall/.parameters +++ b/bin/commands/components/uninstall/.parameters @@ -1,4 +1,4 @@ component-name,component|o|string|required||||The name of an installed component. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available \ No newline at end of file diff --git a/bin/commands/components/upgrade/.parameters b/bin/commands/components/upgrade/.parameters index a2556d5830..b1cc825579 100644 --- a/bin/commands/components/upgrade/.parameters +++ b/bin/commands/components/upgrade/.parameters @@ -1,4 +1,4 @@ component-file,component|o|string|required||||Either a path or component name. The path must be to a component package or directory. If a name is specified instead, install checks the zowe package registry. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available \ No newline at end of file diff --git a/bin/libs/shell.ts b/bin/libs/shell.ts index dc29b57e0a..1a5581616a 100644 --- a/bin/libs/shell.ts +++ b/bin/libs/shell.ts @@ -73,10 +73,10 @@ export function execOutSync(command: string, ...args: string[]): ExecReturn { return { rc: -1 }; } const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1]}); + os.close(pipeArray[1]); let out = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); return { rc, out @@ -94,11 +94,11 @@ export function execErrSync(command: string, ...args: string[]): ExecReturn { if (!pipeArray){ return { rc: -1 }; } - const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]}); - + const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]}); + os.close(pipeArray[1]); + let err = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); return { rc, err @@ -117,16 +117,17 @@ export function execOutErrSync(command: string, ...args: string[]): ExecReturn { return { rc: -1 }; } const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1], stderr: errArray[1]}); + os.close(pipeArray[1]); + os.close(errArray[1]); let out = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); - + let err = readStreamFully(errArray[0]); os.close(errArray[0]); - os.close(errArray[1]); + return { - rc, err + rc, out, err }; } diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts index 94370a5f29..b49e81451b 100644 --- a/bin/libs/zos.ts +++ b/bin/libs/zos.ts @@ -25,6 +25,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } { common.printTrace(` * Exit code: ${result.rc}`); common.printTrace(" * Output:"); if (result.out) { + result.out = result.out.substring(0, result.out.length - 1); common.printTrace(stringlib.paddingLeft(result.out, " ")); } } else { @@ -35,8 +36,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } { common.printError(stringlib.paddingLeft(result.out, " ")); } } - //we strip the '.' we added above - return { rc: result.rc, out: result.out ? result.out.substring(0, result.out.length-1) : '' }; + return { rc: result.rc, out: result.out ? result.out : '' }; } export function operatorCommand(command: string): { rc: number, out: string } { diff --git a/manifest.json.template b/manifest.json.template index c5684fcde9..5f61f9f39c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.11.0", + "version": "2.12.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,51 +12,51 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.11.0-RC", + "version": "2.12.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.11.0-20230905.133406.pax" + "artifact": "zlux-core-2.12.0-20231011.233707.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" + "artifact": "sample-angular-app-2.12.0-20231011.232819.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" + "artifact": "sample-iframe-app-2.12.0-20231011.232637.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.11.0-20230829.202650.pax" + "artifact": "sample-react-app-2.12.0-20231011.232821.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" + "artifact": "tn3270-ng2-2.12.0-20231011.232650.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.11.0-20230829.202549.pax" + "artifact": "vt-ng2-2.12.0-20231011.232650.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.11.0-20230829.202844.pax" + "artifact": "zlux-editor-2.12.0-20231011.233114.pax" }, "org.zowe.zss": { - "version": "2.11.0-RC", + "version": "2.12.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.11.0-rc-974-20230906160141.pax" + "artifact": "zss-2.12.0-rc-1011-20231016182429.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.19", + "version": "2.0.22", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.19", + "version": "2.0.22", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,25 +101,25 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.11.0", + "version": "2.12.2", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023090632.pax" + "artifact": "configmgr-rexx-2.12.0-2023101644.pax" }, "org.zowe.configmgr": { - "version": "2.11.0-V2.X-RC", + "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023090629.pax" + "artifact": "configmgr-2.12.0-2023101637.pax" }, "org.zowe.launcher": { - "version": "2.0.13" + "version": "2.12.0" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "zowe_licenses_full.zip" } }, @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.18.1", + "tag": "v5.18.2", "destinations": ["Zowe CLI Package"] }] }, { @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.11.0-RC1", + "tag": "zss-v2.12.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.4", + "tag": "v7.18.7", "destinations": ["Zowe CLI Package"] }] }, { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.23", + "tag": "2.0.26", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.19", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.19", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.11.0-RC1", + "tag": "v2.12.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -381,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v2.10.0", + "tag": "v2.11.2", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.11.0-RC1", + "tag": "configmgr-v2.12.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -406,33 +406,33 @@ "zowe-launch-scripts": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "explorer-ip": { "kind": "job", @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.19-ubuntu" + "tag" : "2.0.22-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.19-ubuntu" + "tag" : "2.0.22-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 6ca8f40fd6..7675df3320 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29286 +IO29287 +IO29288 IO29185 IO29186 IO29187 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index e6cdaaabd2..ad937b94d8 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29286 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29287 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29288 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29185 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 30c27af2ab..e4a768ccd8 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90031) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23255) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90022) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23208) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 0e26b90913..0867777fc6 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90031 +UO90032 UO90022 UO90023 UO90020 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 10917e71c8..ac0efb82f1 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -17,5 +17,5 @@ #UO90018 UO90019 - IO29174 IO29175 IO29176 - Wed Apr 26 22:58:46 UTC 2023 #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 -UO90031 UO90032 - IO29286 IO29287 IO29288 +#UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file