Skip to content

Commit 4ec18bd

Browse files
committed
Put all checkstyle files together
1 parent 52a154b commit 4ec18bd

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@
156156
<commons.encoding>UTF-8</commons.encoding>
157157

158158
<checkstyle.version>3.1.2</checkstyle.version>
159-
<checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
159+
<checkstyle.header.file>${basedir}/src/site/resources/checkstyle/checkstyle-header.txt</checkstyle.header.file>
160+
<checkstyle.config.file>${basedir}/src/site/resources/checkstyle/checkstyle.xml</checkstyle.config.file>
161+
<checkstyle.suppress.file>${basedir}/src/site/resources/checkstyle/checkstyle-suppressions.xml</checkstyle.suppress.file>
160162
<checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt, **/maven-archiver/pom.properties</checkstyle.resourceExcludes>
161163

162164
<commons.pmd.version>3.14.0</commons.pmd.version>
@@ -203,9 +205,9 @@
203205
<artifactId>maven-checkstyle-plugin</artifactId>
204206
<version>${checkstyle.version}</version>
205207
<configuration>
206-
<configLocation>${basedir}/checkstyle.xml</configLocation>
208+
<configLocation>${checkstyle.config.file}</configLocation>
207209
<enableRulesSummary>false</enableRulesSummary>
208-
<suppressionsLocation>${basedir}/src/site/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
210+
<suppressionsLocation>${checkstyle.suppress.file}</suppressionsLocation>
209211
</configuration>
210212
</plugin>
211213
<plugin>
@@ -274,9 +276,9 @@
274276
<artifactId>maven-checkstyle-plugin</artifactId>
275277
<version>${checkstyle.version}</version>
276278
<configuration>
277-
<configLocation>${basedir}/checkstyle.xml</configLocation>
279+
<configLocation>${checkstyle.config.file}</configLocation>
278280
<enableRulesSummary>false</enableRulesSummary>
279-
<suppressionsLocation>${basedir}/src/site/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
281+
<suppressionsLocation>${checkstyle.suppress.file}</suppressionsLocation>
280282
</configuration>
281283
<!-- We need to specify reportSets because 2.9.1 creates two reports -->
282284
<reportSets>

LICENSE-header.txt renamed to src/site/resources/checkstyle/checkstyle-header.txt

File renamed without changes.

checkstyle.xml renamed to src/site/resources/checkstyle/checkstyle.xml

File renamed without changes.

0 commit comments

Comments
 (0)