Merge branch 'v2.x/rc' of https://github.com/zowe/zowe-install-packaging

into users/jstruga/v2.15-RC1
zowe · Feb 21, 2024 · d5c8f15 · d5c8f15
2 parents 4df09a1 + b8d2eab
commit d5c8f15
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/bin/commands/certificate/pkcs12/lock/.parameters b/bin/commands/certificate/pkcs12/lock/.parameters
@@ -1,4 +1,4 @@
 keystore-dir|d|string|required||||Keystore directory.
 user||string|required||||Owner of the keystore directory.
 group||string|required||||Group of the keystore directory.
-group-permission||string|||||Group permission. Can be <empty> for no permission, or `read`, `write`.
+group-permission||string|||||Group permission. Can be `<empty>` for no permission, or `read`, `write`.
diff --git a/manifest.json.template b/manifest.json.template
@@ -52,11 +52,11 @@
       "artifact": "zss-2.15.0-rc-1103-20240220211201.pax"
     },
     "org.zowe.explorer.jobs.jobs-api-package": {
-      "version": "2.0.25",
+      "version": "2.0.26",
       "artifact": "jobs-api-package-*.zip"
     },
     "org.zowe.explorer.files.files-api-package": {
-      "version": "2.0.26",
+      "version": "2.0.27",
       "artifact": "files-api-package-*.zip"
     },
     "org.zowe.explorer-jes": {
@@ -73,39 +73,39 @@
       "artifact": "explorer-ip*.pax"
     },
     "org.zowe.apiml.api-catalog-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "api-catalog*.zip"
     },
     "org.zowe.apiml.discovery-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "discovery*.zip"
     },
     "org.zowe.apiml.gateway-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "gateway*.zip"
     },
     "org.zowe.apiml.caching-service-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "caching-service*.zip"
     },
     "org.zowe.apiml.metrics-service-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "metrics-service*.zip"
     },
     "org.zowe.apiml.apiml-common-lib-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "apiml-common-lib-*.zip"
     },
     "org.zowe.apiml.sdk.common-java-lib-package": {
       "version": "2.0.4",
       "artifact": "common-java-lib-*.zip"
     },
     "org.zowe.apiml.sdk.apiml-sample-extension-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "apiml-sample-extension-*.zip"
     },
     "org.zowe.apiml.cloud-gateway-package": {
-      "version": "2.14.4",
+      "version": "2.15.0",
       "artifact": "cloud-gateway-*.zip"
     },
     "org.zowe.configmgr-rexx": {
@@ -145,7 +145,7 @@
       "componentGroup": "Zowe API Mediation Layer",
       "entries": [{
         "repository": "api-layer",
-        "tag": "v2.14.4",
+        "tag": "v2.15.0",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -217,14 +217,14 @@
       "componentGroup": "Zowe CLI",
       "entries": [{
         "repository": "zowe-cli",
-        "tag": "v7.21.3",
+        "tag": "v7.23.3",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {
       "componentGroup": "IBM&reg CICS&reg Plug-in for Zowe CLI",
       "entries": [{
         "repository": "zowe-cli-cics-plugin",
-        "tag": "v5.0.1",
+        "tag": "v5.0.4",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {
@@ -245,14 +245,14 @@
       "componentGroup": "z/OS&reg FTP Plug-in for Zowe CLI",
       "entries": [{
         "repository": "zowe-cli-ftp-plugin",
-        "tag": "v2.1.6",
+        "tag": "v2.1.8",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {
       "componentGroup": "IBM&reg IMS&reg Plug-in for Zowe CLI",
       "entries": [{
         "repository": "zowe-cli-ims-plugin",
-        "tag": "v3.0.0",
+        "tag": "v3.0.1",
         "destinations": ["Zowe CLI Package"]
       }]
     }, {
@@ -287,21 +287,21 @@
       "componentGroup": "Zowe Explorer Common REST Server",
       "entries": [{
         "repository": "explorer-api-common",
-        "tag": "2.0.30",
+        "tag": "2.0.31",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Data Sets REST Server",
       "entries": [{
         "repository": "data-sets",
-        "tag": "2.0.26",
+        "tag": "2.0.27",
         "destinations": ["Zowe PAX"]
       }]
     }, {
       "componentGroup": "Zowe Explorer Jobs REST Server",
       "entries": [{
         "repository": "jobs",
-        "tag": "2.0.25",
+        "tag": "2.0.26",
         "destinations": ["Zowe PAX"]
       }]
     },
@@ -372,7 +372,7 @@
       "componentGroup": "Zowe Visual Studio Code Extension",
       "entries": [{
         "repository": "vscode-extension-for-zowe",
-        "tag": "v2.13.1",
+        "tag": "v2.14.1",
         "destinations": ["Visual Studio Code Marketplace"]
       }]
     },
@@ -402,23 +402,23 @@
     "api-catalog": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/api-catalog-services",
-      "tag" : "2.14.4-ubuntu"
+      "tag" : "2.15.0-ubuntu"
     },
     "caching": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/caching-service",
-      "tag" : "2.14.4-ubuntu"
+      "tag" : "2.15.0-ubuntu"
     },
     "discovery": {
       "kind": "statefulset",
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/discovery-service",
-      "tag" : "2.14.4-ubuntu"
+      "tag" : "2.15.0-ubuntu"
     },
     "gateway": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/gateway-service",
-      "tag" : "2.14.4-ubuntu"
+      "tag" : "2.15.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.26-ubuntu"
+      "tag" : "2.0.27-ubuntu"
     },
     "jobs-api": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/jobs-api",
-      "tag" : "2.0.25-ubuntu"
+      "tag" : "2.0.26-ubuntu"
     },
     "base": {
       "registry": "zowe-docker-release.jfrog.io",

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -857,7 +857,7 @@
         "zowe": {
           "type": "object",
           "description": "Component level overrides for top level Zowe network configuration.",
-          "additionalProperties": false,
+          "additionalProperties": true,
           "properties": {
             "network": {
               "$ref": "#/$defs/networkSettings"