Skip to content

Commit 85d641d

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #334 from xdev-software/develop
v2.5.4
2 parents 59b87ee + 1493de2 commit 85d641d

File tree

36 files changed

+1239
-143
lines changed

36 files changed

+1239
-143
lines changed

‎.config/checkstyle/checkstyle.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<property name="ignoreFieldDeclaration" value="true"/>
9292
<property name="ignoreHashCodeMethod" value="true"/>
9393
<!-- 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"/>
94+
<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"/>
9595
</module>
9696
<module name="MemberName"/>
9797
<module name="MethodLength"/>
@@ -122,9 +122,7 @@
122122
<module name="StaticVariableName"/>
123123
<module name="StringLiteralEquality"/>
124124
<module name="SuppressWarningsHolder"/>
125-
<module name="TodoComment">
126-
<property name="severity" value="info"/>
127-
</module>
125+
<module name="TodoComment"/>
128126
<module name="TypecastParenPad"/>
129127
<module name="TypeName"/>
130128
<module name="UnnecessaryParentheses"/>

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

Lines changed: 907 additions & 3 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Install Node.js
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v6
2828
with:
29-
node-version: 18
29+
node-version: 24
3030

3131
- name: Install Antora and the Antora Lunr Extension
3232
run: npm i antora @antora/lunr-extension
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/configure-pages@v5
3939

4040
- name: Upload artifact
41-
uses: actions/upload-pages-artifact@v3
41+
uses: actions/upload-pages-artifact@v4
4242
with:
4343
name: site
4444
path: docs/site

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 15
1515
steps:
16-
- uses: actions/checkout@v4
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@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
22+
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

2626
- name: Find already existing issue
2727
id: find-issue
2828
run: |
29-
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title \"Link Checker Report\"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
29+
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Link Checker Report"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
3030
env:
3131
GH_TOKEN: ${{ github.token }}
32-
32+
3333
- name: Close issue if everything is fine
3434
if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
3535
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Create Issue From File
4040
if: steps.lychee.outputs.exit_code != 0
41-
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
41+
uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
4242
with:
4343
issue-number: ${{ steps.find-issue.outputs.number }}
4444
title: Link Checker Report

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

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,36 @@ on:
2020
- 'assets/**'
2121

2222
env:
23-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
2423
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
2524

2625
jobs:
2726
build:
2827
runs-on: ubuntu-latest
2928
timeout-minutes: 30
30-
3129
strategy:
3230
matrix:
33-
java: [17, 21]
31+
java: [17, 21, 25]
3432
distribution: [temurin]
35-
3633
steps:
37-
- uses: actions/checkout@v4
38-
34+
- uses: actions/checkout@v6
35+
3936
- name: Set up JDK
40-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
4138
with:
4239
distribution: ${{ matrix.distribution }}
4340
java-version: ${{ matrix.java }}
44-
cache: 'maven'
45-
41+
42+
- name: Cache Maven
43+
uses: actions/cache@v5
44+
with:
45+
path: ~/.m2/repository
46+
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
47+
restore-keys: |
48+
${{ runner.os }}-mvn-build-
49+
4650
- name: Build with Maven
4751
run: ./mvnw -B clean package
48-
52+
4953
- name: Check for uncommited changes
5054
run: |
5155
if [[ "$(git status --porcelain)" != "" ]]; then
@@ -65,7 +69,7 @@ jobs:
6569
fi
6670
6771
- name: Upload demo files
68-
uses: actions/upload-artifact@v4
72+
uses: actions/upload-artifact@v6
6973
with:
7074
name: demo-files-java-${{ matrix.java }}
7175
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
@@ -75,21 +79,34 @@ jobs:
7579
runs-on: ubuntu-latest
7680
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
7781
timeout-minutes: 15
78-
7982
strategy:
8083
matrix:
8184
java: [17]
8285
distribution: [temurin]
83-
8486
steps:
85-
- uses: actions/checkout@v4
86-
87+
- uses: actions/checkout@v6
88+
8789
- name: Set up JDK
88-
uses: actions/setup-java@v4
90+
uses: actions/setup-java@v5
8991
with:
9092
distribution: ${{ matrix.distribution }}
9193
java-version: ${{ matrix.java }}
92-
cache: 'maven'
94+
95+
- name: Cache Maven
96+
uses: actions/cache@v5
97+
with:
98+
path: ~/.m2/repository
99+
key: ${{ runner.os }}-mvn-checkstyle-${{ hashFiles('**/pom.xml') }}
100+
restore-keys: |
101+
${{ runner.os }}-mvn-checkstyle-
102+
103+
- name: CheckStyle Cache
104+
uses: actions/cache@v5
105+
with:
106+
path: '**/target/checkstyle-cachefile'
107+
key: ${{ runner.os }}-checkstyle-${{ hashFiles('**/pom.xml') }}
108+
restore-keys: |
109+
${{ runner.os }}-checkstyle-
93110
94111
- name: Run Checkstyle
95112
run: ./mvnw -B checkstyle:check -P checkstyle -T2C
@@ -98,28 +115,41 @@ jobs:
98115
runs-on: ubuntu-latest
99116
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
100117
timeout-minutes: 15
101-
102118
strategy:
103119
matrix:
104120
java: [17]
105121
distribution: [temurin]
106-
107122
steps:
108-
- uses: actions/checkout@v4
123+
- uses: actions/checkout@v6
109124

110125
- name: Set up JDK
111-
uses: actions/setup-java@v4
126+
uses: actions/setup-java@v5
112127
with:
113128
distribution: ${{ matrix.distribution }}
114129
java-version: ${{ matrix.java }}
115-
cache: 'maven'
130+
131+
- name: Cache Maven
132+
uses: actions/cache@v5
133+
with:
134+
path: ~/.m2/repository
135+
key: ${{ runner.os }}-mvn-pmd-${{ hashFiles('**/pom.xml') }}
136+
restore-keys: |
137+
${{ runner.os }}-mvn-pmd-
138+
139+
- name: PMD Cache
140+
uses: actions/cache@v5
141+
with:
142+
path: '**/target/pmd/pmd.cache'
143+
key: ${{ runner.os }}-pmd-${{ hashFiles('**/pom.xml') }}
144+
restore-keys: |
145+
${{ runner.os }}-pmd-
116146
117147
- name: Run PMD
118148
run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C
119149

120150
- name: Upload report
121151
if: always()
122-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v6
123153
with:
124154
name: pmd-report
125155
if-no-files-found: ignore
@@ -130,12 +160,12 @@ jobs:
130160
runs-on: ubuntu-latest
131161

132162
steps:
133-
- uses: actions/checkout@v4
163+
- uses: actions/checkout@v5
134164

135165
- name: Install Node.js
136-
uses: actions/setup-node@v4
166+
uses: actions/setup-node@v6
137167
with:
138-
node-version: 18
168+
node-version: 24
139169

140170
- name: Install Antora and the Antora Lunr Extension
141171
run: npm i antora @antora/lunr-extension

0 commit comments

Comments
 (0)