Skip to content

Commit 52ecdf9

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents a7f49c8 + cf5ef4e commit 52ecdf9

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed

‎.config/checkstyle/checkstyle.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<module name="LineLength">
1717
<property name="max" value="120"/>
1818
<property name="fileExtensions" value="java"/>
19-
<!-- Ignore default + links in comments -->
19+
<!-- Ignore default + links -->
2020
<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
2121
</module>
2222
<module name="NewlineAtEndOfFile"/>
@@ -30,10 +30,6 @@
3030
</module>
3131

3232
<!-- Generated code -->
33-
<module name="SuppressionSingleFilter">
34-
<property name="checks" value="."/>
35-
<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
36-
</module>
3733
<module name="SuppressionSingleFilter">
3834
<property name="checks" value="."/>
3935
<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
@@ -43,7 +39,15 @@
4339
<property name="checks" value="MagicNumberCheck"/>
4440
<property name="files" value="[\\/]test[\\/].*\.java$"/>
4541
</module>
42+
43+
<!-- Suppressions -->
4644
<module name="SuppressWarningsFilter"/>
45+
<!-- https://github.com/checkstyle/checkstyle/issues/7287 -->
46+
<module name="SuppressWithPlainTextCommentFilter">
47+
<property name="offCommentFormat" value="// CHECKSTYLE\:OFF ([\w\|]+)"/>
48+
<property name="onCommentFormat" value="// CHECKSTYLE\:ON ([\w\|]+)"/>
49+
<property name="checkFormat" value="$1"/>
50+
</module>
4751

4852
<module name="TreeWalker">
4953
<!-- Checks - sorted alphabetically -->
@@ -131,11 +135,5 @@
131135
<property name="tokens"
132136
value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
133137
</module>
134-
135-
<!-- Filter -->
136-
<module name="SuppressionCommentFilter">
137-
<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
138-
<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
139-
</module>
140138
</module>
141139
</module>

‎.github/workflows/release.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66

77
env:
88
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
9-
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
109

1110
permissions:
1211
contents: write
@@ -58,17 +57,16 @@ jobs:
5857
run: |
5958
git config --global user.email "[email protected]"
6059
git config --global user.name "GitHub Actions"
61-
62-
- name: Un-SNAP root
63-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
64-
65-
- name: Un-SNAP demo
66-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
67-
working-directory: ${{ env.DEMO_MAVEN_MODULE }}
6860
6961
- name: Un-SNAP
70-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
71-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
62+
run: |
63+
modules=("") # root
64+
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
65+
for i in "${modules[@]}"
66+
do
67+
echo "Processing $i/pom.xml"
68+
(cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
69+
done
7270
7371
- name: Get version
7472
id: version
@@ -204,17 +202,16 @@ jobs:
204202
git config --global user.email "[email protected]"
205203
git config --global user.name "GitHub Actions"
206204
git pull
207-
208-
- name: Inc Version and SNAP root
209-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
210-
211-
- name: Inc Version and SNAP demo
212-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
213-
working-directory: ${{ env.DEMO_MAVEN_MODULE }}
214-
205+
215206
- name: Inc Version and SNAP
216-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
217-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
207+
run: |
208+
modules=("") # root
209+
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
210+
for i in "${modules[@]}"
211+
do
212+
echo "Processing $i/pom.xml"
213+
(cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
214+
done
218215
219216
- name: Git Commit and Push
220217
run: |

‎.github/workflows/sonar.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ jobs:
5353
restore-keys: ${{ runner.os }}-m2
5454

5555
- name: Build with Maven
56-
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} -Dsonar.organization=${{ env.SONARCLOUD_ORG }} -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
56+
run: |
57+
mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
58+
-DskipTests \
59+
-Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
60+
-Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
61+
-Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
5762
env:
5863
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
5964
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎.idea/codeStyles/Project.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chartjs-java-model-demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>com.puppycrawl.tools</groupId>
9494
<artifactId>checkstyle</artifactId>
95-
<version>10.12.7</version>
95+
<version>10.13.0</version>
9696
</dependency>
9797
</dependencies>
9898
<configuration>

‎chartjs-java-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
<dependency>
310310
<groupId>com.puppycrawl.tools</groupId>
311311
<artifactId>checkstyle</artifactId>
312-
<version>10.12.7</version>
312+
<version>10.13.0</version>
313313
</dependency>
314314
</dependencies>
315315
<configuration>

0 commit comments

Comments
 (0)