Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/merging/main-2.12.0' into etag…
Browse files Browse the repository at this point in the history
…-mismatch-not-triggering-compare
  • Loading branch information
SanthoshiBoyina1 committed Nov 3, 2023
2 parents aba4048 + b0be0a7 commit c6d31b4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"command": {
"version": {
"forcePublish": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-zowe-explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-zowe-explorer",
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"description": "Custom ESLint Rules for ZOWE Explorer",
"keywords": [
"eslint",
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zowe-explorer-api",
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"description": "Extensibility API for Zowe Explorer.",
"publisher": "Zowe",
"author": "Zowe",
Expand Down
4 changes: 2 additions & 2 deletions packages/zowe-explorer-ftp-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Zowe",
"license": "EPL-2.0",
"description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"icon": "resources/zowe-ftp-color.png",
"repository": {
"url": "https://github.com/zowe/vscode-extension-for-zowe"
Expand Down Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@zowe/zos-ftp-for-zowe-cli": "2.1.2",
"@zowe/zowe-explorer-api": "2.13.0-SNAPSHOT",
"@zowe/zowe-explorer-api": "2.12.1-SNAPSHOT",
"tmp": "0.2.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-extension-for-zowe",
"displayName": "%displayName%",
"description": "%description%",
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"publisher": "Zowe",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -1989,7 +1989,7 @@
"copy-webpack-plugin": "^6.4.1",
"cross-env": "^5.2.0",
"del": "^4.1.1",
"eslint-plugin-zowe-explorer": "2.13.0-SNAPSHOT",
"eslint-plugin-zowe-explorer": "2.12.1-SNAPSHOT",
"event-stream": "^4.0.1",
"expect": "^24.8.0",
"geckodriver": "^1.19.1",
Expand All @@ -2015,7 +2015,7 @@
},
"dependencies": {
"@zowe/secrets-for-zowe-sdk": "7.18.4",
"@zowe/zowe-explorer-api": "2.13.0-SNAPSHOT",
"@zowe/zowe-explorer-api": "2.12.1-SNAPSHOT",
"dayjs": "^1.11.10",
"fs-extra": "8.0.1",
"isbinaryfile": "4.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer/src/webviews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "webviews",
"private": true,
"type": "module",
"version": "2.13.0-SNAPSHOT",
"version": "2.12.1-SNAPSHOT",
"main": "index.js",
"license": "EPL-2.0",
"scripts": {
Expand Down

0 comments on commit c6d31b4

Please sign in to comment.