Skip to content

Commit 02acfd1

Browse files
committed
Merge branch 'private-release/v2.0.0' into public-release/v2.0.0
Signed-off-by: Uladzislau <leksilonchikk@gmail.com>
2 parents 74e0815 + ec2275f commit 02acfd1

586 files changed

Lines changed: 15497 additions & 8181 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/sonar/action.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@ runs:
1818
./gradlew --info sonar
1919
-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
2020
-Dresults="build/reports/tests/test,build/test-results/test,build/reports/kover/html"
21-
-Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN
22-
-Dsonar.coverage.jacoco.xmlReportPaths="build/reports/kover/xml/report.xml"
21+
-Psonar.host.url=$SONAR_HOST_URL
22+
-Dsonar.token=$SONAR_TOKEN
23+
-Dsonar.organization=for-mainframe
24+
-Dsonar.coverage.jacoco.xmlReportPaths="build/reports/kover/report.xml"
25+
-Dsonar.coverage.exclusions="**src/IC-*/**"
26+
-Dsonar.inclusions="**src/main/kotlin/eu/ibagroup/formainframe/**"
27+
-Dsonar.projectKey=for-mainframe_For-Mainframe

.github/workflows/build.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ jobs:
2121
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
24-
product: ["IC-231","IC-233"]
24+
product: ["IC-231","IC-233","IC-243"]
2525
include:
2626
- product: "IC-231"
2727
distribution: "zulu"
2828
java: "17"
2929
- product: "IC-233"
3030
distribution: "zulu"
3131
java: "17"
32+
- product: "IC-243"
33+
distribution: "zulu"
34+
java: "21"
3235
max-parallel: 10
3336
fail-fast: false
3437
outputs:
@@ -68,7 +71,7 @@ jobs:
6871
echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
6972
7073
# prepare list of IDEs to use by plugin verifier:
71-
./gradlew listProductsReleases
74+
./gradlew --quiet printProductsReleases > build/productReleases.txt
7275
7376
- name: Build plugin
7477
shell: bash
@@ -98,14 +101,17 @@ jobs:
98101
runs-on: ubuntu-latest
99102
strategy:
100103
matrix:
101-
product: ["IC-231","IC-233"]
104+
product: ["IC-231","IC-233","IC-243"]
102105
include:
103106
- product: "IC-231"
104107
distribution: "zulu"
105108
java: "17"
106109
- product: "IC-233"
107110
distribution: "zulu"
108111
java: "17"
112+
- product: "IC-243"
113+
distribution: "zulu"
114+
java: "21"
109115
max-parallel: 10
110116
fail-fast: false
111117
steps:
@@ -143,6 +149,7 @@ jobs:
143149
path: ${{ github.workspace }}/build/reports/kover/html
144150

145151
- name: SonarCloud scans
152+
if: ${{ matrix.product == 'IC-243' }}
146153
continue-on-error: true
147154
uses: ./.github/actions/sonar
148155
env:
@@ -157,14 +164,17 @@ jobs:
157164
runs-on: ubuntu-latest
158165
strategy:
159166
matrix:
160-
product: ["IC-231","IC-233"]
167+
product: ["IC-231","IC-233","IC-243"]
161168
include:
162169
- product: "IC-231"
163170
distribution: "zulu"
164171
java: "17"
165172
- product: "IC-233"
166173
distribution: "zulu"
167174
java: "17"
175+
- product: "IC-243"
176+
distribution: "zulu"
177+
java: "21"
168178
max-parallel: 10
169179
fail-fast: false
170180
steps:
@@ -193,12 +203,12 @@ jobs:
193203
uses: actions/cache@v4
194204
with:
195205
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
196-
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
206+
key: plugin-verifier-${{ hashFiles('build/productReleases.txt') }}
197207

198208
- name: Verify plugin against IntelliJ IDEA IDE's
199209
continue-on-error: true
200210
shell: bash
201-
run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
211+
run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
202212
env:
203213
PRODUCT_NAME: ${{ matrix.product }}
204214

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,17 @@ jobs:
111111
runs-on: ubuntu-latest
112112
strategy:
113113
matrix:
114-
product: ["IC-231","IC-233"]
114+
product: ["IC-231","IC-233","IC-243"]
115115
include:
116116
- product: "IC-231"
117117
distribution: "zulu"
118118
java: "17"
119119
- product: "IC-233"
120120
distribution: "zulu"
121121
java: "17"
122+
- product: "IC-243"
123+
distribution: "zulu"
124+
java: "21"
122125
max-parallel: 10
123126
fail-fast: false
124127
steps:

CHANGELOG.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@ All notable changes to the Zowe IntelliJ Plugin will be documented in this file.
66

77
### Features
88

9+
* Feature: GitHub issue #119: Space units are clarified with a hint ([451f3528](https://github.com/zowe/zowe-explorer-intellij/commit/451f3528))
10+
* Feature: GitHub issue #129: Workaround for custom migration volumes ([e125325a](https://github.com/zowe/zowe-explorer-intellij/commit/e125325a))
11+
* Feature: GitHub issue #131: Tests adding policy added ([9c77deef](https://github.com/zowe/zowe-explorer-intellij/commit/9c77deef))
12+
* Feature: GitHub issue #137: USS sorting feature introduced ([c154e027](https://github.com/zowe/zowe-explorer-intellij/commit/c154e027))
13+
* Feature: GitHub issue #149: Clicking "Cancel" button is not so intrusive now ([c01926de](https://github.com/zowe/zowe-explorer-intellij/commit/c01926de))
14+
* Feature: GitHub issue #150: Connection test request is not being sent after connection name change ([207389f3](https://github.com/zowe/zowe-explorer-intellij/commit/207389f3))
15+
* Feature: GitHub issue #190: Warning dialog for "Allow self-signed..." and HTTP usage ([62fc8de4](https://github.com/zowe/zowe-explorer-intellij/commit/62fc8de4))
16+
* Feature: GitHub issue #192: Jobs sorting feature introduced ([e5e37437](https://github.com/zowe/zowe-explorer-intellij/commit/e5e37437))
17+
* Feature: GitHub issue #193: Error notification is made compact and readable ([83375d25](https://github.com/zowe/zowe-explorer-intellij/commit/83375d25))
18+
* Feature: GitHub issue #194: TSO Session reopen button introduced ([e3e32dd3](https://github.com/zowe/zowe-explorer-intellij/commit/e3e32dd3))
19+
* Feature: GitHub issue #195: Last refresh date and time is added ([b4e4c37b](https://github.com/zowe/zowe-explorer-intellij/commit/b4e4c37b))
20+
* Feature: GitHub issue #196: Datasets sorting feature introduced ([e8f564db](https://github.com/zowe/zowe-explorer-intellij/commit/e8f564db))
21+
* Feature: GitHub issue #198: TSO reconnection timeout and attempts are introduced ([9bc02a0b](https://github.com/zowe/zowe-explorer-intellij/commit/9bc02a0b))
22+
* Feature: "Force rename" feature is removed due to the lack of clarity ([1cec9c79](https://github.com/zowe/zowe-explorer-intellij/commit/1cec9c79))
23+
* Feature: "Connection name" column made a bit wider ([0b8816f7](https://github.com/zowe/zowe-explorer-intellij/commit/0b8816f7))
24+
* Feature: "horizontalAlign" and "verticalAlign" are removed as they are deprecated ([cc34a8d3](https://github.com/zowe/zowe-explorer-intellij/commit/cc34a8d3))
25+
* Feature: Now the content is being synchronized before it is reloaded with new encoding ([605eeabd](https://github.com/zowe/zowe-explorer-intellij/commit/605eeabd))
26+
* Feature: TSO CLI gets focus when it is just opened ([9bc02a0b](https://github.com/zowe/zowe-explorer-intellij/commit/9bc02a0b))
27+
* Feature: Notification after a dataset is created is improved ([8d62771c](https://github.com/zowe/zowe-explorer-intellij/commit/8d62771c))
28+
* Feature: Some enhancements to the connection creation dialog ([5a7a56de](https://github.com/zowe/zowe-explorer-intellij/commit/5a7a56de))
29+
* Feature: "Rate us" notification added ([577b81c2](https://github.com/zowe/zowe-explorer-intellij/commit/577b81c2))
30+
* Feature: "reportThrowable" replaced with "notifyError" ([577b81c2](https://github.com/zowe/zowe-explorer-intellij/commit/577b81c2))
931
* Feature: Correct alignment for fields in working set dialog ([745143cc](https://github.com/zowe/zowe-explorer-intellij/commit/745143cc))
1032

11-
### Bufixes
33+
### Bugfixes
1234

35+
* Bugfix: Slow operations in EDT ([8e9266d5](https://github.com/zowe/zowe-explorer-intellij/commit/8e9266d5))
36+
* Bugfix: Dialog for PDS/E instead of PDS now appears if there is an entity being placed under a PDS/E ([005aadd3](https://github.com/zowe/zowe-explorer-intellij/commit/005aadd3))
37+
* Bugfix: Owner is now recognized correctly ([08355c8c](https://github.com/zowe/zowe-explorer-intellij/commit/08355c8c))
38+
* Bugfix: USS files are no more displayed after they are deleted ([c130ea52](https://github.com/zowe/zowe-explorer-intellij/commit/c130ea52))
39+
* Bugfix: Files with long name placing as a z/OS dataset is fixed ([1afd501e](https://github.com/zowe/zowe-explorer-intellij/commit/1afd501e))
40+
* Bugfix: Fixed source file removal when cut is performed ([c1b88348](https://github.com/zowe/zowe-explorer-intellij/commit/c1b88348))
1341
* Bugfix: Fixed unexpected freezes of IDE during work with USS part ([38f1f5b3](https://github.com/zowe/zowe-explorer-intellij/commit/38f1f5b3))
1442
* Bugfix: Fixed error that was caused by members renaming ([238ebc08](https://github.com/zowe/zowe-explorer-intellij/commit/238ebc08))
1543
* Bugfix: Fixed missed automatic translation to uppercase ([1b48de61](https://github.com/zowe/zowe-explorer-intellij/commit/1b48de61))

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Consider some new feature for the plugin. The first that you need is to create a
8787
6. Describe the issue:
8888
- In case of bug - make a reproduction scheme or short description on how to achieve this;
8989
- In case of new feature or improvement - describe, what you are trying to implement, how it should work, and (if applicable) why it should be introduced in the plugin;
90-
6. After the changes are made, create a pull request on any of the main branches in the project repo. ***It is not a problem if you specified an incorrect target branch, we will help you with it before the changes are pushed***
91-
7. Assign Uladzislau Kalesnikau as a reviewer to the pull request
92-
8. Attach the issue to the pull request
93-
9. Wait on the approval (thanks in advance)
90+
7. After the changes are made, create a pull request on any of the main branches in the project repo. ***It is not a problem if you specified an incorrect target branch, we will help you with it before the changes are pushed***
91+
8. Assign Uladzislau Kalesnikau as a reviewer to the pull request
92+
9. Attach the issue to the pull request
93+
10. Wait on the approval (thanks in advance)

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ We have two options of tests:
148148
### To run UI tests:
149149

150150
1. change values for ZOS_USERID, ZOS_PWD, CONNECTION_URL in src/uiTest/kotlin/auxiliary/utils.kt
151-
2. run the script uiTest.sh
152-
3. once IdeForUiTests started make it as main window on the screen and do not touch mouse anymore
151+
2. run ./gradlew buildPlugin in console
152+
4. run the script uiTest.sh
153+
5. once IdeForUiTests started make it as main window on the screen and do not touch mouse anymore
154+
6. on first launch a ide_for_launch folder will be created and ide will be downloaded
153155

154156
UI tests results: build/reports/tests/uiTest/index.html
155157

attach_license_header.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,33 @@
11
/*
2+
* Copyright (c) 2020-2024 IBA Group.
3+
*
24
* This program and the accompanying materials are made available under the terms of the
35
* Eclipse Public License v2.0 which accompanies this distribution, and is available at
46
* https://www.eclipse.org/legal/epl-v20.html
57
*
68
* SPDX-License-Identifier: EPL-2.0
79
*
8-
* Copyright IBA Group 2020
10+
* Contributors:
11+
* IBA Group
12+
* Zowe Community
913
*/
1014

1115
const path = require('path')
1216
const fs = require('fs')
1317

1418
const licenseHeader =
1519
`/*
20+
* Copyright (c) 2020-2024 IBA Group.
21+
*
1622
* This program and the accompanying materials are made available under the terms of the
1723
* Eclipse Public License v2.0 which accompanies this distribution, and is available at
1824
* https://www.eclipse.org/legal/epl-v20.html
1925
*
2026
* SPDX-License-Identifier: EPL-2.0
2127
*
22-
* Copyright IBA Group 2020
28+
* Contributors:
29+
* IBA Group
30+
* Zowe Community
2331
*/
2432
2533
`

0 commit comments

Comments
 (0)