Skip to content
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

Jump to bottom

Pull #990: Define variable for non-main-files-suppressions file #990

Merged
merged 1 commit into from Feb 23, 2023
Merged

Pull #990: Define variable for non-main-files-suppressions file #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions sevntu-checks/config/ant-phase-verify.xml
View file
Open in desktop
Expand Up @@ -52,6 +52,8 @@
failureProperty="checkstyle.failure.property"
executeIgnoredModules="true"
>
<property key="checkstyle.non-main-files-suppressions.file"
file="${checkstyle.non-main-files-suppressions.file}"/>
<path>
<fileset dir="${basedir}/.." includes="**/*">
<exclude name=".git/**/*"/>
Expand Down
2 changes: 2 additions & 0 deletions sevntu-checks/pom.xml
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
<checkstyle.version>10.7.0</checkstyle.version>
<checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_checks.xml</checkstyle.configLocation>
<checkstyle.nonMain.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_non_main_files_checks.xml</checkstyle.nonMain.configLocation>
<checkstyle.non-main-files-suppressions.file>config/checkstyle_non_main_files_suppressions.xml</checkstyle.non-main-files-suppressions.file>
Copy link
Contributor

@rnveach rnveach Feb 22, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This naming doesn't follow our other names.

checkstyle.nonMain.configLocation versus checkstyle.non-main-files-suppressions.file. Camel cases versus ¿kebob? case.

If I ask this to be changed, then another PR to main repo has to be made as the 2 need to connect together.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@romani I'll leave this to you.

Copy link
Member

@romani romani Feb 23, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use for properties camelcase as we now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But see how badly inconsistent we are on property names... .
Let's do this in separate PR.

<checkstyle.header>https://raw.githubusercontent.com/checkstyle/checkstyle/master/config/java.header</checkstyle.header>
<checkstyle.regexp.header>https://raw.githubusercontent.com/checkstyle/checkstyle/master/config/java_regexp.header</checkstyle.regexp.header>
<antrun.plugin.version>3.1.0</antrun.plugin.version>
Expand Down Expand Up @@ -267,6 +268,7 @@
<property name="mvn.project.build.directory" value="${project.build.directory}"/>
<property name="checkstyle.configLocation" value="${checkstyle.configLocation}"/>
<property name="checkstyle.nonMain.configLocation" value="${checkstyle.nonMain.configLocation}"/>
<property name="checkstyle.non-main-files-suppressions.file" value="${checkstyle.non-main-files-suppressions.file}"/>
<property name="checkstyle.header" value="${checkstyle.header}"/>
<property name="checkstyle.regexp.header" value="${checkstyle.regexp.header}"/>
<ant antfile="config/ant-phase-verify.xml"/>
Expand Down