Skip to content

Commit 2196db3

Browse files
AB-xdevAB-xdev
authored
Merge pull request #146 from xdev-software/develop
Release
2 parents 7b6a834 + bf8dc35 commit 2196db3

File tree

19 files changed

+277
-223
lines changed

19 files changed

+277
-223
lines changed

‎.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: 140 additions & 86 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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
timeout-minutes: 30
2929
strategy:
3030
matrix:
31-
java: [17, 21, 25]
31+
java: [21, 25]
3232
distribution: [temurin]
3333
steps:
34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535

3636
- name: Set up JDK
3737
uses: actions/setup-java@v5
@@ -40,15 +40,15 @@ jobs:
4040
java-version: ${{ matrix.java }}
4141

4242
- name: Cache Maven
43-
uses: actions/cache@v4
43+
uses: actions/cache@v5
4444
with:
4545
path: ~/.m2/repository
4646
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
4747
restore-keys: |
4848
${{ runner.os }}-mvn-build-
4949
5050
- name: Cache Vaadin prod bundles
51-
uses: actions/cache@v4
51+
uses: actions/cache@v5
5252
with:
5353
path: |
5454
**/bundles/prod.bundle
@@ -78,7 +78,7 @@ jobs:
7878
fi
7979
8080
- name: Upload demo files
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v6
8282
with:
8383
name: demo-files-java-${{ matrix.java }}
8484
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
@@ -90,10 +90,10 @@ jobs:
9090
timeout-minutes: 15
9191
strategy:
9292
matrix:
93-
java: [17]
93+
java: [21]
9494
distribution: [temurin]
9595
steps:
96-
- uses: actions/checkout@v5
96+
- uses: actions/checkout@v6
9797

9898
- name: Set up JDK
9999
uses: actions/setup-java@v5
@@ -102,15 +102,15 @@ jobs:
102102
java-version: ${{ matrix.java }}
103103

104104
- name: Cache Maven
105-
uses: actions/cache@v4
105+
uses: actions/cache@v5
106106
with:
107107
path: ~/.m2/repository
108108
key: ${{ runner.os }}-mvn-checkstyle-${{ hashFiles('**/pom.xml') }}
109109
restore-keys: |
110110
${{ runner.os }}-mvn-checkstyle-
111111
112112
- name: CheckStyle Cache
113-
uses: actions/cache@v4
113+
uses: actions/cache@v5
114114
with:
115115
path: '**/target/checkstyle-cachefile'
116116
key: ${{ runner.os }}-checkstyle-${{ hashFiles('**/pom.xml') }}
@@ -126,10 +126,10 @@ jobs:
126126
timeout-minutes: 15
127127
strategy:
128128
matrix:
129-
java: [17]
129+
java: [21]
130130
distribution: [temurin]
131131
steps:
132-
- uses: actions/checkout@v5
132+
- uses: actions/checkout@v6
133133

134134
- name: Set up JDK
135135
uses: actions/setup-java@v5
@@ -138,15 +138,15 @@ jobs:
138138
java-version: ${{ matrix.java }}
139139

140140
- name: Cache Maven
141-
uses: actions/cache@v4
141+
uses: actions/cache@v5
142142
with:
143143
path: ~/.m2/repository
144144
key: ${{ runner.os }}-mvn-pmd-${{ hashFiles('**/pom.xml') }}
145145
restore-keys: |
146146
${{ runner.os }}-mvn-pmd-
147147
148148
- name: PMD Cache
149-
uses: actions/cache@v4
149+
uses: actions/cache@v5
150150
with:
151151
path: '**/target/pmd/pmd.cache'
152152
key: ${{ runner.os }}-pmd-${{ hashFiles('**/pom.xml') }}
@@ -161,7 +161,7 @@ jobs:
161161

162162
- name: Upload report
163163
if: always()
164-
uses: actions/upload-artifact@v4
164+
uses: actions/upload-artifact@v6
165165
with:
166166
name: pmd-report
167167
if-no-files-found: ignore

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 30
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

2323
- name: Set up JDK
2424
uses: actions/setup-java@v5
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'temurin'
2828

2929
# Try to reuse existing cache from check-build
3030
- name: Try restore Maven Cache
31-
uses: actions/cache/restore@v4
31+
uses: actions/cache/restore@v5
3232
with:
3333
path: ~/.m2/repository
3434
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -63,7 +63,7 @@ jobs:
6363
outputs:
6464
upload_url: ${{ steps.create-release.outputs.upload_url }}
6565
steps:
66-
- uses: actions/checkout@v5
66+
- uses: actions/checkout@v6
6767

6868
- name: Configure Git
6969
run: |
@@ -91,7 +91,7 @@ jobs:
9191
9292
- name: Create Release
9393
id: create-release
94-
uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
94+
uses: shogo82148/actions-create-release@559c27ce7eb834825e2b55927c64f6d1bd1db716 # v1
9595
with:
9696
tag_name: v${{ steps.version.outputs.release }}
9797
release_name: v${{ steps.version.outputs.release }}
@@ -118,7 +118,7 @@ jobs:
118118
needs: [prepare-release]
119119
timeout-minutes: 60
120120
steps:
121-
- uses: actions/checkout@v5
121+
- uses: actions/checkout@v6
122122

123123
- name: Init Git and pull
124124
run: |
@@ -130,7 +130,7 @@ jobs:
130130
uses: actions/setup-java@v5
131131
with: # running setup-java overwrites the settings.xml
132132
distribution: 'temurin'
133-
java-version: '17'
133+
java-version: '21'
134134
server-id: github-central
135135
server-password: PACKAGES_CENTRAL_TOKEN
136136
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -147,7 +147,7 @@ jobs:
147147
uses: actions/setup-java@v5
148148
with: # running setup-java again overwrites the settings.xml
149149
distribution: 'temurin'
150-
java-version: '17'
150+
java-version: '21'
151151
server-id: sonatype-central-portal
152152
server-username: MAVEN_CENTRAL_USERNAME
153153
server-password: MAVEN_CENTRAL_TOKEN
@@ -166,7 +166,7 @@ jobs:
166166
needs: [prepare-release]
167167
timeout-minutes: 15
168168
steps:
169-
- uses: actions/checkout@v5
169+
- uses: actions/checkout@v6
170170

171171
- name: Init Git and pull
172172
run: |
@@ -177,12 +177,12 @@ jobs:
177177
- name: Setup - Java
178178
uses: actions/setup-java@v5
179179
with:
180-
java-version: '17'
180+
java-version: '21'
181181
distribution: 'temurin'
182182

183183
# Try to reuse existing cache from check-build
184184
- name: Try restore Maven Cache
185-
uses: actions/cache/restore@v4
185+
uses: actions/cache/restore@v5
186186
with:
187187
path: ~/.m2/repository
188188
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
@@ -205,7 +205,7 @@ jobs:
205205
needs: [publish-maven]
206206
timeout-minutes: 10
207207
steps:
208-
- uses: actions/checkout@v5
208+
- uses: actions/checkout@v6
209209

210210
- name: Init Git and pull
211211
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 60
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515

1616
- name: Set up JDK
1717
uses: actions/setup-java@v5
1818
with: # running setup-java overwrites the settings.xml
1919
distribution: 'temurin'
20-
java-version: '17'
20+
java-version: '21'
2121
server-id: github-central
2222
server-password: PACKAGES_CENTRAL_TOKEN
2323
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/setup-java@v5
3535
with: # running setup-java again overwrites the settings.xml
3636
distribution: 'temurin'
37-
java-version: '17'
37+
java-version: '21'
3838
server-id: sonatype-central-portal
3939
server-username: MAVEN_CENTRAL_USERNAME
4040
server-password: MAVEN_CENTRAL_TOKEN

‎.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
@@ -66,6 +66,7 @@ vite.generated.ts
6666
!.idea/saveactions_settings.xml
6767
!.idea/checkstyle-idea.xml
6868
!.idea/externalDependencies.xml
69+
!.idea/pmd-x.xml
6970
!.idea/PMDPlugin.xml
7071

7172
!.idea/inspectionProfiles/

‎.idea/checkstyle-idea.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)