Skip to content

Commit 7d17cb0

Browse files
AB-xdevAB-xdev
authored
Merge pull request #272 from xdev-software/develop
Release
2 parents 4d0fe3c + 6120baa commit 7d17cb0

32 files changed

Lines changed: 324 additions & 232 deletions

File tree

‎.config/checkstyle/checkstyle.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@
7474
<!-- https://docs.pmd-code.org/pmd-doc-7.11.0/pmd_rules_java_errorprone.html#avoidcatchingthrowable -->
7575
<property name="illegalClassNames" value="Error,Throwable,NullPointerException,java.lang.Error,java.lang.Throwable,java.lang.NullPointerException"/>
7676
</module>
77+
<!-- Do not allow params and vars to end with collection type names -->
78+
<module name="IllegalIdentifierName">
79+
<property name="format" value="^(?!(.*(Map|List|Set))$).+$"/>
80+
<property name="tokens" value="PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_COMPONENT_DEF, LAMBDA"/>
81+
</module>
7782
<module name="IllegalImport"/>
7883
<module name="InterfaceIsType"/>
7984
<module name="JavadocStyle">
@@ -91,7 +96,7 @@
9196
<property name="ignoreFieldDeclaration" value="true"/>
9297
<property name="ignoreHashCodeMethod" value="true"/>
9398
<!-- Defaults + other common constant values (e.g. time) -->
94-
<property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5, 10, 12, 24, 31, 60, 100, 1000"/>
99+
<property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5, 8, 10, 12, 16, 24, 25, 31, 32, 50, 60, 64, 100, 128, 200, 256, 500, 512, 1000, 1024, 2000, 2048, 4000, 4096, 8000, 8192"/>
95100
</module>
96101
<module name="MemberName"/>
97102
<module name="MethodLength"/>
@@ -123,7 +128,8 @@
123128
<module name="StringLiteralEquality"/>
124129
<module name="SuppressWarningsHolder"/>
125130
<module name="TodoComment">
126-
<property name="severity" value="info"/>
131+
<!-- Default is "TODO:" -->
132+
<property name="format" value="(?i)(TODO)"/>
127133
</module>
128134
<module name="TypecastParenPad"/>
129135
<module name="TypeName"/>

‎.config/pmd/java/ruleset.xml‎

Lines changed: 141 additions & 87 deletions
Large diffs are not rendered by default.

‎.github/workflows/broken-links.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 15
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717

1818
- run: mv .github/.lycheeignore .lycheeignore
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2
22+
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

‎.github/workflows/check-build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java: [17, 21, 25]
2929
distribution: [temurin]
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232

3333
- name: Set up JDK
3434
uses: actions/setup-java@v5
@@ -37,7 +37,7 @@ jobs:
3737
java-version: ${{ matrix.java }}
3838

3939
- name: Cache Maven
40-
uses: actions/cache@v4
40+
uses: actions/cache@v5
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -71,10 +71,10 @@ jobs:
7171
timeout-minutes: 15
7272
strategy:
7373
matrix:
74-
java: [17]
74+
java: [21]
7575
distribution: [temurin]
7676
steps:
77-
- uses: actions/checkout@v5
77+
- uses: actions/checkout@v6
7878

7979
- name: Set up JDK
8080
uses: actions/setup-java@v5
@@ -83,15 +83,15 @@ jobs:
8383
java-version: ${{ matrix.java }}
8484

8585
- name: Cache Maven
86-
uses: actions/cache@v4
86+
uses: actions/cache@v5
8787
with:
8888
path: ~/.m2/repository
8989
key: ${{ runner.os }}-mvn-checkstyle-${{ hashFiles('**/pom.xml') }}
9090
restore-keys: |
9191
${{ runner.os }}-mvn-checkstyle-
9292
9393
- name: CheckStyle Cache
94-
uses: actions/cache@v4
94+
uses: actions/cache@v5
9595
with:
9696
path: '**/target/checkstyle-cachefile'
9797
key: ${{ runner.os }}-checkstyle-${{ hashFiles('**/pom.xml') }}
@@ -110,7 +110,7 @@ jobs:
110110
java: [17]
111111
distribution: [temurin]
112112
steps:
113-
- uses: actions/checkout@v5
113+
- uses: actions/checkout@v6
114114

115115
- name: Set up JDK
116116
uses: actions/setup-java@v5
@@ -119,15 +119,15 @@ jobs:
119119
java-version: ${{ matrix.java }}
120120

121121
- name: Cache Maven
122-
uses: actions/cache@v4
122+
uses: actions/cache@v5
123123
with:
124124
path: ~/.m2/repository
125125
key: ${{ runner.os }}-mvn-pmd-${{ hashFiles('**/pom.xml') }}
126126
restore-keys: |
127127
${{ runner.os }}-mvn-pmd-
128128
129129
- name: PMD Cache
130-
uses: actions/cache@v4
130+
uses: actions/cache@v5
131131
with:
132132
path: '**/target/pmd/pmd.cache'
133133
key: ${{ runner.os }}-pmd-${{ hashFiles('**/pom.xml') }}
@@ -142,7 +142,7 @@ jobs:
142142

143143
- name: Upload report
144144
if: always()
145-
uses: actions/upload-artifact@v4
145+
uses: actions/upload-artifact@v6
146146
with:
147147
name: pmd-report
148148
if-no-files-found: ignore

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
timeout-minutes: 30
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919

2020
- name: Set up JDK
2121
uses: actions/setup-java@v5
@@ -25,7 +25,7 @@ jobs:
2525

2626
# Try to reuse existing cache from check-build
2727
- name: Try restore Maven Cache
28-
uses: actions/cache/restore@v4
28+
uses: actions/cache/restore@v5
2929
with:
3030
path: ~/.m2/repository
3131
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -60,7 +60,7 @@ jobs:
6060
outputs:
6161
upload_url: ${{ steps.create-release.outputs.upload_url }}
6262
steps:
63-
- uses: actions/checkout@v5
63+
- uses: actions/checkout@v6
6464

6565
- name: Configure Git
6666
run: |
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Create Release
8989
id: create-release
90-
uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
90+
uses: shogo82148/actions-create-release@559c27ce7eb834825e2b55927c64f6d1bd1db716 # v1
9191
with:
9292
tag_name: v${{ steps.version.outputs.release }}
9393
release_name: v${{ steps.version.outputs.release }}
@@ -113,7 +113,7 @@ jobs:
113113
needs: [prepare-release]
114114
timeout-minutes: 60
115115
steps:
116-
- uses: actions/checkout@v5
116+
- uses: actions/checkout@v6
117117

118118
- name: Init Git and pull
119119
run: |
@@ -171,7 +171,7 @@ jobs:
171171
needs: [prepare-release]
172172
timeout-minutes: 15
173173
steps:
174-
- uses: actions/checkout@v5
174+
- uses: actions/checkout@v6
175175

176176
- name: Init Git and pull
177177
run: |
@@ -187,7 +187,7 @@ jobs:
187187

188188
# Try to reuse existing cache from check-build
189189
- name: Try restore Maven Cache
190-
uses: actions/cache/restore@v4
190+
uses: actions/cache/restore@v5
191191
with:
192192
path: ~/.m2/repository
193193
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -202,8 +202,9 @@ jobs:
202202
modules=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
203203
for m in "${modules[@]}"
204204
do
205-
echo "$m/target/site -> ./target/site/$m"
206-
cp -r $m/target/site ./target/site/$m
205+
echo "$m/target/site -> ./target/$m"
206+
mkdir -p ./target/$m
207+
cp -r $m/target/site ./target/$m
207208
done
208209
209210
- name: Deploy to Github pages
@@ -218,7 +219,7 @@ jobs:
218219
needs: [publish-maven]
219220
timeout-minutes: 10
220221
steps:
221-
- uses: actions/checkout@v5
222+
- uses: actions/checkout@v6
222223

223224
- name: Init Git and pull
224225
run: |

‎.github/workflows/run-integration-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939

4040
- name: Set up JDK
4141
uses: actions/setup-java@v5
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Upload videos of test failures
6363
if: failure()
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v6
6565
with:
6666
name: test-fail-videos-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }}
6767
path: demo/integration-tests/${{ matrix.project }}/target/records

‎.github/workflows/sync-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
timeout-minutes: 10
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
sparse-checkout: .github/labels.yml
2222

‎.github/workflows/test-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
timeout-minutes: 60
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212

1313
- name: Set up JDK
1414
uses: actions/setup-java@v5

‎.github/workflows/update-from-template.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
3737
create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040
with:
4141
# Required because otherwise there are always changes detected when executing diff/rev-list
4242
fetch-depth: 0
@@ -183,7 +183,7 @@ jobs:
183183
runs-on: ubuntu-latest
184184
timeout-minutes: 60
185185
steps:
186-
- uses: actions/checkout@v5
186+
- uses: actions/checkout@v6
187187
with:
188188
# Required because otherwise there are always changes detected when executing diff/rev-list
189189
fetch-depth: 0

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ vite.generated.ts
6767
!.idea/saveactions_settings.xml
6868
!.idea/checkstyle-idea.xml
6969
!.idea/externalDependencies.xml
70+
!.idea/pmd-x.xml
7071
!.idea/PMDPlugin.xml
7172

7273
!.idea/inspectionProfiles/

0 commit comments

Comments
 (0)