Merge branch 'v1.x/rc' into useers/jstruga/webui-rc1

zowe · May 30, 2024 · c8b80c9 · c8b80c9
2 parents 059dc02 + fe96b55
commit c8b80c9
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 23 deletions.
diff --git 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
@@ -67,12 +67,12 @@
       "artifact": "zss-1.28.7-rc-1142-20240529170519.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*"]
     },
@@ -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": {
@@ -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"
     }
   },
@@ -228,7 +228,7 @@
       "componentGroup": "Zowe CLI",
       "entries": [{
         "repository": "zowe-cli",
-        "tag": "v6.40.27",
+        "tag": "v6.40.28",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {
@@ -291,7 +291,7 @@
       "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor",
       "entries": [{
         "repository": "orion-editor-component",
-        "tag": "master",
+        "tag": "v2.x/master",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -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"]
       }]
     }, {
@@ -422,7 +422,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"]
       }]
@@ -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",
@@ -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": {

diff --git 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
@@ -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
@@ -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 <ROOT_DIR>/bin/zowe-configure-instance.sh -c
+  <PATH_TO_INSTANCE_DIR> 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
@@ -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
@@ -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
+#UO90051 UO90052 - IO29352 IO29353  IO29354 - Thu Apr 11 21:48:44 UTC 2024
+UO90063 UO90064 - IO29436 IO29437  IO29438
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    IO29352
+    IO29353
+    IO29354
     IO29305
     IO29306
     IO29307
@@ Expand Down @@