From 80e27240b6f87734640cb262d3e263a7643d60d8 Mon Sep 17 00:00:00 2001
From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:46:39 -0400
Subject: [PATCH 1/9] v2.18 Staging to RC (#3938)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove deprecated commented value for createZosmfTrust

Signed-off-by: Joe Winchester <winchest@uk.ibm.com>

* Change path to home (#3896)

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Co-authored-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>

* install command step optional

Signed-off-by: pz636264 <pavel.zlatnik@broadcom.com>

* fix (#3897)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* Backport fixes in the v2.x/rc branch to staging (#3907)

* Fix default schema validation error when using keyrings (#3901)

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>

* Respect "import" option on pkcs12 certificate setup (#3905)

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>

---------

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Co-authored-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>

* Minor changes

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>

* Minor update

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>

* language refactor

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>

* fix component abstract/description language

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>

* fix abstract lengths

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>

* Promote PTF after release v2.17.0

Signed-off-by: zowe-robot <zowe.robot@gmail.com>

* update manifest to create 2.18 staging builds

Signed-off-by: MarkAckert <mark.ackert@broadcom.com>

* Switch launcher path to point to staging

Signed-off-by: James Struga <jstruga@rocketsoftware.com>

* Backport fixes in v2.x/master to v2.x/staging (#3923)

* Rename ssh host name (#3927)

Signed-off-by: ManjuVNair133 <manjuvnair133@gmail.com>

* Clean up for crashing java (#3931)

Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com>

* update safkeyring schema (#3928)

Signed-off-by: MarkAckert <mark.ackert@broadcom.com>

* Use correct parameters (#3929)

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>

* NONRLS vsam mode if variable not initialized (#3935)

Signed-off-by: pz636264 <pavel.zlatnik@broadcom.com>

* update licenses

Signed-off-by: MarkAckert <mark.ackert@broadcom.com>

---------

Signed-off-by: Joe Winchester <winchest@uk.ibm.com>
Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Signed-off-by: pz636264 <pavel.zlatnik@broadcom.com>
Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: MarkAckert <mark.ackert@broadcom.com>
Signed-off-by: James Struga <jstruga@rocketsoftware.com>
Signed-off-by: ManjuVNair133 <manjuvnair133@gmail.com>
Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com>
Co-authored-by: Joe Winchester <winchest@uk.ibm.com>
Co-authored-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com>
Co-authored-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Co-authored-by: pz636264 <pavel.zlatnik@broadcom.com>
Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
Co-authored-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Co-authored-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
Co-authored-by: zowe-robot <zowe.robot@gmail.com>
Co-authored-by: James Struga <jstruga@rocketsoftware.com>
Co-authored-by: James Struga <xhejmsstruga@gmail.com>
Co-authored-by: ManjuVNair133 <160747386+ManjuVNair133@users.noreply.github.com>
Co-authored-by: pavelzlatnik <45940302+pavelzlatnik@users.noreply.github.com>
---
 .../support/verify-fingerprints/index.sh      |   5 +-
 bin/libs/java.sh                              |   2 +-
 bin/libs/node.sh                              |   2 +-
 bin/libs/zosmf.ts                             |   2 +-
 example-zowe.yaml                             |  11 +-
 files/SZWESAMP/ZWEINSTL                       |  24 +--
 files/SZWESAMP/ZWEITSS                        |   4 +-
 manifest.json.template                        |   4 +-
 playbooks/host_vars/tvt4188.yml               |   4 +-
 schemas/zowe-yaml-schema.json                 |   4 +-
 smpe/bld/service/promoted-apar.txt            |   3 +
 smpe/bld/service/promoted-close.txt           |  45 +++++
 smpe/bld/service/promoted-hold.txt            |  25 +++
 smpe/bld/service/promoted-ptf.txt             |   2 +
 smpe/bld/service/ptf-bucket.txt               |   2 +-
 workflows/files/ZWECONF.xml                   | 158 +++++++++++-------
 workflows/templates/ZWESECUR.vtl              |   4 +-
 17 files changed, 206 insertions(+), 95 deletions(-)

diff --git a/bin/commands/support/verify-fingerprints/index.sh b/bin/commands/support/verify-fingerprints/index.sh
index 0044c5e48a..3a67cc129b 100644
--- a/bin/commands/support/verify-fingerprints/index.sh
+++ b/bin/commands/support/verify-fingerprints/index.sh
@@ -63,7 +63,10 @@ print_message "- Calculate hashes of Zowe files"
 cust_hashes=$(create_tmp_file "${tmp_file_prefix}")
 result=$(java -cp "${ZWE_zowe_runtimeDirectory}/bin/utils/" HashFiles "${all_files}" | sort > "${cust_hashes}")
 code=$?
-if [ ${code} -eq 1 -o ! -f "${cust_hashes}" ]; then
+if [ -f "${cust_hashes}" ]; then
+  file_size_check=$(wc -l "${cust_hashes}" | awk '{print $1}')
+fi
+if [ "${code}" -eq 1 -o ! -f "${cust_hashes}" -o "${file_size_check}" -eq 0 ]; then
   print_error "  * Error ZWEL0151E: Failed to create temporary file ${cust_hashes}. Please check permission or volume free space."
   print_error "  * Exit code: ${code}"
   print_error "  * Output:"
diff --git a/bin/libs/java.sh b/bin/libs/java.sh
index b610ebe58f..bf62ce6c9a 100644
--- a/bin/libs/java.sh
+++ b/bin/libs/java.sh
@@ -83,7 +83,7 @@ require_java() {
   fi
 
   if [ -z "${JAVA_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.path value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
+    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.home value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
   fi
 
   ensure_java_is_on_path
diff --git a/bin/libs/node.sh b/bin/libs/node.sh
index 4386be9005..d457c76b2f 100644
--- a/bin/libs/node.sh
+++ b/bin/libs/node.sh
@@ -94,7 +94,7 @@ require_node() {
   fi
 
   if [ -z "${NODE_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.path value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
+    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.home value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
   fi
 
   ensure_node_is_on_path
diff --git a/bin/libs/zosmf.ts b/bin/libs/zosmf.ts
index 89bddfa108..949c0eddf6 100644
--- a/bin/libs/zosmf.ts
+++ b/bin/libs/zosmf.ts
@@ -31,7 +31,7 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number):
     common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. NODE_HOME is not defined.`);
     zosmfCheckPassed=false;
   } else {
-    let execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `"https://${zosmfHost}:${zosmfPort}/zosmf/info"`, `-k`, `-H`, `"X-CSRF-ZOSMF-HEADER: true"`, `--response-type`, `status`);
+    const execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `https://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `--response-type`, `status`);
     if (execReturn.rc || !execReturn.out) {
       common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. No response code from z/OSMF server.`);
       zosmfCheckPassed=false
diff --git a/example-zowe.yaml b/example-zowe.yaml
index 0a611cf037..1f8a36c801 100644
--- a/example-zowe.yaml
+++ b/example-zowe.yaml
@@ -98,7 +98,7 @@ zowe:
     # >>>> Certificate setup scenario 1
     # PKCS12 (keystore) with Zowe generate certificates.
     certificate:
-      # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+      # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
       type: PKCS12
       pkcs12:
         # **COMMONLY_CUSTOMIZED**
@@ -143,7 +143,7 @@ zowe:
     # # >>>> Certificate setup scenario 2
     # # PKCS12 (keystore) with importing certificate generated by other CA.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: PKCS12
     #   pkcs12:
     #     # **COMMONLY_CUSTOMIZED**
@@ -176,9 +176,8 @@ zowe:
     # # >>>> Certificate setup scenario 3
     # # Zowe generated z/OS Keyring with Zowe generated certificates.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
-    #   createZosmfTrust: true
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
     #     # keyring name
@@ -212,7 +211,7 @@ zowe:
     # # >>>> Certificate setup scenario 4
     # # Zowe generated z/OS Keyring and connect to existing certificate
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
@@ -236,7 +235,7 @@ zowe:
     # # >>>> Certificate setup scenario 5
     # # Zowe generated z/OS Keyring with importing certificate stored in data set
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
diff --git a/files/SZWESAMP/ZWEINSTL b/files/SZWESAMP/ZWEINSTL
index 9d9249c81a..525a794991 100644
--- a/files/SZWESAMP/ZWEINSTL
+++ b/files/SZWESAMP/ZWEINSTL
@@ -36,20 +36,24 @@ blksize(32760) unit(sysallda) space(30,15) tracks
 //STDOUT   DD SYSOUT=*
 //STDERR   DD SYSOUT=*
 //STDPARM DD *
-SH cd {zowe.runtimeDirectory} &&
-cd files/SZWESAMP &&
+SH cd '{zowe.runtimeDirectory}' &&
+cd 'files/SZWESAMP' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../SZWEEXEC &&
+cd '../SZWEEXEC' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWEEXEC'" &&
-cd ../SZWELOAD &&
+cd '../SZWELOAD' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWELOAD'" &&
-cd ../../components/launcher/bin
-cp zowe_launcher "//'{zowe.setup.dataset.prefix}.SZWEAUTH'" &&
-cd ../../zss/SAMPLIB &&
-cp ZWESASTC ZWESIP00 ZWESISTC ZWESISCH
+cd '../../components/launcher/bin' &&
+cp zowe_launcher
+   "//'{zowe.setup.dataset.prefix}.SZWEAUTH(ZWELNCH)'" &&
+cd '../../zss/SAMPLIB' &&
+cp ZWESIP00 ZWESISCH
    "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../LOADLIB &&
+cp ZWESAUX
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESASTC)'" &&
+cp ZWESIS01
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESISTC)'" &&
+cd '../LOADLIB' &&
 cp ZWESIS01 ZWESAUX ZWESISDL
    "//'{zowe.setup.dataset.prefix}.SZWEAUTH'"
 /*
-
diff --git a/files/SZWESAMP/ZWEITSS b/files/SZWESAMP/ZWEITSS
index 03ed3c0804..512ef8c8f6 100644
--- a/files/SZWESAMP/ZWEITSS
+++ b/files/SZWESAMP/ZWEITSS
@@ -99,7 +99,7 @@
 
 /* userid for ZOWE main server                                       */
   TSS LIST({zowe.setup.security.users.zowe}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PROTECTED +
    NAME('ZOWE MAIN SERVER') +
    DEPT(&STCUDEP.)
    TSS ADD({zowe.setup.security.users.zowe}) +
@@ -109,7 +109,7 @@
 
 /* userid for ZIS cross memory server                                */
   TSS LIST({zowe.setup.security.users.zis}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PROTECTED +
    NAME('ZOWE ZIS CROSS MEMORY SERVER') +
    DEPT(&STCUDEP.)
   TSS ADD({zowe.setup.security.users.zis}) +
diff --git a/manifest.json.template b/manifest.json.template
index 7352b04cde..cec46d2349 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -1,6 +1,6 @@
 {
   "name": "Zowe",
-  "version": "2.17.0",
+  "version": "2.18.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",
@@ -136,7 +136,7 @@
       "version": "2.0.3"
     },
     "org.zowe.licenses": {
-      "version": "2.16.0",
+      "version": "2.18.0",
       "artifact": "zowe_licenses_full.zip"
     }
   },
diff --git a/playbooks/host_vars/tvt4188.yml b/playbooks/host_vars/tvt4188.yml
index ce58c19764..d158b19685 100644
--- a/playbooks/host_vars/tvt4188.yml
+++ b/playbooks/host_vars/tvt4188.yml
@@ -1,5 +1,5 @@
 ---
-ansible_ssh_host: tvt4188.svl.ibm.com
+ansible_ssh_host: tvt4188.pok.stglabs.ibm.com
 ansible_user:
 ansible_password:
 
@@ -16,7 +16,7 @@ zowe_smpe_volser: T41882
 # caching service volume
 zowe_caching_vsam_volume: T41882
 
-zowe_external_ip_address: 9.30.241.209
+zowe_external_ip_address: 9.47.90.163
 zowe_zlux_terminal_telnet_port: 992
 zowe_zlux_terminal_telnet_security_type: tls
 zowe_apiml_security_x509_enabled: true
diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
index 4601706c51..deadae3492 100644
--- a/schemas/zowe-yaml-schema.json
+++ b/schemas/zowe-yaml-schema.json
@@ -804,7 +804,7 @@
             "file": {
               "type": "string",
               "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.",
-              "pattern": "^safkeyring:\/\/.*"
+              "pattern": "^safkeyring[a-z]*:\/\/.*"
             },
             "password": {
               "type": "string",
@@ -831,7 +831,7 @@
             "file": {
               "type": "string",
               "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.",
-              "pattern": "^safkeyring:\/\/.*"
+              "pattern": "^safkeyring[a-z]*:\/\/.*"
             },
             "password": {
               "type": "string",
diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt
index f9cd37ddc0..e65ef7390f 100644
--- a/smpe/bld/service/promoted-apar.txt
+++ b/smpe/bld/service/promoted-apar.txt
@@ -1,3 +1,6 @@
+IO29428
+IO29429
+IO29430
 IO29424
 IO29425
 IO29426
diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt
index a2f51e8eaf..b0196523e5 100644
--- a/smpe/bld/service/promoted-close.txt
+++ b/smpe/bld/service/promoted-close.txt
@@ -1,3 +1,48 @@
+    IO29428 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.17.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
+    IO29429 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.17.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
+    IO29430 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.17.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
     IO29424 -
       PROBLEM SUMMARY:
       ****************************************************************
diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt
index 2930ab1572..e5d2bfc0ca 100644
--- a/smpe/bld/service/promoted-hold.txt
+++ b/smpe/bld/service/promoted-hold.txt
@@ -1,3 +1,28 @@
+++HOLD(UO90059) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24200)
+  COMMENT(
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: stop servers                                    *
+  ****************************************************************
+  * Timing: pre-APPLY                                            *
+  ****************************************************************
+  * Part: ZWESLSTC and ZWESISTC                                  *
+  ****************************************************************
+  Stop the Zowe servers before installing this update.
+  
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: start servers                                   *
+  ****************************************************************
+  * Timing: post-APPLY                                           *
+  ****************************************************************
+  * Part: ZWESLSTC and ZWESISTC                                  *
+  ****************************************************************
+  Start the Zowe servers after installing this update.
+  
+  ).
 ++HOLD(UO90057) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24144)
   COMMENT(
   ****************************************************************
diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt
index 0e1d192cd2..a3922dcc47 100644
--- a/smpe/bld/service/promoted-ptf.txt
+++ b/smpe/bld/service/promoted-ptf.txt
@@ -1,3 +1,5 @@
+UO90059
+UO90060
 UO90057
 UO90058
 UO90049
diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt
index 6fda96e640..11868e20ab 100644
--- a/smpe/bld/service/ptf-bucket.txt
+++ b/smpe/bld/service/ptf-bucket.txt
@@ -23,5 +23,5 @@
 #UO90047 UO90048 - IO29346 IO29347   IO29348 - Fri Jan 26 17:21:09 UTC 2024
 #UO90049 UO90050 - IO29349 IO29350   IO29351 - Fri Mar  8 19:42:44 UTC 2024
 #UO90057 UO90058 - IO29424 IO29425   IO29426 - Fri May 24 14:23:02 UTC 2024
-UO90059 UO90060 - IO29428 IO29429   IO29430
+#UO90059 UO90060 - IO29428 IO29429   IO29430 - Thu Jul 18 16:30:14 UTC 2024
 UO90061 UO90062 - IO29431 IO29432   IO29433
diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index 8f4ee7b153..5d725d8adf 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -101,8 +101,8 @@
     </variable>
     <variable name="zowe_setup_vsam_mode" scope="instance" visibility="public">
         <label>Zowe setup VSAM mode</label>
-        <abstract>VSAM data set with Record-Level-Sharing enabled or not</abstract>
-        <description>VSAM data set with Record-Level-Sharing enabled or not</description>
+        <abstract>VSAM data set with Record-Level-Sharing enabled or disabled</abstract>
+        <description>VSAM data set with Record-Level-Sharing enabled or disabled</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -202,8 +202,8 @@ It is used by ZWESLSTC or by zwe command</description>
     </variable>
     <variable name="zowe_externalDomains" scope="instance" visibility="public">
         <label>Zowe external domains</label>
-        <abstract>This should be the domain name of your Dynamic VIP Address (DVIPA)</abstract>
-        <description>This should be the domain name of your Dynamic VIP Address (DVIPA)</description>
+        <abstract>The domain name of your Dynamic VIP Address (DVIPA)</abstract>
+        <description>The domain name of your Dynamic VIP Address (DVIPA)</description>
         <category>zowe</category>
         <string valueMustBeChoice="false" multiLine="true">
             <!-- Put validation here -->
@@ -213,7 +213,7 @@ It is used by ZWESLSTC or by zwe command</description>
     </variable>
     <variable name="zowe_externalPort" scope="instance" visibility="public">
         <label>Zowe external port</label>
-        <abstract>This is the port you use to access Zowe Gateway from your web browser</abstract>
+        <abstract>The port you use to access Zowe Gateway from your web browser</abstract>
         <description>This is the port you use to access Zowe Gateway from your web browser.
 In many use cases, this should be same as &lt;b&gt;components.gateway.port&lt;/b&gt;. But in
 some use cases, like containerization, this port could be different.</description>
@@ -268,7 +268,7 @@ some use cases, like containerization, this port could be different.</descriptio
     </variable>
     <variable name="zowe_certificate_keystore_file" scope="instance" visibility="public">
         <label>Zowe certificate keystore file</label>
-        <abstract>Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING".</abstract>
+        <abstract>Zowe certificate keystore file. For keyring, the format is "safkeyring://OWNER/KEYRING".</abstract>
         <description>Zowe certificate keystore file</description>
         <category>certificates</category>
         <string valueMustBeChoice="false" multiLine="false">
@@ -317,7 +317,7 @@ some use cases, like containerization, this port could be different.</descriptio
     </variable>
     <variable name="zowe_certificate_truststore_file" scope="instance" visibility="public">
         <label>Zowe certificate truststore file</label>
-        <abstract>File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING".</abstract>
+        <abstract>File location for cert truststore. For keyring, the format is "safkeyring://OWNER/KEYRING"</abstract>
         <description>File location for the certificate truststore</description>
         <category>certificates</category>
         <string valueMustBeChoice="false" multiLine="false">
@@ -448,9 +448,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_gateway_enabled" scope="instance" visibility="public">
-        <label>Enable gateway</label>
-        <abstract>Should the APIML gateway be enabled?</abstract>
-        <description>Should the APIML gateway be enabled?</description>
+        <label>Enable the gateway</label>
+        <abstract>Check this option to enable the gateway</abstract>
+        <description>Check this option to enable the gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -460,8 +460,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_port" scope="instance" visibility="public">
         <label>Gateway port</label>
-        <abstract>Port for the APIML gateway</abstract>
-        <description>Port for the APIML gateway</description>
+        <abstract>Port for the API ML gateway</abstract>
+        <description>Port for the API ML gateway</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -515,8 +515,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_authorization_endpoint_enabled" scope="instance" visibility="public">
         <label>Enable gateway APIML security authorization endpoint</label>
-        <abstract>Use this to enable the security authorization endpoint</abstract>
-        <description>Use this to enable the security authorization endpoint</description>
+        <abstract>Check to enable the security authorization endpoint</abstract>
+        <description>Check to enable the security authorization endpoint</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -547,8 +547,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_server_internal_enabled" scope="instance" visibility="public">
         <label>Enable gateway server internal connector</label>
-        <abstract>Enable gateway server internal connector</abstract>
-        <description>Enable gateway server internal connector</description>
+        <abstract>Check this option to enable gateway server internal connector</abstract>
+        <description>Check this option to enable gateway server internal connector</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -579,9 +579,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_metrics_service_enabled" scope="instance" visibility="public">
-        <label>Enable metrics service</label>
-        <abstract>Use this option to enable the metrics seervice</abstract>
-        <description>Use this option to enable the metrics seervice</description>
+        <label>Enable the Metrics service</label>
+        <abstract>Check this option to enable the Metrics service</abstract>
+        <description>Check this option to enable the Metrics service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -612,9 +612,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
   <variable name="components_cloud_gateway_enabled" scope="instance" visibility="public">
-        <label>Enable cloud gateway</label>
-        <abstract>Use this option to enable the cloud gateway</abstract>
-        <description>Use this option to enable the cloud gateway</description>
+        <label>Enable the Cloud gateway</label>
+        <abstract>Check this option to enable the Cloud gateway</abstract>
+        <description>Check this option to enable the Cloud gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -645,9 +645,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_api_catalog_enabled" scope="instance" visibility="public">
-        <label>Enable API catalog</label>
-        <abstract>Use this option to enable the API catalog</abstract>
-        <description>Use this option to enable the API catalog</description>
+        <label>Enable API Catalog</label>
+        <abstract>Check this option to enable the API Catalog</abstract>
+        <description>Check this option to enable the API Catalog</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -657,8 +657,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_api_catalog_port" scope="instance" visibility="public">
         <label>API catalog port</label>
-        <abstract>Port on which the API catalog should be running.</abstract>
-        <description>Port on which the API catalog should be running.</description>
+        <abstract>Port on which the API Catalog should be running.</abstract>
+        <description>Port on which the API Catalog should be running.</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -668,8 +668,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_api_catalog_debug" scope="instance" visibility="public">
         <label>API catalog debug</label>
-        <abstract>Extra debugging information from API catalog.</abstract>
-        <description>Extra debugging information from API catalog.</description>
+        <abstract>Extra debugging information from API Catalog.</abstract>
+        <description>Extra debugging information from API Catalog.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -678,9 +678,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_discovery_enabled" scope="instance" visibility="public">
-        <label>Enable discovery</label>
-        <abstract>Should the automatic discovery be enabled?</abstract>
-        <description>Should the automatic discovery be enabled?</description>
+        <label>Enable the Discovery service</label>
+        <abstract>Check this option to enable the Discovery service</abstract>
+        <description>Check this option to enable the Discovery service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -690,8 +690,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_discovery_port" scope="instance" visibility="public">
         <label>Discovery port</label>
-        <abstract>Port on which the discovery service should be running</abstract>
-        <description>Port on which the discovery service should be running</description>
+        <abstract>Port on which the Discovery service should be running</abstract>
+        <description>Port on which the Discovery service should be running</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -701,8 +701,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_discovery_debug" scope="instance" visibility="public">
         <label>Discovery debug</label>
-        <abstract>Should there be extra debugging information?</abstract>
-        <description>Should there be extra debugging information?</description>
+        <abstract>Check this option to include extra debugging information</abstract>
+        <description>Check this option to include extra debugging information</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -711,9 +711,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_caching_service_enabled" scope="instance" visibility="public">
-        <label>Enable caching service</label>
-        <abstract>Check to enable the caching service</abstract>
-        <description>Check to enable the caching service</description>
+        <label>Enable the Caching service</label>
+        <abstract>Check this option to enable the Caching service</abstract>
+        <description>Check this option to enable the Caching service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -745,7 +745,7 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_caching_service_storage_evictionStrategy" scope="instance" visibility="public">
         <label>Caching service storage eviction strategy</label>
-        <abstract>Specifies the eviction strategy when storage size is achieved.</abstract>
+        <abstract>Specifies the eviction strategy when storage size is achieved</abstract>
         <description>Specifies the eviction strategy when storage size is achieved.</description>
         <category>components</category>
         <string valueMustBeChoice="true" multiLine="false">
@@ -759,7 +759,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_caching_service_storage_mode" scope="instance" visibility="public">
         <label>Caching service storage mode</label>
         <abstract>Specifies the components caching service storage mode</abstract>
-        <description>Specifies the components caching service storage mode</description>
+        <description>Specifies the components caching service storage mode.</description>
         <category>components</category>
         <string valueMustBeChoice="true" multiLine="false">
             <!-- Put validation here -->
@@ -774,7 +774,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_caching_service_storage_size" scope="instance" visibility="public">
         <label>Caching service storage size</label>
         <abstract>Number of records before the eviction strategies kick in</abstract>
-        <description>Number of records before the eviction strategies kick in</description>
+        <description>Number of records before the eviction strategies kick in.</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -804,9 +804,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_app_server_enabled" scope="instance" visibility="public">
-        <label>Enable app server</label>
+        <label>Enable the app server</label>
         <abstract>Check this option to enable the app server</abstract>
-        <description>Check this option to enable the app server</description>
+        <description>Check this option to enable the app server.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -817,7 +817,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_app_server_debug" scope="instance" visibility="public">
         <label>App server debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -838,8 +838,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_zss_enabled" scope="instance" visibility="public">
         <label>Enable ZSS</label>
-        <abstract>Check this option to enable the ZSS component</abstract>
-        <description>Check this option to enable the ZSS component</description>
+        <abstract>Check this option to enable ZSS</abstract>
+        <description>Check this option to enable ZSS</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -894,7 +894,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_jobs_api_enabled" scope="instance" visibility="public">
         <label>Enable jobs API</label>
         <abstract>Check this option to enable the jobs API</abstract>
-        <description>Check this option to enable the jobs API</description>
+        <description>Check this option to enable the jobs API.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -905,7 +905,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_jobs_api_debug" scope="instance" visibility="public">
         <label>Jobs API debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -927,7 +927,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_files_api_enabled" scope="instance" visibility="public">
         <label>Enable files API</label>
         <abstract>Check this option to enable the files API</abstract>
-        <description>Check this option to enable the files API</description>
+        <description>Check this option to enable the files API.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -938,7 +938,7 @@ How we want to verify SSL certificates of services. Valid values are:
   <variable name="components_files_api_debug" scope="instance" visibility="public">
         <label>Files API debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -959,8 +959,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_jes_enabled" scope="instance" visibility="public">
         <label>Enable explorer JES</label>
-        <abstract>Check this to enable the JES explorer</abstract>
-        <description>Check this to enable the JES explorer</description>
+        <abstract>Check this option to enable the JES explorer</abstract>
+        <description>Check this option to enable the JES explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -970,8 +970,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_mvs_enabled" scope="instance" visibility="public">
         <label>Enable explorer MVS</label>
-        <abstract>Check this option to enable MVS explorer</abstract>
-        <description>Check this option to enable MVS explorer</description>
+        <abstract>Check this option to enable the MVS explorer</abstract>
+        <description>Check this option to enable the MVS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -981,8 +981,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_uss_enabled" scope="instance" visibility="public">
         <label>Enable explorer USS</label>
-        <abstract>Check this option to enable USS explorer</abstract>
-        <description>Check this option to enable USS explorer</description>
+        <abstract>Check this option to enable the USS explorer</abstract>
+        <description>Check this option to enable the USS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -992,8 +992,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="useconfig_manager_enabled" scope="instance" visibility="public">
         <label>Enable Zowe configuration manager</label>
-        <abstract>Should Zowe configuration manager be enabled?</abstract>
-        <description>Should Zowe configuration manager be enabled?</description>
+        <abstract>Check this option to enable Zowe configuration manager</abstract>
+        <description>Check this option to enable Zowe configuration manager.</description>
         <category>configManager</category>
         <boolean>
             <!-- Put validation here -->
@@ -1147,6 +1147,19 @@ How we want to verify SSL certificates of services. Valid values are:
             <default>ZWESASTC</default>
         </string>
     </variable>
+    <variable name="zowe_setup_installStep_enabled" scope="instance" visibility="public">
+        <label>Install the MVS data sets</label>
+        <abstract>Check to enable this run step with the zwe install command. For convenience build only.</abstract>
+        <description>Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, 
+            you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. 
+        This option is for convenience build only. SMP/E installs the MVS data sets during installation.</description>
+        <category>installMVSDatasets</category>
+        <boolean>
+            <!-- Put validation here -->
+            <!-- Specify choices here -->
+            <default>false</default>
+        </boolean>
+    </variable>
     <!--atCreate-->
     <!--steps-->
     <step name="define_variables" optional="false">
@@ -1219,6 +1232,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <variableValue name="zowe_setup_security_stcs_zowe" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_security_stcs_zis" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_security_stcs_aux" scope="instance" noPromptIfSet="false" required="true"/>
+            <variableValue name="zowe_setup_installStep_enabled" scope="instance" noPromptIfSet="false" required="true"/>
             <instructions>Run this step to fill base variables.</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -1408,7 +1422,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <variableValue name="zowe_setup_vsam_mode" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_vsam_volume" scope="instance" noPromptIfSet="false" required="false"/>
             <variableValue name="zowe_setup_vsam_storageClass" scope="instance" noPromptIfSet="false" required="false"/>
-            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="false"/>
+            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="true"/>
             <instructions substitution="false">Run this step to specify the variables for the Caching Service</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -1834,7 +1848,11 @@ echo '    # VSAM configurations if you are using VSAM as Caching Service storage
 echo '    vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # VSAM data set with Record-Level-Sharing enabled or not' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # Valid values could be: NONRLS or RLS.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+#if (${instance-zowe_setup_vsam_mode})
 echo '      mode: $!{instance-zowe_setup_vsam_mode}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+#else
+echo '      mode: NONRLS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+#end
 echo '      # Volume name if you are using VSAM in NONRLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      volume: "$!{instance-zowe_setup_vsam_volume}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # Storage class name if you are using VSAM in RLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
@@ -2410,10 +2428,22 @@ echo '#         enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
     <step name="zowe_installation_steps" optional="false">
         <title>Zowe installation</title>
         <description>Zowe installation</description>
-        <step name="install_zowe" optional="false">
-            <title>Run the Zowe install</title>
-            <description>Configure the Zowe</description>
-            <prereqStep name="configure"/>
+        <step name="install_zowe" optional="true">
+            <title>Run the Zowe install (only for convenience build)</title>
+            <description>Configure Zowe.</description>
+            <prereqStep name="main_variables"/>
+            <prereqStep name="configure"/>            
+            <condition>
+                <expression>1==1</expression>
+                <description>Always true</description>
+                <targetStateSet>
+                    <extendStateExpression>
+                        <description>Skips this step if Install the MVS data sets was not selected</description>
+                        <expression>!${instance-zowe_setup_installStep_enabled}</expression>
+                        <targetState>skipped</targetState>
+                    </extendStateExpression>
+                </targetStateSet>
+            </condition>
             <!-- condition -->
             <!--variableValues-->
             <instructions substitution="true"><![CDATA[
diff --git a/workflows/templates/ZWESECUR.vtl b/workflows/templates/ZWESECUR.vtl
index 07675682af..25c2f367c2 100644
--- a/workflows/templates/ZWESECUR.vtl
+++ b/workflows/templates/ZWESECUR.vtl
@@ -679,7 +679,7 @@ $$
 
 /* userid for ZOWE main server                                       */
   TSS LIST(&ZOWEUSER.) SEGMENT(OMVS)
-  TSS CREATE(&ZOWEUSER.) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE(&ZOWEUSER.) TYPE(USER) PROTECTED +
    NAME('ZOWE MAIN SERVER') +
    DEPT(&STCUDEP.)
    TSS ADD(&ZOWEUSER.) GROUP(&STCGRP.) +
@@ -688,7 +688,7 @@ $$
 
 /* userid for ZIS cross memory server                                */
   TSS LIST(&ZISUSER.) SEGMENT(OMVS)
-  TSS CREATE(&ZISUSER.) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE(&ZISUSER.) TYPE(USER) PROTECTED +
    NAME('ZOWE ZIS CROSS MEMORY SERVER') +
    DEPT(&STCUDEP.)
   TSS ADD(&ZISUSER.) GROUP(&STCGRP.) +

From 7fb84039cf954d8d4e3628d4fb85f238132e2fa6 Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Wed, 14 Aug 2024 10:48:12 -0400
Subject: [PATCH 2/9] Update ZE component versions for 2.18.0 (#3937)

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com>
---
 manifest.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json.template b/manifest.json.template
index cec46d2349..abc7d5b82a 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -372,7 +372,7 @@
       "componentGroup": "Zowe Visual Studio Code Extension",
       "entries": [{
         "repository": "zowe-explorer-vscode",
-        "tag": "v2.16.3",
+        "tag": "v2.17.0",
         "destinations": ["Visual Studio Code Marketplace"]
       }]
     },

From 41e31bbc00a6d433eb39f4c183e82de6655bd4f2 Mon Sep 17 00:00:00 2001
From: zowe-robot <42546701+zowe-robot@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:49:18 -0400
Subject: [PATCH 3/9] Update component versions (#3936)

Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com>
---
 manifest.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json.template b/manifest.json.template
index abc7d5b82a..db8a8f74be 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -217,7 +217,7 @@
       "componentGroup": "Zowe CLI",
       "entries": [{
         "repository": "zowe-cli",
-        "tag": "v7.27.0",
+        "tag": "v7.29.0",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {

From 8af0277194362d6f679e3297ea80039dae64ceed Mon Sep 17 00:00:00 2001
From: James Struga <xhejmsstruga@gmail.com>
Date: Wed, 14 Aug 2024 11:34:57 -0400
Subject: [PATCH 4/9] WebUI 2.18.0 RC1 (#3939)

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
Co-authored-by: James Struga <jstruga@rocketsoftware.com>
---
 manifest.json.template | 80 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/manifest.json.template b/manifest.json.template
index db8a8f74be..df7890e6de 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -12,44 +12,44 @@
   },
   "binaryDependencies": {
     "org.zowe.zlux.zlux-core": {
-      "version": "2.17.0-RC",
+      "version": "2.18.0-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "zlux-core-2.17.0-20240711.142129.pax"
+      "artifact": "zlux-core-2.18.0-20240814.142214.pax"
     },
     "org.zowe.zlux.sample-angular-app": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "sample-angular-app-2.17.0-20240702.145557.pax"
+      "artifact": "sample-angular-app-2.18.0-20240814.141709.pax"
     },
     "org.zowe.zlux.sample-iframe-app": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "sample-iframe-app-2.17.0-20240702.145402.pax"
+      "artifact": "sample-iframe-app-2.18.0-20240814.141546.pax"
     },
     "org.zowe.zlux.sample-react-app": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "sample-react-app-2.17.0-20240702.145508.pax"
+      "artifact": "sample-react-app-2.18.0-20240814.141704.pax"
     },
     "org.zowe.zlux.tn3270-ng2": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "tn3270-ng2-2.17.0-20240702.145433.pax"
+      "artifact": "tn3270-ng2-2.18.0-20240814.141613.pax"
     },
     "org.zowe.zlux.vt-ng2": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "vt-ng2-2.17.0-20240702.145439.pax"
+      "artifact": "vt-ng2-2.18.0-20240814.141621.pax"
     },
     "org.zowe.zlux.zlux-editor": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "zlux-editor-2.17.0-20240702.145645.pax"
+      "artifact": "zlux-editor-2.18.0-20240814.141840.pax"
     },
     "org.zowe.zss": {
-      "version": "2.17.0-RC",
+      "version": "2.18.0-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "zss-2.17.0-rc-1161-20240703022432.pax"
+      "artifact": "zss-2.18.0-rc-1180-20240814142247.pax"
     },
     "org.zowe.explorer.jobs.jobs-api-package": {
       "version": "2.0.29",
@@ -109,22 +109,22 @@
       "artifact": "cloud-gateway-*.zip"
     },
     "org.zowe.configmgr-rexx": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "configmgr-rexx-2.17.0-2024070202.pax"
+      "artifact": "configmgr-rexx-2.18.0-2024081453.pax"
     },
 	"org.zowe.getesm": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "getesm-2.17.0-2024070215.pax"
+      "artifact": "getesm-2.18.0-2024081447.pax"
     },
     "org.zowe.configmgr": {
-      "version": "2.17.0-V2.X-RC",
+      "version": "2.18.0-V2.X-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "configmgr-2.17.0-2024070206.pax"
+      "artifact": "configmgr-2.18.0-2024081448.pax"
     },
     "org.zowe.launcher": {
-      "version": "2.17.0"
+      "version": "2.18.0"
     },
     "org.zowe.keyring-utilities": {
       "version": "1.0.4",
@@ -159,12 +159,12 @@
       "componentGroup": "Zowe Application Framework",
       "entries": [{
           "repository": "zlux-app-manager",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
           "repository": "zlux-app-server",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
@@ -179,17 +179,17 @@
         },
         {
           "repository": "zlux-platform",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
           "repository": "zlux-server-framework",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
           "repository": "zlux-shared",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
@@ -199,17 +199,17 @@
         },
         {
           "repository": "zlux-build",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
           "repository": "zss",
-          "tag": "v2.17.0-RC1",
+          "tag": "v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         },
         {
           "repository": "zowe-common-c",
-          "tag": "zss-v2.17.0-RC1",
+          "tag": "zss-v2.18.0-RC1",
           "destinations": ["Zowe PAX"]
         }
       ]
@@ -309,14 +309,14 @@
       "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in",
       "entries": [{
         "repository": "tn3270-ng2",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Desktop Sample Angular Application",
       "entries": [{
         "repository": "sample-angular-app",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -324,7 +324,7 @@
       "componentGroup": "Zowe Desktop Sample iFrame Application",
       "entries": [{
         "repository": "sample-iframe-app",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -332,7 +332,7 @@
       "componentGroup": "Zowe Desktop Sample React Application",
       "entries": [{
         "repository": "sample-react-app",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -340,7 +340,7 @@
       "componentGroup": "Zowe Desktop VT Emulator Plugin-in",
       "entries": [{
         "repository": "vt-ng2",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
 		"destinations": ["Zowe PAX"]
       }]
     },
@@ -348,7 +348,7 @@
       "componentGroup": "Zowe Desktop Editor Plugin-in",
       "entries": [{
         "repository": "zlux-editor",
-        "tag": "v2.17.0-RC1",
+        "tag": "v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -364,7 +364,7 @@
         "destinations": ["Zowe PAX"]
       }, {
         "repository": "launcher",
-        "tag": "v2.17.0",
+        "tag": "v2.18.0",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -388,7 +388,7 @@
       "componentGroup": "Configmgr",
       "entries": [{
         "repository": "zowe-common-c",
-        "tag": "configmgr-v2.17.0-RC1",
+        "tag": "configmgr-v2.18.0-RC1",
         "destinations": ["Zowe PAX"]
       }]
     }
@@ -423,7 +423,7 @@
     "app-server": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/app-server",
-      "tag" : "2.17.0-ubuntu"
+      "tag" : "2.18.0-ubuntu"
     },
     "explorer-ip": {
       "kind": "job",

From 95c92ccff5c28d9d8ffc98337c780a0b8d94585d Mon Sep 17 00:00:00 2001
From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>
Date: Thu, 15 Aug 2024 02:41:40 +0200
Subject: [PATCH 5/9] Apiml release 2.18.0 (#3941)

* Update manifest.json.template for apiml release 2.18.0

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

* Update manifest.json.template

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

* Update manifest.json.template

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

* Update manifest.json.template

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

---------

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>
---
 manifest.json.template | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/manifest.json.template b/manifest.json.template
index df7890e6de..75483c1336 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -52,11 +52,11 @@
       "artifact": "zss-2.18.0-rc-1180-20240814142247.pax"
     },
     "org.zowe.explorer.jobs.jobs-api-package": {
-      "version": "2.0.29",
+      "version": "2.0.30",
       "artifact": "jobs-api-package-*.zip"
     },
     "org.zowe.explorer.files.files-api-package": {
-      "version": "2.0.29",
+      "version": "2.0.30",
       "artifact": "files-api-package-*.zip"
     },
     "org.zowe.explorer-jes": {
@@ -73,27 +73,27 @@
       "artifact": "explorer-ip*.pax"
     },
     "org.zowe.apiml.api-catalog-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "api-catalog*.zip"
     },
     "org.zowe.apiml.discovery-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "discovery*.zip"
     },
     "org.zowe.apiml.gateway-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "gateway*.zip"
     },
     "org.zowe.apiml.caching-service-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "caching-service*.zip"
     },
     "org.zowe.apiml.metrics-service-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "metrics-service*.zip"
     },
     "org.zowe.apiml.apiml-common-lib-package": {
-      "version": "2.17.2",
+      "version": "2.18.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.17.2",
+      "version": "2.18.0",
       "artifact": "apiml-sample-extension-*.zip"
     },
     "org.zowe.apiml.cloud-gateway-package": {
-      "version": "2.17.2",
+      "version": "2.18.0",
       "artifact": "cloud-gateway-*.zip"
     },
     "org.zowe.configmgr-rexx": {
@@ -145,7 +145,7 @@
       "componentGroup": "Zowe API Mediation Layer",
       "entries": [{
         "repository": "api-layer",
-        "tag": "v2.17.2",
+        "tag": "v2.18.0",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -287,21 +287,21 @@
       "componentGroup": "Zowe Explorer Common REST Server",
       "entries": [{
         "repository": "explorer-api-common",
-        "tag": "2.0.32",
+        "tag": "2.0.34",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Data Sets REST Server",
       "entries": [{
         "repository": "data-sets",
-        "tag": "2.0.29",
+        "tag": "2.0.30",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Jobs REST Server",
       "entries": [{
         "repository": "jobs",
-        "tag": "2.0.29",
+        "tag": "2.0.30",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -402,23 +402,23 @@
     "api-catalog": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/api-catalog-services",
-      "tag" : "2.17.2-ubuntu"
+      "tag" : "2.18.0-ubuntu"
     },
     "caching": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/caching-service",
-      "tag" : "2.17.2-ubuntu"
+      "tag" : "2.18.0-ubuntu"
     },
     "discovery": {
       "kind": "statefulset",
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/discovery-service",
-      "tag" : "2.17.2-ubuntu"
+      "tag" : "2.18.0-ubuntu"
     },
     "gateway": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/gateway-service",
-      "tag" : "2.17.2-ubuntu"
+      "tag" : "2.18.0-ubuntu"
     },
     "app-server": {
       "registry": "zowe-docker-release.jfrog.io",
@@ -452,12 +452,12 @@
     "files-api": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/files-api",
-      "tag" : "2.0.28-ubuntu"
+      "tag" : "2.0.30-ubuntu"
     },
     "jobs-api": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/jobs-api",
-      "tag" : "2.0.27-ubuntu"
+      "tag" : "2.0.30-ubuntu"
     },
     "base": {
       "registry": "zowe-docker-release.jfrog.io",

From 9eb37aeeb32e16ca06d9a3f7b6bd756015805a74 Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Thu, 15 Aug 2024 10:04:38 -0400
Subject: [PATCH 6/9] Update DB2 CLI plug-in for Zowe 2.18.0 (#3942)

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 manifest.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json.template b/manifest.json.template
index 75483c1336..3979487479 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -231,7 +231,7 @@
       "componentGroup": "IBM&reg Db2&reg Plug-in for Zowe CLI",
       "entries": [{
         "repository": "zowe-cli-db2-plugin",
-        "tag": "v5.0.8",
+        "tag": "v5.0.9",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {

From 2ddde857db95dd51656e24c69ddd45166a8b2280 Mon Sep 17 00:00:00 2001
From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:44:16 +0200
Subject: [PATCH 7/9] Apiml rc2 update for zowe 2.18.0 (#3945)

* Update manifest.json.template for apiml rc2

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

* Update manifest.json.template for apiml

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>

---------

Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>
---
 manifest.json.template | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/manifest.json.template b/manifest.json.template
index 3979487479..5943356eeb 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -52,11 +52,11 @@
       "artifact": "zss-2.18.0-rc-1180-20240814142247.pax"
     },
     "org.zowe.explorer.jobs.jobs-api-package": {
-      "version": "2.0.30",
+      "version": "2.0.31",
       "artifact": "jobs-api-package-*.zip"
     },
     "org.zowe.explorer.files.files-api-package": {
-      "version": "2.0.30",
+      "version": "2.0.31",
       "artifact": "files-api-package-*.zip"
     },
     "org.zowe.explorer-jes": {
@@ -73,27 +73,27 @@
       "artifact": "explorer-ip*.pax"
     },
     "org.zowe.apiml.api-catalog-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "api-catalog*.zip"
     },
     "org.zowe.apiml.discovery-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "discovery*.zip"
     },
     "org.zowe.apiml.gateway-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "gateway*.zip"
     },
     "org.zowe.apiml.caching-service-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "caching-service*.zip"
     },
     "org.zowe.apiml.metrics-service-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "metrics-service*.zip"
     },
     "org.zowe.apiml.apiml-common-lib-package": {
-      "version": "2.18.0",
+      "version": "2.18.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.18.0",
+      "version": "2.18.1",
       "artifact": "apiml-sample-extension-*.zip"
     },
     "org.zowe.apiml.cloud-gateway-package": {
-      "version": "2.18.0",
+      "version": "2.18.1",
       "artifact": "cloud-gateway-*.zip"
     },
     "org.zowe.configmgr-rexx": {
@@ -145,7 +145,7 @@
       "componentGroup": "Zowe API Mediation Layer",
       "entries": [{
         "repository": "api-layer",
-        "tag": "v2.18.0",
+        "tag": "v2.18.1",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -287,21 +287,21 @@
       "componentGroup": "Zowe Explorer Common REST Server",
       "entries": [{
         "repository": "explorer-api-common",
-        "tag": "2.0.34",
+        "tag": "2.0.35",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Data Sets REST Server",
       "entries": [{
         "repository": "data-sets",
-        "tag": "2.0.30",
+        "tag": "2.0.31",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Jobs REST Server",
       "entries": [{
         "repository": "jobs",
-        "tag": "2.0.30",
+        "tag": "2.0.31",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -402,23 +402,23 @@
     "api-catalog": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/api-catalog-services",
-      "tag" : "2.18.0-ubuntu"
+      "tag" : "2.18.1-ubuntu"
     },
     "caching": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/caching-service",
-      "tag" : "2.18.0-ubuntu"
+      "tag" : "2.18.1-ubuntu"
     },
     "discovery": {
       "kind": "statefulset",
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/discovery-service",
-      "tag" : "2.18.0-ubuntu"
+      "tag" : "2.18.1-ubuntu"
     },
     "gateway": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/gateway-service",
-      "tag" : "2.18.0-ubuntu"
+      "tag" : "2.18.1-ubuntu"
     },
     "app-server": {
       "registry": "zowe-docker-release.jfrog.io",
@@ -452,12 +452,12 @@
     "files-api": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/files-api",
-      "tag" : "2.0.30-ubuntu"
+      "tag" : "2.0.31-ubuntu"
     },
     "jobs-api": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/jobs-api",
-      "tag" : "2.0.30-ubuntu"
+      "tag" : "2.0.31-ubuntu"
     },
     "base": {
       "registry": "zowe-docker-release.jfrog.io",

From 2ab698214a65a43d51c446f24111586bd3e21f46 Mon Sep 17 00:00:00 2001
From: James Struga <xhejmsstruga@gmail.com>
Date: Wed, 21 Aug 2024 20:55:47 -0400
Subject: [PATCH 8/9] security vulnerability fix for rc3 (#3949)

Signed-off-by: James Struga <xhejmsstruga@gmail.com>
---
 manifest.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json.template b/manifest.json.template
index 5943356eeb..3525f3a7c3 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -14,7 +14,7 @@
     "org.zowe.zlux.zlux-core": {
       "version": "2.18.0-RC",
       "repository": "libs-snapshot-local",
-      "artifact": "zlux-core-2.18.0-20240814.142214.pax"
+      "artifact": "zlux-core-2.18.0-20240821.193854.pax"
     },
     "org.zowe.zlux.sample-angular-app": {
       "version": "2.18.0-V2.X-RC",

From 8752645cbd402e9002f823535bea2e07a7bebeb1 Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Mon, 26 Aug 2024 15:03:04 -0400
Subject: [PATCH 9/9] Update CLI component version for 2.18.0 (#3952)

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 manifest.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json.template b/manifest.json.template
index 3525f3a7c3..36b17b84eb 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -217,7 +217,7 @@
       "componentGroup": "Zowe CLI",
       "entries": [{
         "repository": "zowe-cli",
-        "tag": "v7.29.0",
+        "tag": "v7.29.1",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {