From 5666ae980c35a048c49d3bec80f3ca12daec8bc0 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 25 Apr 2023 09:57:34 -0400 Subject: [PATCH 01/46] Update org.zowe.license 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 5090f74e7f..5e8dcc4c20 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.2" }, "org.zowe.licenses": { - "version": "2.7.0", + "version": "2.8.0", "artifact": "zowe_licenses_full.zip" } }, From c9655cf447b508fbe78f67311b7b8d253077cd3c Mon Sep 17 00:00:00 2001 From: AdarshdeepCheema <57364561+AdarshdeepCheema@users.noreply.github.com> Date: Tue, 30 May 2023 14:24:19 -0400 Subject: [PATCH 02/46] Update Explorer versions Signed-off-by: AdarshdeepCheema <57364561+AdarshdeepCheema@users.noreply.github.com> --- manifest.json.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..b701518c87 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -60,13 +60,13 @@ "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-mvs": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-uss": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-ip": { "version": "2.0.0", @@ -275,21 +275,21 @@ "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ "repository": "explorer-mvs", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { @@ -444,19 +444,19 @@ "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-jes", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "explorer-mvs": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-mvs", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "explorer-uss": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-uss", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "files-api": { "registry": "zowe-docker-release.jfrog.io", From bfab487690173b077d2c75fc2e3363005dd095f9 Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Wed, 31 May 2023 11:42:26 -0400 Subject: [PATCH 03/46] bump explorer api versions 2.9 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 5e8dcc4c20..a38308dda8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.8.0-rc-832-20230413175321.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.16", + "version": "2.0.17", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.16", + "version": "2.0.17", "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.20", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.16", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.16", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.16-ubuntu" + "tag" : "2.0.17-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.16-ubuntu" + "tag" : "2.0.17-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 37ee642c5e9e02ded43abb378f7e0e617761baed Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 31 May 2023 12:36:20 -0400 Subject: [PATCH 04/46] Update CLI component versions for Zowe 2.9.0 Signed-off-by: Timothy Johnson --- manifest.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..3ab9b2ff8b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.12.0", + "tag": "v5.14.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.13.0", + "tag": "v7.16.4", "destinations": ["Zowe CLI Package"] }] }, { @@ -233,7 +233,7 @@ "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "v5.0.2", + "tag": "v5.0.3", "destinations": ["Zowe CLI Package"] }] }, { From 50ba1068f2de2c028198098e1d1a32512c8c923c Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 31 May 2023 12:51:24 -0400 Subject: [PATCH 05/46] WebUI RC1 for 2.9.0 Signed-off-by: James Struga --- manifest.json.template | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..5a9425b66f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.8.0", + "version": "2.9.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,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.8.0-RC", + "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.8.0-20230413.174954.pax" + "artifact": "zlux-core-2.9.0-20230531.164603.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.8.0-20230413.174748.pax" + "artifact": "sample-angular-app-2.9.0-20230531.164048.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.8.0-20230413.174603.pax" + "artifact": "sample-iframe-app-2.9.0-20230531.163947.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.8.0-20230413.174743.pax" + "artifact": "sample-react-app-2.9.0-20230531.164112.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.8.0-20230413.174837.pax" + "artifact": "tn3270-ng2-2.9.0-20230531.164056.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.8.0-20230413.174946.pax" + "artifact": "vt-ng2-2.9.0-20230531.164117.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.8.0-20230413.175234.pax" + "artifact": "zlux-editor-2.9.0-20230531.164506.pax" }, "org.zowe.zss": { - "version": "2.8.0-RC", + "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.8.0-rc-832-20230413175321.pax" + "artifact": "zss-2.9.0-rc-877-20230531164613.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.16", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.8.0-2023041311.pax" + "artifact": "configmgr-rexx-2.9.0-2023053149.pax" }, "org.zowe.configmgr": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.8.0-2023041307.pax" + "artifact": "configmgr-2.9.0-2023053117.pax" }, "org.zowe.launcher": { - "version": "2.0.10" + "version": "2.0.11" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.8.0-RC1", + "tag": "zss-v2.9.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.8.0-RC2", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.8.0-RC1", + "tag": "configmgr-v2.9.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.8.0-ubuntu" + "tag" : "2.9.0-ubuntu" }, "explorer-ip": { "kind": "job", From c9fc05036e8c932d86837385dea836c61974ef62 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 31 May 2023 14:17:20 -0400 Subject: [PATCH 06/46] fix build Signed-off-by: James Struga --- manifest.json.template | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json.template b/manifest.json.template index 5a9425b66f..90bf7aaa4f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -488,3 +488,4 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } + \ No newline at end of file From a7d5d7c0a05913a5e806f02db82b0776fad44047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Thu, 1 Jun 2023 09:55:59 +0200 Subject: [PATCH 07/46] apiml versions for 2.9.0-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- manifest.json.template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..13a7cc82cf 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.8.13", + "version": "2.9.1", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.8.13", + "version": "2.9.1", "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.8.13", + "version": "2.9.1", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -147,7 +147,7 @@ "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.8.13", + "tag": "v2.9.1", "destinations": ["Zowe PAX"] }] }, { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 085f307c801f7a8f5ebca51a59993098697c3706 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 1 Jun 2023 15:19:50 -0400 Subject: [PATCH 08/46] Update version for launch-scripts, vscode-extension and utility-tools Signed-off-by: ojcelis --- manifest.json.template | 316 +++++++++++++++++++++-------------------- 1 file changed, 161 insertions(+), 155 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d8b2346603..e2bc649c04 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.9.0", + "version": "2.8.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,128 +12,126 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", - "artifact": "*.pax" + "version": "2.8.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.8.0-20230413.174954.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.8.0-20230413.174748.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.8.0-20230413.174603.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.8.0-20230413.174743.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.8.0-20230413.174837.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.8.0-20230413.174946.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.8.0-20230413.175234.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.8.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.8.0-rc-832-20230413175321.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.17", + "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.17", + "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "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.8.13", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "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.8.13", + "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.8.13", + "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.8.13", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.8.0-2023041311.pax" + }, + "org.zowe.configmgr": { + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.8.0-2023041307.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.10" }, "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.8.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.12.0", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.x.x", + "tag": "v2.8.13", "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.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.8.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.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.8.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.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.8.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.13.0", "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.2", "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.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.x/master", + "tag": "v2.0.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.x/master", + "tag": "v2.0.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v2.x/master", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.8.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.8.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.8.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.8.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC2", "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.10", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "master", + "tag": "v2.8.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.8.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.9.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.8.13-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.8.13-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.8.13-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.8.13-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.8.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.6-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.6-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.6-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.17-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.17-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 c0df33a466703421ed091cd931dd59e0b615a5cc Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 8 Jun 2023 11:46:35 -0400 Subject: [PATCH 09/46] WebUI RC2 for 2.9.0 Signed-off-by: James Struga --- manifest.json.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 027a68e02a..7398c08409 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.9.0-20230531.164603.pax" + "artifact": "zlux-core-2.9.0-20230608.142940.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.9.0-V2.X-RC", @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.9.0-rc-877-20230531164613.pax" + "artifact": "zss-2.9.0-rc-893-20230608154524.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023053149.pax" + "artifact": "configmgr-rexx-2.9.0-2023060818.pax" }, "org.zowe.configmgr": { "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023053117.pax" + "artifact": "configmgr-2.9.0-2023060822.pax" }, "org.zowe.launcher": { "version": "2.0.11" @@ -166,7 +166,7 @@ }, { "repository": "zlux-app-server", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { @@ -186,7 +186,7 @@ }, { "repository": "zlux-server-framework", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { @@ -206,12 +206,12 @@ }, { "repository": "zss", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.9.0-RC1", + "tag": "zss-v2.9.0-RC2", "destinations": ["Zowe PAX"] } ] @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.9.0-RC1", + "tag": "configmgr-v2.9.0-RC2", "destinations": ["Zowe PAX"] }] } From f92477da7b831a194c0b48a165e6f2759081fdb0 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 13 Jun 2023 09:07:55 -0400 Subject: [PATCH 10/46] Update licenses to 2.9 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 7398c08409..d46218a44c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.8.0", + "version": "2.9.0", "artifact": "zowe_licenses_full.zip" } }, From 3407d1b00b9d98f9057182b009e9a4552c9ee211 Mon Sep 17 00:00:00 2001 From: achmelo <37397715+achmelo@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:06:51 +0200 Subject: [PATCH 11/46] apiml rc1 Signed-off-by: achmelo --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..c5f242f5d9 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.9.1", + "version": "2.10.5", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.9.1", + "version": "2.10.5", "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.9.1", + "version": "2.10.5", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.9.1", + "version": "2.10.5", "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.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 7f90e4bf5884c99e913e6a9404d1e62d1af79988 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 11 Jul 2023 15:59:36 -0400 Subject: [PATCH 12/46] 2.10.0 WebUI RC1 Signed-off-by: James Struga --- manifest.json.template | 78 +++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..9d192afaf8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.9.0", + "version": "2.10.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,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.9.0-RC", + "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.9.0-20230608.142940.pax" + "artifact": "zlux-core-2.10.0-20230711.194608.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.9.0-20230531.164048.pax" + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.9.0-20230531.163947.pax" + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.9.0-20230531.164112.pax" + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.9.0-20230531.164056.pax" + "artifact": "tn3270-ng2-2.10.0-20230711.193210.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.9.0-20230531.164117.pax" + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.9.0-20230531.164506.pax" + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "2.9.0-RC", + "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.9.0-rc-893-20230608154524.pax" + "artifact": "zss-2.10.0-rc-920-20230711194821.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023060818.pax" + "artifact": "configmgr-rexx-2.9.0-2023071157.pax" }, "org.zowe.configmgr": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023060822.pax" + "artifact": "configmgr-2.9.0-2023071158.pax" }, "org.zowe.launcher": { - "version": "2.0.11" + "version": "2.0.12" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.9.0-RC2", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -373,7 +373,7 @@ "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.0.10", + "tag": "v2.0.12", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.9.0-RC2", + "tag": "configmgr-v2.10.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.9.0-ubuntu" + "tag" : "2.10.0-ubuntu" }, "explorer-ip": { "kind": "job", From 01ba8ba493d22c77bb5081a54a12bff51993835f Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 12 Jul 2023 09:25:33 -0400 Subject: [PATCH 13/46] update missing paxs Signed-off-by: James Struga --- manifest.json.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 9d192afaf8..42496dceda 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -34,7 +34,7 @@ "org.zowe.zlux.tn3270-ng2": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.10.0-20230711.193210.pax" + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { "version": "2.10.0-V2.X-RC", @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.10.0-rc-920-20230711194821.pax" + "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023071157.pax" + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" }, "org.zowe.configmgr": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023071158.pax" + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { "version": "2.0.12" From f74aa1318923b01b2e4f6a6a6c885adefbcab9d7 Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 12 Jul 2023 16:47:44 +0200 Subject: [PATCH 14/46] underscore.js update Signed-off-by: achmelo --- manifest.json.template | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5f242f5d9..7aa4ee578e 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.10.5", + "version": "2.10.6", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.10.5", + "version": "2.10.6", "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.10.5", + "version": "2.10.6", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.10.5", + "version": "2.10.6", "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.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", @@ -488,4 +488,3 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } - \ No newline at end of file From e732835da22831b9428d67657477fab1084bcc33 Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Wed, 12 Jul 2023 11:03:58 -0400 Subject: [PATCH 15/46] bump explorer apis 2.10 RC1 Signed-off-by: Amanda D'Errico --- manifest.json.template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..7040a713e2 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.9.0-rc-893-20230608154524.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.17", + "version": "2.0.18", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.17", + "version": "2.0.18", "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.21", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.17", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.17", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.17-ubuntu" + "tag" : "2.0.18-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.17-ubuntu" + "tag" : "2.0.18-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", @@ -488,4 +488,3 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } - \ No newline at end of file From 49e94c22c03bdd842b3e86a88dc42770962e34ea Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 12 Jul 2023 12:28:38 -0400 Subject: [PATCH 16/46] Update zowe-launch-script and vscode 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 311cd3cc53..144a3bbcbc 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.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.10.0-20230711.194608.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.10.0-rc-921-20230712132442.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.18", + "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.18", + "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.10.6", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "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.10.6", + "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.10.6", + "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.10.6", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + }, + "org.zowe.configmgr": { + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.12" }, "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.9.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.14.1", "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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.16.4", "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.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.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.10.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.10.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.10.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.9.1", "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.10.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.10.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.10.6-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.10.6-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.10.6-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.10.6-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.10.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.18-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.18-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 7c753c95edb85da91b0652ed3dcbdf2c9a14f1b3 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 13 Jul 2023 12:25:09 -0400 Subject: [PATCH 17/46] build: make APIML_OIDC vars default for all builds Signed-off-by: MarkAckert --- .../src/__tests__/basic/install-fmid.ts | 4 ---- .../src/__tests__/basic/install-ptf.ts | 8 -------- .../src/__tests__/basic/install.ts | 4 ---- .../extended/security-systems/ptf/acf2.ts | 1 - .../extended/security-systems/ptf/racf.ts | 1 - .../extended/security-systems/ptf/ts.ts | 1 - tests/installation/src/constants.ts | 7 +++++++ tests/installation/src/utils.ts | 19 +++++++++---------- 8 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tests/installation/src/__tests__/basic/install-fmid.ts b/tests/installation/src/__tests__/basic/install-fmid.ts index e6d74093e9..0726f9f445 100644 --- a/tests/installation/src/__tests__/basic/install-fmid.ts +++ b/tests/installation/src/__tests__/basic/install-fmid.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/basic/install-ptf.ts b/tests/installation/src/__tests__/basic/install-ptf.ts index dd5a559417..60b83f2248 100644 --- a/tests/installation/src/__tests__/basic/install-ptf.ts +++ b/tests/installation/src/__tests__/basic/install-ptf.ts @@ -26,21 +26,13 @@ describe(testSuiteName, () => { }); test('install and verify', async () => { - const apimlOidcVars = { - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, - }; await installAndVerifySmpePtf( testSuiteName, process.env.TEST_SERVER, - apimlOidcVars, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', - ...apimlOidcVars } ); }, TEST_TIMEOUT_SMPE_PTF); diff --git a/tests/installation/src/__tests__/basic/install.ts b/tests/installation/src/__tests__/basic/install.ts index f1ba3a6517..9d49eddebb 100644 --- a/tests/installation/src/__tests__/basic/install.ts +++ b/tests/installation/src/__tests__/basic/install.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index 47497ded57..cdeb1b4b32 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 697f69e9ee..17d51a268f 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -34,7 +34,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index aef8d45c06..f367c392fd 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index 694d2cf359..74ecdddce8 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -39,4 +39,11 @@ export const TEST_TIMEOUT_SMPE_PTF: number = 120 * 60 * 1000; export const KEYSTORE_MODE_KEYSTORE = 'KEYSTORE_MODE_KEYSTORE'; export const KEYSTORE_MODE_KEYRING = 'KEYSTORE_MODE_KEYRING'; +export const APIML_OIDC_VARS = { + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'] || 'dummy_id_from_constants_ts', + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'] || 'dummy_secret_from_constants_ts', + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'] || 'dummy_registry_from_constants_ts', + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, +}; + // debug(`process.env >>>>>>>>>>>>>>>>>>>>>>>>>>\n${JSON.stringify(process.env)}\n<<<<<<<<<<<<<<<<<<<<<<<`); diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index 7fb15bd4e2..9b41514184 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -21,6 +21,7 @@ import { ANSIBLE_ROOT_DIR, SANITY_TEST_REPORTS_DIR, INSTALL_TEST_REPORTS_DIR, + APIML_OIDC_VARS, } from './constants'; /** @@ -209,7 +210,7 @@ async function installAndVerifyZowe(testcase: string, installPlaybook: string, s testcase, installPlaybook, serverId, - extraVars + { ...APIML_OIDC_VARS , ...extraVars} ); expect(resultInstall.code).toBe(0); @@ -335,7 +336,7 @@ export async function installAndVerifyDockerBuild(testcase: string, serverId: st testcase, 'install-docker.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -403,10 +404,8 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri * @param {Object} extraFmidVars * @param {Object} extraPtfVars */ -export async function installAndVerifySmpePtf(testcase: string, serverId: string, - extraFmidVars: {[key: string]: any} = {}, - extraPtfVars: {[key: string]: any} = {}): Promise { - debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, FMID: ${JSON.stringify(extraFmidVars)}, PTF: ${JSON.stringify(extraPtfVars)})`); +export async function installAndVerifySmpePtf(testcase: string, serverId: string, extraPtfVars: {[key: string]: any} = {}): Promise { + debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraPtfVars)})`); debug(`run install-fmid.yml on ${serverId}`); @@ -417,7 +416,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string { 'zowe_build_remote': ZOWE_FMID, 'skip_start': 'true', - ...extraFmidVars + ...APIML_OIDC_VARS } ); @@ -428,7 +427,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string testcase, 'install-ptf.yml', serverId, - extraPtfVars + { ...extraPtfVars, ...APIML_OIDC_VARS } ); expect(resultPtf.code).toBe(0); @@ -468,7 +467,7 @@ export async function installAndGenerateApiDocs(testcase: string, serverId: stri testcase, 'install.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -514,7 +513,7 @@ export async function showZoweRuntimeLogs(serverId: string, extraVars: {[key: st 'doesn\'t matter', 'show-logs.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); } catch (e) { debug(`showZoweRuntimeLogs failed: ${e}`); From b54717bb2feccbe8d65738cdaaac0a7b9f1f7dbb Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 14 Jul 2023 08:57:23 -0400 Subject: [PATCH 18/46] Update CLI component versions for Zowe 2.10.0 Signed-off-by: Timothy Johnson --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 144a3bbcbc..f859539bd4 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.14.1", + "tag": "v5.15.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.16.4", + "tag": "v7.16.6", "destinations": ["Zowe CLI Package"] }] }, { From 03a068cf08ee3a01688798bb6b300c64be577853 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 18 Jul 2023 09:28:53 -0400 Subject: [PATCH 19/46] update zlux, jes, mvs and uss sanity tests Signed-off-by: ojcelis --- tests/sanity/test/e2e/test-02-jes-explorer.js | 14 +++--- tests/sanity/test/e2e/test-03-mvs-explorer.js | 14 +++--- tests/sanity/test/e2e/test-04-uss-explorer.js | 14 +++--- tests/sanity/test/zlux/test-zlux-server.js | 50 +++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tests/sanity/test/e2e/test-02-jes-explorer.js b/tests/sanity/test/e2e/test-02-jes-explorer.js index e142291fb8..0e1ed2dcfe 100644 --- a/tests/sanity/test/e2e/test-02-jes-explorer.js +++ b/tests/sanity/test/e2e/test-02-jes-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:jes-explorer'); @@ -56,12 +56,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` + //); // load MVD login page await loginMVD( diff --git a/tests/sanity/test/e2e/test-03-mvs-explorer.js b/tests/sanity/test/e2e/test-03-mvs-explorer.js index 9edf10dd2b..ec85008816 100644 --- a/tests/sanity/test/e2e/test-03-mvs-explorer.js +++ b/tests/sanity/test/e2e/test-03-mvs-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:mvs-explorer'); @@ -60,12 +60,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/e2e/test-04-uss-explorer.js b/tests/sanity/test/e2e/test-04-uss-explorer.js index bd4585ab9d..9b2eca1576 100644 --- a/tests/sanity/test/e2e/test-04-uss-explorer.js +++ b/tests/sanity/test/e2e/test-04-uss-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:uss-explorer'); @@ -59,12 +59,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/zlux/test-zlux-server.js b/tests/sanity/test/zlux/test-zlux-server.js index 0c3ba390fd..94174babfe 100644 --- a/tests/sanity/test/zlux/test-zlux-server.js +++ b/tests/sanity/test/zlux/test-zlux-server.js @@ -41,31 +41,31 @@ describe(`test zLux server https://${process.env.ZOWE_EXTERNAL_HOST}:${process.e token = await zlux.login(); }); - describe('GET /', function() { - it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { - const res = await hqZlux.request({ - url: '/', - maxRedirects: 0, - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.REDIRECT); - expect(res).to.have.property('headers'); - expect(res.headers).to.have.property('location'); - expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); - }); - - it('should return ok', async function() { - const res = await hqZlux.request({ - url: '/', - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.SUCCESS); - // has been renamed to Zowe Desktop - expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); - }); - }); + //describe('GET /', function() { + // it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { + // const res = await hqZlux.request({ + // url: '/', + // maxRedirects: 0, + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.REDIRECT); + // expect(res).to.have.property('headers'); + // expect(res.headers).to.have.property('location'); + // expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); + // }); + + // it('should return ok', async function() { + // const res = await hqZlux.request({ + // url: '/', + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.SUCCESS); + // has been renamed to Zowe Desktop + // expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); + // }); + //}); describe('GET /ZLUX/plugins', function() { it('/org.zowe.explorer-jes/web/index.html is an unprotected path', async function() { From 87b67ea8a265ab963423c466767c9cfb3f96cb5d Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 12:11:32 -0400 Subject: [PATCH 20/46] test: add external root ca to keyring in test automation Signed-off-by: MarkAckert --- playbooks/all_host_vars_list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index 173bd4efcf..d3528c7fa7 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -68,7 +68,7 @@ zowe_jobs_explorer_port: 7560 zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_keystore_dir: ~/.zowe/keystore zowe_keystore_password: password From 6e374b07909590be980f4e06c8e78c515a48b52c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 14:39:36 -0400 Subject: [PATCH 21/46] build: update defaults un-setting variable in specific playbook roles Signed-off-by: MarkAckert --- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index aad0f019e2..65d34fcae1 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -104,7 +104,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 37feba2654..5e0cd717d4 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 520be87041..9dbd3c90c8 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto From deafa02eb935ae06c974c42ddcfbbaef1a5d2448 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 15:47:16 -0400 Subject: [PATCH 22/46] build: workaround keyring jcl RC=4 Signed-off-by: MarkAckert --- playbooks/host_vars/marist-3.yml | 2 ++ playbooks/host_vars/marist-4.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-3.yml index f14790f987..939bfb5e26 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-3.yml @@ -4,3 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-4.yml index 68291d8f89..894500deef 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-4.yml @@ -12,3 +12,5 @@ zowe_install_logs_dir: /ZOWE/logs zowe_smpe_volser: ZOWE03 zowe_caching_vsam_volume: ZOWE03 + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 From c8b4c774ae2111ef3a298912b47caca47233a956 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 24 Jul 2023 10:47:55 -0400 Subject: [PATCH 23/46] Container bug fix for rc3 Signed-off-by: James Struga --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index f859539bd4..39f96fb79c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230711.194608.pax" + "artifact": "zlux-core-2.10.0-20230724.143701.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", @@ -186,7 +186,7 @@ }, { "repository": "zlux-server-framework", - "tag": "v2.10.0-RC1", + "tag": "v2.10.0-RC3", "destinations": ["Zowe PAX"] }, { From 725eddbf5feadafddb6188bf9fa907d06bcef91b Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 24 Jul 2023 11:31:31 -0400 Subject: [PATCH 24/46] Update org.zowe.licenses to the 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 f859539bd4..f835114339 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.9.0", + "version": "2.10.0", "artifact": "zowe_licenses_full.zip" } }, From 9fa0bfea8da990d50ed12e11b71d3bdcc43f60c9 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 24 Jul 2023 17:45:08 -0400 Subject: [PATCH 25/46] update zlux-cote 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 39f96fb79c..49f807593b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.143701.pax" + "artifact": "zlux-core-2.10.0-20230724.213938.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 5bdce605324a8cf212c2c339487f36e0e32420c3 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 25 Jul 2023 09:17:48 -0400 Subject: [PATCH 26/46] add missing pax 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 49f807593b..95b0496ec5 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.213938.pax" + "artifact": "zlux-core-2.10.0-20230725.131652.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 243596b3022d25cf2b981085f241399e1b8502a7 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 25 Jul 2023 15:06:24 -0400 Subject: [PATCH 27/46] add new container fixes 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 95b0496ec5..8c6089b449 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230725.131652.pax" + "artifact": "zlux-core-2.10.0-20230725.190542.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 00fab2f27500208e44b703b4fce4c09e88fa3f7f Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 26 Jul 2023 08:52:28 -0400 Subject: [PATCH 28/46] Add container fix 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 db78e5c521..1f4e997e72 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230725.190542.pax" + "artifact": "zlux-core-2.10.0-20230726.125125.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 1183d54c385e0b896f3dc5909faf2d6e0d3fa5b9 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 27 Jul 2023 09:09:03 -0400 Subject: [PATCH 29/46] New zlux-build 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 1f4e997e72..59d5b13440 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230726.125125.pax" + "artifact": "zlux-core-2.10.0-20230727.130803.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 7b939b251e2d264824eef749d2d223c94608adab Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 27 Jul 2023 12:11:05 -0400 Subject: [PATCH 30/46] build: revert manifest to earlier point for v2.10.0 Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 59d5b13440..6a8cbe7165 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230727.130803.pax" + "artifact": "zlux-core-2.10.0-20230724.143701.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 33e58f4e90d9137f4104b7e52a7c3f96f1307adb Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 27 Jul 2023 14:09:59 -0400 Subject: [PATCH 31/46] revert back zlux changes 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 6a8cbe7165..1f4e997e72 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.143701.pax" + "artifact": "zlux-core-2.10.0-20230726.125125.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 04d025a49818aed75e918729584f18d89c90d1e8 Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 4 Aug 2023 10:36:27 -0400 Subject: [PATCH 32/46] Container fix for app-server 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 1f4e997e72..613b30a6bf 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230726.125125.pax" + "artifact": "zlux-core-2.10.0-20230804.143132.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 788ae859b0cedbe8ca4e1549222179bdaf974a0d Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Tue, 29 Aug 2023 10:23:37 -0400 Subject: [PATCH 33/46] bump explorer apis 2.11 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 613b30a6bf..20f5b68343 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.18", + "version": "2.0.19", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.18", + "version": "2.0.19", "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.22", + "tag": "2.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.18", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.18", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.18-ubuntu" + "tag" : "2.0.19-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.18-ubuntu" + "tag" : "2.0.19-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 15f2d1a5474e4732c1aa5577e167c4cfcb6046b8 Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 29 Aug 2023 16:54:27 +0200 Subject: [PATCH 34/46] apiml rc1 Signed-off-by: achmelo --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 613b30a6bf..81b4500390 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.10.6", + "version": "2.11.0", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.10.6", + "version": "2.11.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.10.6", + "version": "2.11.0", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.10.6", + "version": "2.11.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.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From d6f274d5a8e2d0902b02a91cf001923f20588291 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 30 Aug 2023 13:10:45 -0400 Subject: [PATCH 35/46] webUI PR for 2.11 Signed-off-by: James Struga --- manifest.json.template | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 613b30a6bf..b3397cf59c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.10.0", + "version": "2.11.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,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.10.0-RC", + "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230804.143132.pax" + "artifact": "zlux-core-2.11.0-20230830.130147.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" + "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" + "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.10.0-20230711.193314.pax" + "artifact": "sample-react-app-2.11.0-20230829.202650.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" + "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.10.0-20230711.193229.pax" + "artifact": "vt-ng2-2.11.0-20230829.202549.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.10.0-20230711.193530.pax" + "artifact": "zlux-editor-2.11.0-20230829.202844.pax" }, "org.zowe.zss": { - "version": "2.10.0-RC", + "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.10.0-rc-921-20230712132442.pax" + "artifact": "zss-2.11.0-rc-965-20230830170742.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.18", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + "artifact": "configmgr-rexx-2.11.0-2023082950.pax" }, "org.zowe.configmgr": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.10.0-2023071212.pax" + "artifact": "configmgr-2.11.0-2023082956.pax" }, "org.zowe.launcher": { - "version": "2.0.12" + "version": "2.0.13" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.10.0-RC3", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.10.0-RC1", + "tag": "zss-v2.11.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.10.0-RC1", + "tag": "configmgr-v2.11.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.10.0-ubuntu" + "tag" : "2.11.0-ubuntu" }, "explorer-ip": { "kind": "job", From 1b5e4bee155e2a12e0e8100271451ebb839db5ad Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Wed, 30 Aug 2023 14:53:20 -0400 Subject: [PATCH 36/46] Update CLI component versions for Zowe 2.11.0 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 20f5b68343..aa7f6bfe9f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.15.1", + "tag": "v5.18.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.16.6", + "tag": "v7.18.3", "destinations": ["Zowe CLI Package"] }] }, { From 01705aa961eb4a3b649020647ca139eeac808a00 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 30 Aug 2023 17:12:44 -0400 Subject: [PATCH 37/46] Overwrite manifest file with manifest from rc branch 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 b02a93740a..cacecdfe72 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.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.10.0-20230804.143132.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.10.0-rc-921-20230712132442.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.10.6", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "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.10.6", + "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.10.6", + "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.10.6", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + }, + "org.zowe.configmgr": { + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.12" }, "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.10.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.15.1", "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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC3", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.16.6", "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.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.10.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.10.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.10.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.10.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.10.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.9.1", "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.10.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.10.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.10.6-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.10.6-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.10.6-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.10.6-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.10.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 154843129389a7e6337237a15ee97d8fdf61ccf8 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 31 Aug 2023 09:12:46 -0400 Subject: [PATCH 38/46] update config manager with better error Signed-off-by: James Struga --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index b3397cf59c..1146a58cb0 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023082950.pax" + "artifact": "configmgr-rexx-2.11.0-2023083137.pax" }, "org.zowe.configmgr": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023082956.pax" + "artifact": "configmgr-2.11.0-2023083140.pax" }, "org.zowe.launcher": { "version": "2.0.13" From 71f573b1dc91cbaa76079ad90ac33518557becf4 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 31 Aug 2023 09:23:19 -0400 Subject: [PATCH 39/46] update vscode and launch-script Signed-off-by: ojcelis --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index cacecdfe72..51649ff2d1 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.9.1", + "tag": "v2.10.0", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -406,7 +406,7 @@ "zowe-launch-scripts": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.10.0-ubuntu" + "tag" : "2.11.0-ubuntu" }, "api-catalog": { "registry": "zowe-docker-release.jfrog.io", From 3de9f2ce4c74885add477c44bd4f1a3f572d9e08 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Thu, 31 Aug 2023 12:10:27 -0400 Subject: [PATCH 40/46] Update Zowe CLI for 2.11 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 def311315e..a7c32bd34d 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.3", + "tag": "v7.18.4", "destinations": ["Zowe CLI Package"] }] }, { From 292a93fa46a06f7c727d3e8dd67af230353597f8 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 5 Sep 2023 10:09:20 -0400 Subject: [PATCH 41/46] Allow pem to be present but empty when keyring Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 1 - 1 file changed, 1 deletion(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 39db90e8f5..62eb04187e 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -789,7 +789,6 @@ "type": "object", "additionalProperties": false, "description": "Certificate in PEM format.", - "required": ["key", "certificate"], "properties": { "key": { "$ref": "/schemas/v2/server-common#zowePath", From a45d99c882f86c5a5db351da620ae13163283b26 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 5 Sep 2023 10:16:38 -0400 Subject: [PATCH 42/46] Revert pem section back to type=string Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 62eb04187e..b37915a80c 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -791,24 +791,24 @@ "description": "Certificate in PEM format.", "properties": { "key": { - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Path to the certificate private key stored in PEM format." }, "certificate": { - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Path to the certificate stored in PEM format." }, "certificateAuthorities": { "description": "List of paths to the certificate authorities stored in PEM format.", "oneOf": [{ - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma." }, { "type": "array", "description": "Path to the certificate authority stored in PEM format.", "items": { - "$ref": "/schemas/v2/server-common#zowePath" + "type": "string" } } ] From 2f7df0187f697af1c4ef2f9beceee2dd1aa5b578 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 5 Sep 2023 11:25:07 -0400 Subject: [PATCH 43/46] RC2 fix 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 feac5b926e..f53d3f712b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.11.0-20230830.130147.pax" + "artifact": "zlux-core-2.11.0-20230905.133406.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.11.0-V2.X-RC", From dc437ef44f70ea2693e4ce9260180a53b7f93c42 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 6 Sep 2023 12:04:53 -0400 Subject: [PATCH 44/46] add zowe-common-c change Signed-off-by: James Struga --- manifest.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index f53d3f712b..0a50b94cdb 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.11.0-rc-965-20230830170742.pax" + "artifact": "zss-2.11.0-rc-974-20230906160141.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.19", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023083137.pax" + "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-2023083140.pax" + "artifact": "configmgr-2.11.0-2023090629.pax" }, "org.zowe.launcher": { "version": "2.0.13" From c47ec0696dffecdcd924f69a345f0be8a9e38aaf Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 11 Sep 2023 09:55:01 -0400 Subject: [PATCH 45/46] update licenses to 2.11 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 0a50b94cdb..c5684fcde9 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.10.0", + "version": "2.11.0", "artifact": "zowe_licenses_full.zip" } }, From 7bb64b04e4f12db7eefa0f7cd29d5a11fa6d1ff6 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 12 Sep 2023 15:11:19 -0400 Subject: [PATCH 46/46] 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": {