From a4fbad8579681482c907b85635a9a218915b8d2c Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 18 Sep 2024 09:42:21 -0400 Subject: [PATCH 1/7] WebUI build for RC1 3.0.0 Signed-off-by: James Struga --- manifest.json.template | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 9418cb66b7..73edf9d080 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,9 +12,9 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.18.0-RC", + "version": "3.0.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.18.0-20240821.193854.pax" + "artifact": "zlux-core-3.0.0-20240917.191023.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.18.0-V2.X-RC", @@ -47,9 +47,9 @@ "artifact": "zlux-editor-2.18.0-20240814.141840.pax" }, "org.zowe.zss": { - "version": "2.18.0-RC", + "version": "3.0.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.18.0-rc-1180-20240814142247.pax" + "artifact": "zss-3.0.0-rc-1199-20240918133828.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.31", @@ -69,7 +69,7 @@ "version": "2.0.9" }, "org.zowe.explorer-ip": { - "version": "2.0.0", + "version": "3.0.0", "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { @@ -109,22 +109,22 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.18.0-V2.X-RC", + "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.18.0-2024081453.pax" + "artifact": "configmgr-rexx-3.0.0-2024091807.pax" }, "org.zowe.getesm": { - "version": "2.18.0-V2.X-RC", + "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "getesm-2.18.0-2024081447.pax" + "artifact": "getesm-3.0.0-2024091859.pax" }, "org.zowe.configmgr": { - "version": "2.18.0-V2.X-RC", + "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.18.0-2024081448.pax" + "artifact": "configmgr-3.0.0-2024091857.pax" }, "org.zowe.launcher": { - "version": "2.18.0" + "version": "3.0.0" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -159,12 +159,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -179,17 +179,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -199,17 +199,17 @@ }, { "repository": "zlux-build", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.18.0-RC1", + "tag": "zss-v3.0.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -380,7 +380,7 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.0.0", + "tag": "v3.0.0", "destinations": ["Zowe PAX"] }] }, @@ -388,7 +388,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.18.0-RC1", + "tag": "configmgr-v3.0.0-RC1", "destinations": ["Zowe PAX"] }] } From 53426f97d3b3ea30fa55a55e8fdb243815dcc079 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 19 Sep 2024 10:14:08 -0400 Subject: [PATCH 2/7] update manifest with all components Signed-off-by: James Struga --- manifest.json.template | 192 ++++++++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 78 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 525f369043..99f084f91c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -17,33 +17,39 @@ "artifact": "zlux-core-3.0.0-20240917.191023.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "2.18.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.18.0-20240814.141709.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "2.18.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.18.0-20240814.141546.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "2.18.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.18.0-20240814.141704.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "3.0.0-V3.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-3.0.0-20240919.130824.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "3.0.0-V3.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-3.0.0-20240919.130822.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^3.0.0-V3.X-STAGING", - "artifact": "*.pax" + "version": "2.18.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.18.0-20240814.141840.pax" }, "org.zowe.zss": { "version": "3.0.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-3.0.0-rc-1199-20240918133828.pax" + "artifact": "zss-3.0.0-rc-1202-20240919131259.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.31", @@ -67,59 +73,55 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "api-catalog-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "caching-service*.zip" + }, + "org.zowe.apiml.metrics-service-package": { + "version": "2.18.1", + "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "apiml-common-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "^2.0.0-SNAPSHOT", - "artifact": "common-java-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.0.5", + "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "apiml-sample-extension-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.18.1", + "artifact": "apiml-sample-extension-*.zip" }, - "org.zowe.apiml.zaas-package": { - "version": "^3.0.3-SNAPSHOT", - "artifact": "zaas-package-*.zip", - "exclusions": ["*PR*.zip"] + "org.zowe.apiml.cloud-gateway-package": { + "version": "2.18.1", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-3.0.0-2024091807.pax" + "artifact": "configmgr-rexx-3.0.0-2024091935.pax" }, "org.zowe.getesm": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "getesm-3.0.0-2024091859.pax" + "artifact": "getesm-3.0.0-2024091917.pax" }, "org.zowe.configmgr": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-3.0.0-2024091857.pax" + "artifact": "configmgr-3.0.0-2024091929.pax" }, "org.zowe.launcher": { "version": "3.0.0" @@ -139,11 +141,11 @@ } }, "sourceDependencies": [ - { + { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v3.x.x", + "tag": "v2.18.1", "destinations": ["Zowe PAX"] }] }, { @@ -247,17 +249,24 @@ "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.x/master", - "destinations": ["Zowe PAX"] + "repository": "zowe-cli-ims-plugin", + "tag": "v3.0.1", + "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ "repository": "orion-editor-component", - "tag": "v2.x/master", + "tag": "v0.0.14", + "destinations": ["Zowe PAX"] + }] + }, { + "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "entries": [{ + "repository": "explorer-mvs", + "tag": "v2.0.9", "destinations": ["Zowe PAX"] }] }, { @@ -271,14 +280,36 @@ "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.0.9", + "tag": "v3.0.0", "destinations": ["Zowe PAX"] }] }, { + "componentGroup": "Zowe Explorer Common REST Server", + "entries": [{ + "repository": "explorer-api-common", + "tag": "2.0.35", + "destinations": ["Zowe PAX"] + }] + }, { + "componentGroup": "Zowe Explorer Data Sets REST Server", + "entries": [{ + "repository": "data-sets", + "tag": "2.0.31", + "destinations": ["Zowe PAX"] + }] + }, { + "componentGroup": "Zowe Explorer Jobs REST Server", + "entries": [{ + "repository": "jobs", + "tag": "2.0.31", + "destinations": ["Zowe PAX"] + }] + }, + { "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }] }, { @@ -309,7 +340,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.18.0-RC1", + "tag": "v3.0.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +364,7 @@ "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.18.0", + "tag": "v3.0.0", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +372,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "zowe-explorer-vscode", - "tag": "next", + "tag": "v2.17.0", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -371,39 +402,34 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" - }, - "gateway": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.18.1-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.18.1-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.18.1-ubuntu" }, - "zaas": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/zaas-service", - "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" + "gateway": { + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.18.1-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.18.0-ubuntu" + "tag" : "3.0.0-ubuntu" }, "explorer-ip": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu" + "tag" : "3.0.0-ubuntu" }, "explorer-jes": { "kind": "job", @@ -421,25 +447,35 @@ "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-uss", - "tag" : "2.0.9-ubuntu" + "tag" : "3.0.0-ubuntu" + }, + "files-api": { + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2.0.31-ubuntu" + }, + "jobs-api": { + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2.0.31-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0.1-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0.1-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0.1-ubuntu" } }, "dependencyDecisions": { "rel": ".dependency/doc/dependency_decisions.yml" } -} +} \ No newline at end of file From a78d583782ad4e9c4568cff63276dab80e0a9b1a Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 19 Sep 2024 10:21:30 -0400 Subject: [PATCH 3/7] remove files and jobs api Signed-off-by: James Struga --- manifest.json.template | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 99f084f91c..03d098e068 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -51,14 +51,6 @@ "repository": "libs-snapshot-local", "artifact": "zss-3.0.0-rc-1202-20240919131259.pax" }, - "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.31", - "artifact": "jobs-api-package-*.zip" - }, - "org.zowe.explorer.files.files-api-package": { - "version": "2.0.31", - "artifact": "files-api-package-*.zip" - }, "org.zowe.explorer-jes": { "version": "2.0.7" }, @@ -66,7 +58,7 @@ "version": "2.0.9" }, "org.zowe.explorer-uss": { - "version": "2.0.9" + "version": "3.0.0" }, "org.zowe.explorer-ip": { "version": "3.0.0", @@ -449,16 +441,6 @@ "name": "ompzowe/explorer-uss", "tag" : "3.0.0-ubuntu" }, - "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2.0.31-ubuntu" - }, - "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2.0.31-ubuntu" - }, "base": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/base", From 4f5227546eb8b773681164b72070ad2a20a402a1 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 19 Sep 2024 10:31:03 -0400 Subject: [PATCH 4/7] update v3 changes Signed-off-by: James Struga --- manifest.json.template | 92 +++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 03d098e068..be62e27c26 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -65,41 +65,48 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.18.1", - "artifact": "api-catalog*.zip" + "version": "^3.0.3-SNAPSHOT", + "artifact": "api-catalog-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.discovery-package": { - "version": "2.18.1", - "artifact": "discovery*.zip" + "version": "^3.0.3-SNAPSHOT", + "artifact": "discovery-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.gateway-package": { - "version": "2.18.1", - "artifact": "gateway*.zip" + "version": "^3.0.3-SNAPSHOT", + "artifact": "gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.caching-service-package": { - "version": "2.18.1", - "artifact": "caching-service*.zip" + "version": "^3.0.3-SNAPSHOT", + "artifact": "caching-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.metrics-service-package": { "version": "2.18.1", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.18.1", - "artifact": "apiml-common-lib-*.zip" + "version": "^3.0.3-SNAPSHOT", + "artifact": "apiml-common-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { "version": "2.0.5", "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.18.1", - "artifact": "apiml-sample-extension-*.zip" - }, - "org.zowe.apiml.cloud-gateway-package": { - "version": "2.18.1", - "artifact": "cloud-gateway-*.zip" - }, + "version": "^3.0.3-SNAPSHOT", + "artifact": "apiml-sample-extension-*.zip", + "exclusions": ["*PR*.zip"] + }, + "org.zowe.apiml.zaas-package": { + "version": "^3.0.3-SNAPSHOT", + "artifact": "zaas-package-*.zip", + "exclusions": ["*PR*.zip"] + }, "org.zowe.configmgr-rexx": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", @@ -137,7 +144,7 @@ "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.18.1", + "tag": "v3.x.x", "destinations": ["Zowe PAX"] }] }, { @@ -276,28 +283,6 @@ "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Explorer Common REST Server", - "entries": [{ - "repository": "explorer-api-common", - "tag": "2.0.35", - "destinations": ["Zowe PAX"] - }] - }, { - "componentGroup": "Zowe Explorer Data Sets REST Server", - "entries": [{ - "repository": "data-sets", - "tag": "2.0.31", - "destinations": ["Zowe PAX"] - }] - }, { - "componentGroup": "Zowe Explorer Jobs REST Server", - "entries": [{ - "repository": "jobs", - "tag": "2.0.31", - "destinations": ["Zowe PAX"] - }] - }, - { "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", @@ -364,7 +349,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "zowe-explorer-vscode", - "tag": "v2.17.0", + "tag": "next", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -394,23 +379,28 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.18.1-ubuntu" + "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" + }, + "gateway": { + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.18.1-ubuntu" + "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.18.1-ubuntu" + "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" }, - "gateway": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.18.1-ubuntu" + "zaas": { + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/zaas-service", + "tag" : "3.0.21-SNAPSHOT-ubuntu.v2-x-x" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", @@ -444,17 +434,17 @@ "base": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/base", - "tag" : "2.0.1-ubuntu" + "tag" : "2-ubuntu" }, "base-jdk": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/base-jdk", - "tag" : "2.0.1-ubuntu" + "tag" : "2-ubuntu" }, "base-node": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/base-node", - "tag" : "2.0.1-ubuntu" + "tag" : "2-ubuntu" } }, "dependencyDecisions": { From 6dcdb6497c4f08013e71d292bd355fc4e85deb8e Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 19 Sep 2024 10:34:49 -0400 Subject: [PATCH 5/7] update order Signed-off-by: James Struga --- manifest.json.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index be62e27c26..0647440c8e 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -84,10 +84,6 @@ "artifact": "caching-service-*.zip", "exclusions": ["*PR*.zip"] }, - "org.zowe.apiml.metrics-service-package": { - "version": "2.18.1", - "artifact": "metrics-service*.zip" - }, "org.zowe.apiml.apiml-common-lib-package": { "version": "^3.0.3-SNAPSHOT", "artifact": "apiml-common-lib-*.zip", From 08bf79f1a2a6108f3240f32cf14a611cf578c3db Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 19 Sep 2024 10:39:59 -0400 Subject: [PATCH 6/7] update order Signed-off-by: James Struga --- manifest.json.template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 0647440c8e..525e859a1d 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -90,8 +90,9 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "2.0.5", - "artifact": "common-java-lib-*.zip" + "version": "^2.0.0-SNAPSHOT", + "artifact": "common-java-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { "version": "^3.0.3-SNAPSHOT", @@ -103,21 +104,21 @@ "artifact": "zaas-package-*.zip", "exclusions": ["*PR*.zip"] }, - "org.zowe.configmgr-rexx": { - "version": "3.0.0-V3.X-RC", - "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-3.0.0-2024091935.pax" - }, "org.zowe.getesm": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", "artifact": "getesm-3.0.0-2024091917.pax" }, - "org.zowe.configmgr": { + "org.zowe.configmgr": { "version": "3.0.0-V3.X-RC", "repository": "libs-snapshot-local", "artifact": "configmgr-3.0.0-2024091929.pax" }, + "org.zowe.configmgr-rexx": { + "version": "3.0.0-V3.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-3.0.0-2024091935.pax" + }, "org.zowe.launcher": { "version": "3.0.0" }, From cd2739ffba1b6382a2d6530540566db49b41dc1f Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 19 Sep 2024 12:38:19 -0400 Subject: [PATCH 7/7] remove ims plugin from sourceDeps Signed-off-by: MarkAckert --- manifest.json.template | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 525e859a1d..e5a087a730 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -244,13 +244,6 @@ "tag": "v2.1.9", "destinations": ["Zowe CLI Package"] }] - }, { - "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", - "entries": [{ - "repository": "zowe-cli-ims-plugin", - "tag": "v3.0.1", - "destinations": ["Zowe CLI Package"] - }] }, { "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ @@ -315,7 +308,7 @@ "entries": [{ "repository": "vt-ng2", "tag": "v3.0.0-RC1", - "destinations": ["Zowe PAX"] + "destinations": ["Zowe PAX"] }] }, { @@ -447,4 +440,4 @@ "dependencyDecisions": { "rel": ".dependency/doc/dependency_decisions.yml" } -} \ No newline at end of file +}