Skip to content

Commit fc3025f

Browse files
AB-xdevAB-xdev
authored
Merge pull request #360 from xdev-software/develop
Release
2 parents 0c1fcca + 0f7f2e9 commit fc3025f

58 files changed

Lines changed: 429 additions & 385 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.

‎.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: 121 additions & 89 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: 11 additions & 11 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') }}
@@ -66,7 +66,7 @@ jobs:
6666
fi
6767
6868
- name: Upload standalone server JAR
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@v6
7070
with:
7171
name: server-${{ matrix.java }}
7272
path: server/target/server-standalone.jar
@@ -92,10 +92,10 @@ jobs:
9292
timeout-minutes: 15
9393
strategy:
9494
matrix:
95-
java: [17]
95+
java: [21]
9696
distribution: [temurin]
9797
steps:
98-
- uses: actions/checkout@v5
98+
- uses: actions/checkout@v6
9999

100100
- name: Set up JDK
101101
uses: actions/setup-java@v5
@@ -104,15 +104,15 @@ jobs:
104104
java-version: ${{ matrix.java }}
105105

106106
- name: Cache Maven
107-
uses: actions/cache@v4
107+
uses: actions/cache@v5
108108
with:
109109
path: ~/.m2/repository
110110
key: ${{ runner.os }}-mvn-checkstyle-${{ hashFiles('**/pom.xml') }}
111111
restore-keys: |
112112
${{ runner.os }}-mvn-checkstyle-
113113
114114
- name: CheckStyle Cache
115-
uses: actions/cache@v4
115+
uses: actions/cache@v5
116116
with:
117117
path: '**/target/checkstyle-cachefile'
118118
key: ${{ runner.os }}-checkstyle-${{ hashFiles('**/pom.xml') }}
@@ -131,7 +131,7 @@ jobs:
131131
java: [17]
132132
distribution: [temurin]
133133
steps:
134-
- uses: actions/checkout@v5
134+
- uses: actions/checkout@v6
135135

136136
- name: Set up JDK
137137
uses: actions/setup-java@v5
@@ -140,15 +140,15 @@ jobs:
140140
java-version: ${{ matrix.java }}
141141

142142
- name: Cache Maven
143-
uses: actions/cache@v4
143+
uses: actions/cache@v5
144144
with:
145145
path: ~/.m2/repository
146146
key: ${{ runner.os }}-mvn-pmd-${{ hashFiles('**/pom.xml') }}
147147
restore-keys: |
148148
${{ runner.os }}-mvn-pmd-
149149
150150
- name: PMD Cache
151-
uses: actions/cache@v4
151+
uses: actions/cache@v5
152152
with:
153153
path: '**/target/pmd/pmd.cache'
154154
key: ${{ runner.os }}-pmd-${{ hashFiles('**/pom.xml') }}
@@ -164,7 +164,7 @@ jobs:
164164

165165
- name: Upload report
166166
if: always()
167-
uses: actions/upload-artifact@v4
167+
uses: actions/upload-artifact@v6
168168
with:
169169
name: pmd-report
170170
if-no-files-found: ignore

‎.github/workflows/image-vuln-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
continue-on-error: true # Ignore errors, we create an issue instead
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121

2222
- name: Scan - Full
2323
uses: aquasecurity/trivy-action@0.33.1

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 11 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') }}
@@ -61,7 +61,7 @@ jobs:
6161
upload_url: ${{ steps.create-release.outputs.upload_url }}
6262
version: ${{ steps.version.outputs.release }}
6363
steps:
64-
- uses: actions/checkout@v5
64+
- uses: actions/checkout@v6
6565

6666
- name: Configure Git
6767
run: |
@@ -88,7 +88,7 @@ jobs:
8888
8989
- name: Create Release
9090
id: create-release
91-
uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
91+
uses: shogo82148/actions-create-release@559c27ce7eb834825e2b55927c64f6d1bd1db716 # v1
9292
with:
9393
tag_name: v${{ steps.version.outputs.release }}
9494
release_name: v${{ steps.version.outputs.release }}
@@ -139,7 +139,7 @@ jobs:
139139
needs: [prepare-release]
140140
timeout-minutes: 60
141141
steps:
142-
- uses: actions/checkout@v5
142+
- uses: actions/checkout@v6
143143

144144
- name: Init Git and pull
145145
run: |
@@ -193,7 +193,7 @@ jobs:
193193
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
194194

195195
- name: Upload server standalone JAR
196-
uses: actions/upload-artifact@v4
196+
uses: actions/upload-artifact@v6
197197
with:
198198
name: server-standalone
199199
path: server/target/server-standalone.jar
@@ -215,7 +215,7 @@ jobs:
215215
attestations: write
216216
id-token: write
217217
steps:
218-
- uses: actions/checkout@v5
218+
- uses: actions/checkout@v6
219219

220220
- name: Init Git and pull
221221
run: |
@@ -224,7 +224,7 @@ jobs:
224224
git pull
225225
226226
- name: Download server JAR
227-
uses: actions/download-artifact@v5
227+
uses: actions/download-artifact@v7
228228
with:
229229
name: server-standalone
230230
path: server/target
@@ -281,7 +281,7 @@ jobs:
281281
needs: [publish-maven]
282282
timeout-minutes: 15
283283
steps:
284-
- uses: actions/checkout@v5
284+
- uses: actions/checkout@v6
285285

286286
- name: Init Git and pull
287287
run: |
@@ -297,7 +297,7 @@ jobs:
297297

298298
# Try to reuse existing cache from check-build
299299
- name: Try restore Maven Cache
300-
uses: actions/cache/restore@v4
300+
uses: actions/cache/restore@v5
301301
with:
302302
path: ~/.m2/repository
303303
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -329,7 +329,7 @@ jobs:
329329
needs: [publish-maven, publish-docker]
330330
timeout-minutes: 10
331331
steps:
332-
- uses: actions/checkout@v5
332+
- uses: actions/checkout@v6
333333

334334
- name: Init Git and pull
335335
run: |

‎.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: 4 additions & 4 deletions
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
@@ -56,7 +56,7 @@ jobs:
5656
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5757

5858
- name: Upload server standalone JAR
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@v6
6060
with:
6161
name: server-standalone
6262
path: server/target/server-standalone.jar
@@ -71,10 +71,10 @@ jobs:
7171
attestations: write
7272
id-token: write
7373
steps:
74-
- uses: actions/checkout@v5
74+
- uses: actions/checkout@v6
7575

7676
- name: Download server JAR
77-
uses: actions/download-artifact@v5
77+
uses: actions/download-artifact@v7
7878
with:
7979
name: server-standalone
8080
path: server/target

‎.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
@@ -44,6 +44,7 @@ hs_err_pid*
4444
!.idea/saveactions_settings.xml
4545
!.idea/checkstyle-idea.xml
4646
!.idea/externalDependencies.xml
47+
!.idea/pmd-x.xml
4748
!.idea/PMDPlugin.xml
4849

4950
!.idea/inspectionProfiles/

0 commit comments

Comments
 (0)