From c5566f24e48cc74bdab7efe350735ef5e15740cd Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 12 Sep 2023 18:27:06 +0000 Subject: [PATCH 01/19] Promote PTF after release v2.11.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) 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 From 7bb64b04e4f12db7eefa0f7cd29d5a11fa6d1ff6 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 12 Sep 2023 15:11:19 -0400 Subject: [PATCH 02/19] update manifest back to staging version Signed-off-by: ojcelis --- manifest.json.template | 316 ++++++++++++++++++++--------------------- 1 file changed, 155 insertions(+), 161 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5684fcde9..bfd04cc9fa 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,126 +12,128 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.11.0-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.11.0-20230905.133406.pax" + "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", + "artifact": "*.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.11.0-20230829.202650.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.11.0-20230829.202549.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.11.0-20230829.202844.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zss": { - "version": "2.11.0-RC", - "repository": "libs-snapshot-local", - "artifact": "zss-2.11.0-rc-974-20230906160141.pax" + "version": "^2.0.0-STAGING", + "artifact": "*.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.19", - "artifact": "jobs-api-package-*.zip" + "version": "^2.0.7-SNAPSHOT", + "artifact": "jobs-api-package-*.zip", + "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.19", - "artifact": "files-api-package-*.zip" + "version": "^2.0.7-SNAPSHOT", + "artifact": "files-api-package-*.zip", + "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer-jes": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-mvs": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-uss": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-ip": { - "version": "2.0.0", - "artifact": "explorer-ip*.pax" + "version": "~2.0.0-SNAPSHOT", + "artifact": "*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.11.0", - "artifact": "api-catalog*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "api-catalog-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.discovery-package": { - "version": "2.11.0", - "artifact": "discovery*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "discovery-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.gateway-package": { - "version": "2.11.0", - "artifact": "gateway*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.caching-service-package": { - "version": "2.11.0", - "artifact": "caching-service*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "caching-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.metrics-service-package": { - "version": "2.11.0", - "artifact": "metrics-service*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "metrics-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.11.0", - "artifact": "apiml-common-lib-*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "apiml-common-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "2.0.0", - "artifact": "common-java-lib-*.zip" + "version": "~2.0.0-SNAPSHOT", + "artifact": "common-java-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.11.0", - "artifact": "apiml-sample-extension-*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "apiml-sample-extension-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.11.0", - "artifact": "cloud-gateway-*.zip" - }, - "org.zowe.configmgr-rexx": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023090632.pax" + "version": "^2.4.4-SNAPSHOT", + "artifact": "cloud-gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.configmgr": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023090629.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" + }, + "org.zowe.configmgr-rexx": { + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.launcher": { - "version": "2.0.13" + "version": "^2.0.0-SNAPSHOT" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-1.0.4", + "artifact": "keyring-util-*", "explode": "false", - "flat": "true" + "flat": "true", + "exclusions": ["*PR*"] }, "org.zowe.utility-tools": { - "version": "2.0.3" + "version": "~2.0.0-SNAPSHOT" }, "org.zowe.licenses": { - "version": "2.11.0", + "version": "2.3.0", "artifact": "zowe_licenses_full.zip" } }, @@ -140,78 +142,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.18.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.9.1", + "tag": "v2.x.x", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v1.21.3", + "tag": "v2.x.x", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v1.6.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v0.0.6", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v0.0.4", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] } ] @@ -219,98 +221,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.4", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "v5.0.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "v5.0.3", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "v1.0.7", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "v3.0.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "v2.1.3", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "v3.0.0", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "v0.0.14", + "repository": "explorer-mvs", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.0.7", + "repository": "orion-editor-component", + "tag": "master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.0.7", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.0.7", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.23", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.19", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.19", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, @@ -318,14 +320,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +335,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +343,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -349,15 +351,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.11.0-RC1", - "destinations": ["Zowe PAX"] + "tag": "v2.x/staging", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -365,15 +367,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "v1.1.0", + "tag": "master", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.0.3", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.0.12", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, @@ -381,7 +383,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v2.10.0", + "tag": "master", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -389,99 +391,91 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.0.0", - "destinations": ["Zowe PAX"] - }] - }, - { - "componentGroup": "Configmgr", - "entries": [{ - "repository": "zowe-common-c", - "tag": "configmgr-v2.11.0-RC1", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.0-ubuntu.v2-x-staging" }, "api-catalog": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "caching": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "gateway": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.11.0-ubuntu" + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "app-server": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.0-ubuntu.v2-x-staging" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu" + "kind": "job", + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu.v2-x-master" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2.0.19-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2.0.19-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0-ubuntu" } }, "dependencyDecisions": { From 6a3742afa6796bf7accdaad4e0d8f44a1dd585b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Tue, 10 Oct 2023 16:45:58 +0200 Subject: [PATCH 03/19] upgrade APIML to version 2.12.0 --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5684fcde9..1a944759b5 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.12.0-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 7bf3b783fae958dcf2031eedacce4173e7714015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Tue, 10 Oct 2023 16:45:58 +0200 Subject: [PATCH 04/19] trigger actions From be33fed18ee87670e53e502f188df11b94201e02 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Tue, 10 Oct 2023 16:17:40 -0400 Subject: [PATCH 05/19] Zowe changes for 2.12 Signed-off-by: Trae Yelovich --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5684fcde9..2877bbf7b0 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -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"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.4", + "tag": "v7.18.7", "destinations": ["Zowe CLI Package"] }] }, { From c4844dddc4c485785d9b605a977b11ef78a2a484 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Wed, 11 Oct 2023 09:17:24 -0400 Subject: [PATCH 06/19] Update Zowe Explorer version to latest Signed-off-by: Trae Yelovich --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 2877bbf7b0..983d2085c8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -381,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v2.10.0", + "tag": "v2.11.1", "destinations": ["Visual Studio Code Marketplace"] }] }, From 4c8809bd323c3493c92bbcd8b2c6a9c10c3ea2b7 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 11 Oct 2023 10:55:26 -0400 Subject: [PATCH 07/19] Fixed typos in parameter help (#3589) Signed-off-by: 1000TurquoisePogs --- .dependency/zwe_doc_generation/md-content.js | 2 +- bin/commands/components/search/.parameters | 2 +- bin/commands/components/uninstall/.parameters | 2 +- bin/commands/components/upgrade/.parameters | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 From 8f981ac9a3b318b80494a946edc3623a9e1946d1 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:59:22 +0200 Subject: [PATCH 08/19] Close unused pipes (#3590) Signed-off-by: Martin Zeithaml --- bin/libs/shell.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 }; } From bde75f5ea0b7e681dfa7c94dd90aeaa2e871fbf0 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:19:48 +0200 Subject: [PATCH 09/19] Remove only char which was added (#3603) Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/libs/zos.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } { From 91b7a5c91f113329d18e8c007e102af398b26383 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 11 Oct 2023 19:38:23 -0400 Subject: [PATCH 10/19] WebUI v2.12.0 RC1 Signed-off-by: James Struga --- manifest.json.template | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 983d2085c8..f334053e78 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,39 +12,39 @@ }, "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.232649.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", From ddd59a9fb3e433db6183cbc9ac4013fdcf74a643 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 12 Oct 2023 09:29:24 -0400 Subject: [PATCH 11/19] add missing tn Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index f334053e78..6efd8de87b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -34,7 +34,7 @@ "org.zowe.zlux.tn3270-ng2": { "version": "2.12.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.12.0-20231011.232649.pax" + "artifact": "tn3270-ng2-2.12.0-20231011.232650.pax" }, "org.zowe.zlux.vt-ng2": { "version": "2.12.0-V2.X-RC", From 7da89fafbba7ada52f287182255941d8b23b9f2e Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Thu, 12 Oct 2023 13:12:47 -0400 Subject: [PATCH 12/19] bump explorer apis 2.12 RC1 Signed-off-by: Amanda D'Errico --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 1d65a675ec..8a80e8edd6 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.11.0-rc-974-20230906160141.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.19", + "version": "2.0.20", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.19", + "version": "2.0.20", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.23", + "tag": "2.0.24", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.19", + "tag": "2.0.20", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.19", + "tag": "2.0.20", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.19-ubuntu" + "tag" : "2.0.20-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.19-ubuntu" + "tag" : "2.0.20-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 1e2a468b7cc17cc4c0a0b236f97ef4098955c488 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 16 Oct 2023 15:18:49 -0400 Subject: [PATCH 13/19] add zss and launcher Signed-off-by: James Struga --- manifest.json.template | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 6efd8de87b..c287b312a9 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -47,9 +47,9 @@ "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", @@ -109,17 +109,17 @@ "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.0.14" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -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"] } ] @@ -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"] }] }, @@ -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"] }] } @@ -432,7 +432,7 @@ "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", From 707507154037251208079b6f7a01abe9b3399e07 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 16 Oct 2023 16:03:21 -0400 Subject: [PATCH 14/19] update vscode and zowe-launch-script version Signed-off-by: ojcelis --- manifest.json.template | 314 +++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 154 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index bfd04cc9fa..742861aee1 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,128 +12,126 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", - "artifact": "*.pax" + "version": "2.11.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.11.0-20230905.133406.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.11.0-20230829.202650.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.11.0-20230829.202549.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.11.0-20230829.202844.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.11.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.11.0-rc-974-20230906160141.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "jobs-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.19", + "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "files-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.19", + "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-ip": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "*.pax" + "version": "2.0.0", + "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "api-catalog-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-common-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "common-java-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.0.0", + "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-sample-extension-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.12.0", + "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "^2.4.4-SNAPSHOT", - "artifact": "cloud-gateway-*.zip", - "exclusions": ["*PR*.zip"] - }, - "org.zowe.configmgr": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.12.0", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.11.0-2023090632.pax" + }, + "org.zowe.configmgr": { + "version": "2.11.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.11.0-2023090629.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.13" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-*", + "artifact": "keyring-util-1.0.4", "explode": "false", - "flat": "true", - "exclusions": ["*PR*"] + "flat": "true" }, "org.zowe.utility-tools": { - "version": "~2.0.0-SNAPSHOT" + "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.3.0", + "version": "2.11.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.18.2", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.x.x", + "tag": "v2.9.1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v2.x.x", + "tag": "v1.21.3", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v2.x/staging", + "tag": "v1.6.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v1.x/master", + "tag": "v0.0.6", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v1.x/master", + "tag": "v0.0.4", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.11.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.18.7", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "master", + "tag": "v5.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "master", + "tag": "v5.0.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "master", + "tag": "v1.0.7", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "master", + "tag": "v3.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "master", + "tag": "v2.1.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "master", + "tag": "v3.0.0", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.x/master", + "repository": "orion-editor-component", + "tag": "v0.0.14", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "master", + "repository": "explorer-mvs", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v2.x/master", + "tag": "2.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -335,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -343,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -351,15 +349,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.x/staging", - "destinations": ["Zowe PAX"] + "tag": "v2.11.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -367,15 +365,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "master", + "tag": "v1.1.0", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.x/master", + "tag": "v2.0.3", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.x/master", + "tag": "v2.0.12", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "master", + "tag": "v2.11.2", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -391,91 +389,99 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.x/master", + "tag": "v2.0.0", + "destinations": ["Zowe PAX"] + }] + }, + { + "componentGroup": "Configmgr", + "entries": [{ + "repository": "zowe-common-c", + "tag": "configmgr-v2.11.0-RC1", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.12.0-ubuntu" }, "api-catalog": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.12.0-ubuntu" }, "caching": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.12.0-ubuntu" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.12.0-ubuntu" }, "gateway": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.12.0-ubuntu" }, "app-server": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.11.0-ubuntu" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu.v2-x-master" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2.0.7-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2.0.7-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2.0.7-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2.0.19-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2.0.19-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0.1-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0.1-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0.1-ubuntu" } }, "dependencyDecisions": { From 5996cfc9fde444762dc78611418af3fc90938052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= <58428711+pj892031@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:20:18 +0200 Subject: [PATCH 15/19] Upgrade APIML to version 2.12.2 (#3616) * upgrade APIML to version 2.12.3 * fix version - 2.12.2 --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5feb18da76..b7fda6b399 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.12.0", + "version": "2.12.2", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.12.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.12.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.12.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.12.0-ubuntu" + "tag" : "2.12.2-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From a37bcc888cbe40952dde7a193e23f915b7bdf1c0 Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Thu, 19 Oct 2023 13:43:58 -0400 Subject: [PATCH 16/19] bump explorer apis for 2.12 RC2 Signed-off-by: Amanda D'Errico --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index b7fda6b399..73a1ce3ffc 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.12.0-rc-1011-20231016182429.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.20", + "version": "2.0.21", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.20", + "version": "2.0.21", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.24", + "tag": "2.0.25", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.20", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.20", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.20-ubuntu" + "tag" : "2.0.21-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.20-ubuntu" + "tag" : "2.0.21-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From d1f735d7d53b44dd539deb1622d2f90e3272977a Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Thu, 19 Oct 2023 17:18:16 -0400 Subject: [PATCH 17/19] upgraded tomcat, another release for jobs and data-sets Signed-off-by: Amanda D'Errico --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 73a1ce3ffc..0a92bc40a6 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.12.0-rc-1011-20231016182429.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.21", + "version": "2.0.22", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.21", + "version": "2.0.22", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.25", + "tag": "2.0.26", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.21", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.21", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.21-ubuntu" + "tag" : "2.0.22-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.21-ubuntu" + "tag" : "2.0.22-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 2dbc88e48961d87afb24ccf386eba1dd664a1c3e Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 20 Oct 2023 11:39:17 -0400 Subject: [PATCH 18/19] update lincenses to latest version Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 0a92bc40a6..327827e4d1 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.11.0", + "version": "2.12.0", "artifact": "zowe_licenses_full.zip" } }, From d5c495eb2fed1b2c076576f3d0ca6854ceeade6d Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 23 Oct 2023 14:11:10 -0400 Subject: [PATCH 19/19] Update launcher Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 327827e4d1..5f61f9f39c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -119,7 +119,7 @@ "artifact": "configmgr-2.12.0-2023101637.pax" }, "org.zowe.launcher": { - "version": "2.0.14" + "version": "2.12.0" }, "org.zowe.keyring-utilities": { "version": "1.0.4",