From c8bbde779b989212a6c02d5ff5fa9ad01542a3c5 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 5 Apr 2024 14:35:25 -0400 Subject: [PATCH 01/12] Update ZE references to use new repo name zowe-explorer-vscode Signed-off-by: Timothy Johnson --- README.md | 2 +- manifest.json.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cdad6c2141..8fe2720341 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ For each Zowe component, we have point of contact(s) in case if we want to confi - zowe-cli-ims-plugin - Explorer (Visual Studio Code Extension): Fernando Rijo Cedeno, Mark Ackert * Source Dependencies - - vscode-extension-for-zowe + - zowe-explorer-vscode - License: Mark Ackert * Binary Dependencies - org.zowe.licenses diff --git a/manifest.json.template b/manifest.json.template index 7242b4eb2f..3d085c99eb 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -418,7 +418,7 @@ { "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ - "repository": "vscode-extension-for-zowe", + "repository": "zowe-explorer-vscode", "tag": "v1-lts", "destinations": ["Visual Studio Code Marketplace"] }] From 0ba9a2117a6492816ce6466031265e08b64c3701 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 11 Apr 2024 21:48:44 +0000 Subject: [PATCH 02/12] Promote PTF after release v1.28.6 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 38 ++++++++++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 89 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index c76dc8790c..f44e61540d 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29352 +IO29353 +IO29354 IO29305 IO29306 IO29307 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index 5f1d0f01ee..538df22a08 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29352 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 1.28.6. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29353 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 1.28.6. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29354 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 1.28.6. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29305 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index f1f9f58a10..58b5b8e291 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,41 @@ +++HOLD(UO90051) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(24102) + COMMENT( + **************************************************************** + * Affected function: Zowe configuration * + **************************************************************** + * Description: redo configuration * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: instance directory * + **************************************************************** + New changes are made to instance directory bin folder. + Run /bin/zowe-configure-instance.sh -c + again. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESVSTC & ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESVSTC or ZWESLSTC, and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90038) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(23284) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 627236a988..898baf8988 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90051 +UO90052 UO90038 UO90039 UO90028 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 250b518bf9..b1a61a2b5e 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -27,4 +27,4 @@ #UO02029 UO02030 - IO28762 IO28763 IO28886 - Thu Apr 6 14:57:22 UTC 2023 #UO90028 UO90029 - IO29223 IO29224 IO29226 - Fri Jun 30 19:01:43 UTC 2023 #UO90038 UO90039 - IO29305 IO29306 IO29307 - Wed Oct 11 20:17:16 UTC 2023 -UO90051 UO90052 - IO29352 IO29353 IO29354 \ No newline at end of file +#UO90051 UO90052 - IO29352 IO29353 IO29354 - Thu Apr 11 21:48:44 UTC 2024 \ No newline at end of file From fcd1950820ddaa62d146b1a28de863eaf3a6504e Mon Sep 17 00:00:00 2001 From: ManjuVNair133 Date: Tue, 16 Apr 2024 17:03:36 +0530 Subject: [PATCH 03/12] Add new v1 PTF numbers Signed-off-by: ManjuVNair133 --- smpe/bld/service/ptf-bucket.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index b1a61a2b5e..138226fa48 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -27,4 +27,5 @@ #UO02029 UO02030 - IO28762 IO28763 IO28886 - Thu Apr 6 14:57:22 UTC 2023 #UO90028 UO90029 - IO29223 IO29224 IO29226 - Fri Jun 30 19:01:43 UTC 2023 #UO90038 UO90039 - IO29305 IO29306 IO29307 - Wed Oct 11 20:17:16 UTC 2023 -#UO90051 UO90052 - IO29352 IO29353 IO29354 - Thu Apr 11 21:48:44 UTC 2024 \ No newline at end of file +#UO90051 UO90052 - IO29352 IO29353 IO29354 - Thu Apr 11 21:48:44 UTC 2024 +UO90063 UO90064 - IO29436 IO29437 IO29438 \ No newline at end of file From f161f48fa1da10078d24b237f90bb66f1759afea Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 17 Apr 2024 12:13:17 -0400 Subject: [PATCH 04/12] set version to 1.28.7 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 3d085c99eb..5d4ee45246 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "1.28.6", + "version": "1.28.7", "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", From 5846e8743f5390ac5374810e7e04c39cd86501f8 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 19 Apr 2024 11:09:23 -0400 Subject: [PATCH 05/12] fix orion sourceDep 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 5d4ee45246..ec5935b20a 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -287,7 +287,7 @@ "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ "repository": "orion-editor-component", - "tag": "master", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { From c182af889b4f62e06e3a7eb473722e59a7e9f728 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 24 May 2024 14:17:26 +0000 Subject: [PATCH 06/12] Update component versions Signed-off-by: zowe-robot --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..ab4adce591 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -228,7 +228,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v6.40.27", + "tag": "v6.40.28", "destinations": ["Zowe CLI Package"] }] }, { From 311b52519797ce97d205654fd52003bd5716361a Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 29 May 2024 16:21:50 +0200 Subject: [PATCH 07/12] API ML 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..e287d59037 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 521c3763dcada6c55e7f0be3b77dd80baf9e17d5 Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 29 May 2024 16:21:50 +0200 Subject: [PATCH 08/12] API ML 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..e287d59037 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 09fd4887e38a7579cd38dd9a3af3fa6363be83f6 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 30 May 2024 09:40:54 +0200 Subject: [PATCH 09/12] datasets and jobs 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index e287d59037..530c8bbd52 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -67,12 +67,12 @@ "artifact": "zss-1.28.6-rc-1121-20240328161402.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "1.0.23", + "version": "1.0.24", "artifact": "jobs-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "1.0.25", + "version": "1.0.26", "artifact": "files-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, @@ -492,12 +492,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "1.0.24-ubuntu" + "tag" : "1.0.25-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "1.0.22-ubuntu" + "tag" : "1.0.23-ubuntu" } }, "dependencyDecisions": { From 5d617a52adb9fd48cc8f9b09e0d0202fe5598fc3 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 30 May 2024 09:43:36 +0200 Subject: [PATCH 10/12] Revert "API ML 1.28.7 rc1" This reverts commit 311b52519797ce97d205654fd52003bd5716361a. Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 530c8bbd52..422cc639fd 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From a126ef42470e517575d4f05fc36d3e1070411f5c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 30 May 2024 15:50:47 -0400 Subject: [PATCH 11/12] update licenses 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 c4f87611c0..2d251e975e 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "version": "~0.0.8-SNAPSHOT" }, "org.zowe.licenses": { - "version": "1.28.1", + "version": "1.28.7", "artifact": "zowe_licenses_full.zip" } }, From 170a457fc689a709b2c85afbb97165a683accdfe Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 30 May 2024 15:55:38 -0400 Subject: [PATCH 12/12] update sourceDeps Signed-off-by: MarkAckert --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 91e198833c..0be54cca82 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -326,14 +326,14 @@ "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v1.x/master", + "tag": "1.0.26", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v1.x/master", + "tag": "1.0.24", "destinations": ["Zowe PAX"] }] }, {