Merge branch 'master' into tsoIssueCommand

zowe · Sep 27, 2024 · 9787830 · 9787830
2 parents 4027ec4 + 464226e
commit 9787830
Show file tree

Hide file tree

Showing 19 changed files with 124 additions and 120 deletions.
diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.0.0"
+    "@zowe/imperative": "8.0.1"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0",
+  "version": "8.0.1",
   "command": {
     "publish": {
       "ignoreChanges": [

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "zoweVersion": "v3.0.0",
   "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
   "author": "Zowe",
@@ -58,17 +58,17 @@
     "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js"
   },
   "dependencies": {
-    "@zowe/core-for-zowe-sdk": "8.0.0",
-    "@zowe/imperative": "8.0.0",
-    "@zowe/provisioning-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-console-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-files-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-jobs-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-logs-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-tso-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-uss-for-zowe-sdk": "8.0.0",
-    "@zowe/zos-workflows-for-zowe-sdk": "8.0.0",
-    "@zowe/zosmf-for-zowe-sdk": "8.0.0",
+    "@zowe/core-for-zowe-sdk": "8.0.1",
+    "@zowe/imperative": "8.0.1",
+    "@zowe/provisioning-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-console-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-files-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-jobs-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-logs-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-tso-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-uss-for-zowe-sdk": "8.0.1",
+    "@zowe/zos-workflows-for-zowe-sdk": "8.0.1",
+    "@zowe/zosmf-for-zowe-sdk": "8.0.1",
     "find-process": "1.4.7",
     "lodash": "4.17.21",
     "minimatch": "9.0.5",
@@ -78,7 +78,7 @@
     "@types/diff": "^5.0.9",
     "@types/lodash": "^4.17.6",
     "@types/tar": "^6.1.11",
-    "@zowe/cli-test-utils": "8.0.0",
+    "@zowe/cli-test-utils": "8.0.1",
     "comment-json": "^4.2.3",
     "strip-ansi": "^6.0.1",
     "which": "^4.0.0"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/core-for-zowe-sdk",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Core libraries shared by Zowe SDK packages",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -49,8 +49,8 @@
     "string-width": "^4.2.3"
   },
   "devDependencies": {
-    "@zowe/cli-test-utils": "8.0.0",
-    "@zowe/imperative": "8.0.0"
+    "@zowe/cli-test-utils": "8.0.1",
+    "@zowe/imperative": "8.0.1"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Imperative package will be documented in this file.
 
+## `8.0.1`
+
+- BugFix: Removed Secrets SDK requirement when Imperative is a bundled dependency. [#2276](https://github.com/zowe/zowe-cli/issues/2276)
+
 ## `8.0.0`
 
 - MAJOR: v8.0.0 Release

diff --git a/packages/imperative/package.json b/packages/imperative/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/imperative",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "framework for building configurable CLIs",
   "author": "Zowe",
   "license": "EPL-2.0",

diff --git a/packages/imperative/src/config/src/ConvertV1Profiles.ts b/packages/imperative/src/config/src/ConvertV1Profiles.ts
@@ -20,7 +20,7 @@ import { IConfig } from "./doc/IConfig";
 import { CredentialManagerFactory } from "../../security";
 import { IConvertV1ProfOpts, ConvertMsg, ConvertMsgFmt, IConvertV1ProfResult } from "./doc/IConvertV1Profiles";
 import { IImperativeOverrides } from "../../imperative/src/doc/IImperativeOverrides";
-import { keyring } from "@zowe/secrets-for-zowe-sdk";
+import type { keyring } from "@zowe/secrets-for-zowe-sdk";
 import { AppSettings } from "../../settings";
 import { ISettingsFile } from "../../settings/src/doc/ISettingsFile";
 import { ImperativeConfig } from "../../utilities";

diff --git a/packages/imperative/src/security/src/DefaultCredentialManager.ts b/packages/imperative/src/security/src/DefaultCredentialManager.ts
@@ -13,7 +13,7 @@ import { AbstractCredentialManager, SecureCredential } from "./abstract/Abstract
 import { ImperativeError } from "../../error";
 import { Logger } from "../../logger";
 
-import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; // Used for typing purposes only
+import type { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; // Used for typing purposes only
 
 /**
  * Default Credential Manager is our implementation of the Imperative Credential Manager. This manager invokes methods