Skip to content

Commit

Permalink
Merge branch 'next' into addEditOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
ATorrise authored Jan 24, 2024
2 parents 19bc484 + 7a447cd commit b9f2e11
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 125 deletions.
10 changes: 8 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,20 @@ Add an entry to changelog.md for any PR that introduces a feature, enhancement,
**Each changelog entry must:**
- Describe the change and how it impacts end users.
- Include a relevant Issue # or Pull Request #.
- Include one of the following prefixes:
- `BugFix` - If a fix was added
- `Enhancement` - If a feature or enhancement was introduced
- For breaking changes (only allowed for PRs merged into the "next" branch):
- `LTS Breaking` - If behavior has changed since the last LTS release
- `Next Breaking` - If behavior has changed since an earlier vNext prerelease

The following is an example of the markdown that you should insert into the changelog above the last-released version:

```
## Recent Changes

- Document your changes here. [Issue# or PR#](link-to-issue-or-pr)
- Document another change here. [Issue# or PR#](link-to-issue-or-pr)
- BugFix: Describe the bug fix here. [Issue# or PR#](link-to-issue-or-pr)
- Enhancement: Describe the enhancement here. [Issue# or PR#](link-to-issue-or-pr)
```

**Tips:**
Expand Down
4 changes: 2 additions & 2 deletions __tests__/__packages__/cli-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli-test-utils",
"version": "8.0.0-next.202401191954",
"version": "8.0.0-next.202401232128",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@types/js-yaml": "^4.0.0",
"@types/uuid": "^8.3.0",
"@zowe/imperative": "8.0.0-next.202401191954"
"@zowe/imperative": "8.0.0-next.202401232128"
},
"peerDependencies": {
"@zowe/imperative": "^8.0.0-next"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "8.0.0-next.202401191954",
"version": "8.0.0-next.202401232128",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
122 changes: 61 additions & 61 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli",
"version": "8.0.0-next.202401191954",
"version": "8.0.0-next.202401232128",
"description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -57,17 +57,17 @@
"preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js"
},
"dependencies": {
"@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/imperative": "8.0.0-next.202401191954",
"@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401191954",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/imperative": "8.0.0-next.202401232128",
"@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401232128",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401232128",
"find-process": "1.4.7",
"get-stream": "6.0.1",
"lodash": "4.17.21",
Expand All @@ -78,13 +78,13 @@
"@types/diff": "^5.0.2",
"@types/lodash": "^4.14.175",
"@types/tar": "^6.1.2",
"@zowe/cli-test-utils": "8.0.0-next.202401191954",
"@zowe/cli-test-utils": "8.0.0-next.202401232128",
"comment-json": "^4.1.1",
"strip-ansi": "^6.0.1",
"which": "^2.0.2"
},
"optionalDependencies": {
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401191954"
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401232128"
},
"engines": {
"node": ">=14.0.0"
Expand Down
Loading

0 comments on commit b9f2e11

Please sign in to comment.