Skip to content

Update from template #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 4, 2024
Merged

Update from template #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2d88243
[Checkstyle] Fix suppression comments not working properly
AB-xdev Feb 9, 2024
9851561
[Checkstyle] Generated files should always be located in src/gen... f…
AB-xdev Feb 9, 2024
91285bb
[Checkstyle] Fix incorrect comment
AB-xdev Feb 9, 2024
cf5ef4e
Merge pull request #24 from xdev-software/update-from-template
AB-xdev Feb 12, 2024
d80e7af
Update LICENSE to ``2024``
AB-xdev Feb 21, 2024
406bfa0
Bump com.puppycrawl.tools:checkstyle from 10.13.0 to 10.14.0
dependabot[bot] Feb 29, 2024
7f7f233
Merge pull request #25 from xdev-software/dependabot/maven/com.puppyc…
AB-xdev Feb 29, 2024
5f9e8ad
Introduce default license
AB-xdev Feb 29, 2024
c23dfd2
Merge pull request #26 from xdev-software/update-from-template
AB-xdev Feb 29, 2024
ff1bbdf
Update checkBuild.yml
AB-xdev Mar 1, 2024
49b63d3
Update sonar.yml
AB-xdev Mar 1, 2024
78a839a
Merge branch 'update-from-template' of https://github.com/xdev-softwa…
JohannesRabauer Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions .config/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<module name="LineLength">
<property name="max" value="120"/>
<property name="fileExtensions" value="java"/>
<!-- Ignore default + links in comments -->
<!-- Ignore default + links -->
<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
</module>
<module name="NewlineAtEndOfFile"/>
Expand All @@ -30,10 +30,6 @@
</module>

<!-- Generated code -->
<module name="SuppressionSingleFilter">
<property name="checks" value="."/>
<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
</module>
<module name="SuppressionSingleFilter">
<property name="checks" value="."/>
<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
Expand All @@ -43,7 +39,15 @@
<property name="checks" value="MagicNumberCheck"/>
<property name="files" value="[\\/]test[\\/].*\.java$"/>
</module>

<!-- Suppressions -->
<module name="SuppressWarningsFilter"/>
<!-- https://github.com/checkstyle/checkstyle/issues/7287 -->
<module name="SuppressWithPlainTextCommentFilter">
<property name="offCommentFormat" value="// CHECKSTYLE\:OFF ([\w\|]+)"/>
<property name="onCommentFormat" value="// CHECKSTYLE\:ON ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>

<module name="TreeWalker">
<!-- Checks - sorted alphabetically -->
Expand Down Expand Up @@ -131,11 +135,5 @@
<property name="tokens"
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"/>
</module>

<!-- Filter -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
</module>
</module>
</module>
2 changes: 2 additions & 0 deletions .github/workflows/checkBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ on:
paths-ignore:
- '**.md'
- '.config/**'
- '.github/**'
- '.idea/**'
- 'assets/**'
pull_request:
branches: [ develop ]
paths-ignore:
- '**.md'
- '.config/**'
- '.github/**'
- '.idea/**'
- 'assets/**'

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/sonar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ on:
paths-ignore:
- '**.md'
- '.config/**'
- '.github/**'
- '.idea/**'
- 'assets/**'
pull_request:
types: [opened, synchronize, reopened]
paths-ignore:
- '**.md'
- '.config/**'
- '.github/**'
- '.idea/**'
- 'assets/**'

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023 XDEV Software
Copyright 2024 XDEV Software

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion spring-data-eclipse-store-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.13.0</version>
<version>10.14.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-eclipse-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.13.0</version>
<version>10.14.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down