Merge pull request #74 from zowe/update-next

Update next with changes from master

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the IBM® MQ Plug-in for Zowe CLI will be documented in this file.
 
+## Recent Changes
+
+- Update: Final prerelease
+
 ## `4.0.0-next.202403081534`
 
 - BugFix: Add missing npm-shrinkwrap

CONTRIBUTING.md

@@ -18,15 +18,15 @@ The following code block should be inserted into the Changelog above the last re
 
 ## Primary Contribution Guidelines
 
-We provide specific guidelines for developing Zowe MQ plug-in in the [Zowe CLI GitHub repository](https://github.com/zowe/mq-config). The following information is critical to working with the code, running/writing/maintaining automated tests, developing consistent syntax in your plug-in, and ensuring that your plug-in integrates with Zowe CLI properly:
+We provide specific guidelines for developing Zowe MQ plug-in in the [Zowe CLI GitHub repository](https://github.com/zowe/zowe-cli). The following information is critical to working with the code, running/writing/maintaining automated tests, developing consistent syntax in your plug-in, and ensuring that your plug-in integrates with Zowe CLI properly:
 
 | For more information about ... | See: |
 | ------------------------------ | ----- |
 | General guidelines that apply to contributing to Zowe CLI and Plug-ins | [Contribution Guidelines](https://github.com/zowe/zowe-cli/blob/master/CONTRIBUTING.md) |
 | Conventions and best practices for creating packages and plug-ins for Zowe CLI | [Package and Plug-in Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PackagesAndPluginGuidelines.md)|
 | Guidelines for running tests on Zowe CLI | [Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/TESTING.md) |
 | Guidelines for running tests on the plug-ins that you build for Zowe CLI | [Plug-in Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PluginTESTINGGuidelines.md) |
-| Documentation that describes the features of the Imperative CLI Framework | [About Imperative CLI Framework](https://github.com/zowe/imperative/wiki) |
+| Documentation that describes the features of the Imperative CLI Framework | [About Imperative CLI Framework](https://github.com/zowe/zowe-cli/wiki) |
 Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/MaintainerVersioning.md) |
 
 ## Contribution Guidelines Specific to the IBM MQ Plug-in for Zowe CLI

__tests__/__src__/TestUtils.ts

@@ -26,6 +26,7 @@ export function createSession(testEnvironment: ITestEnvironment<ITestPropertiesS
         port: SYSTEM_PROPS.mq.port,
         type: "basic",
         rejectUnauthorized: false,
-        basePath: SYSTEM_PROPS.mq.basepath
+        basePath: SYSTEM_PROPS.mq.basepath,
+        protocol: SYSTEM_PROPS.mq.protocol,
     });
 }

__tests__/__src__/doc/ITestPropertiesSchema.ts

@@ -9,6 +9,8 @@
 *
 */
 
+import { SessConstants } from "@zowe/imperative";
+
 /**
  * Interface representing the values in the custom_properties.yaml file
  * see example_properties.yaml for descriptions and more details
@@ -43,6 +45,10 @@ export interface ITestPropertiesSchema {
          * The location of the API
          */
         basepath: string,
+        /**
+         * Protocol for MQ
+         */
+        protocol?: SessConstants.HTTP_PROTOCOL_CHOICES,
         /**
          * The Queue manager
          */

package.json

@@ -36,17 +36,17 @@
     "configurationModule": "lib/imperative.js"
   },
   "peerDependencies": {
-    "@zowe/imperative": ">8.0.0-next.0 <8.0.0"
+    "@zowe/imperative": "^8.0.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
     "@types/node": "^18.19.17",
     "@types/yargs": "^17.0.32",
     "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",
-    "@zowe/cli": "^8.0.0-next.202409091603",
-    "@zowe/cli-test-utils": "^8.0.0-next.202409091603",
-    "@zowe/imperative": "^8.0.0-next.202403061549",
+    "@zowe/cli": "^8.0.0",
+    "@zowe/cli-test-utils": "^8.0.0",
+    "@zowe/imperative": "^8.0.0",
     "chalk": "^4.1.2",
     "env-cmd": "^10.1.0",
     "eslint": "^8.57.0",

release.config.js

@@ -2,26 +2,23 @@ module.exports = {
     branches: [
         {
             name: "master",
-            level: "minor",
+            level: "none",
+            prerelease: true,
+            channel: "next",
             devDependencies: ["@zowe/cli", "@zowe/imperative", "@zowe/cli-test-utils"]
         },
         {
-            name: "zowe-v1-lts",
+            name: "zowe-v?-lts",
             level: "patch",
             devDependencies: ["@zowe/cli", "@zowe/imperative"]
-        },
-        {
-            name: "next",
-            prerelease: true,
-            level: "none",
-            devDependencies: ["@zowe/cli", "@zowe/imperative", "@zowe/cli-test-utils"]
         }
     ],
     plugins: [
         "@octorelease/changelog",
         ["@octorelease/npm", {
             aliasTags: {
-                latest: ["zowe-v2-lts"]
+                latest: ["zowe-v2-lts"],
+                next: ["zowe-v3-lts"]
             },
             pruneShrinkwrap: true
         }],