Skip to content

Commit e145fda

Browse files
committed
Move checkstyle files out of the way
1 parent b959a9e commit e145fda

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ limitations under the License.
242242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
243243
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
244244
<commons.encoding>UTF-8</commons.encoding>
245-
<checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
245+
<checkstyle.header.file>${basedir}/src/conf/checkstyle-header.txt</checkstyle.header.file>
246+
<checkstyle.config.file>${basedir}/src/conf/checkstyle.xml</checkstyle.config.file>
246247
<checkstyle.version>2.17</checkstyle.version>
247248
<commons.japicmp.version>0.15.2</commons.japicmp.version>
248249
<commons.jacoco.version>0.8.6</commons.jacoco.version>
@@ -326,9 +327,9 @@ limitations under the License.
326327
<artifactId>maven-checkstyle-plugin</artifactId>
327328
<version>${checkstyle.version}</version>
328329
<configuration>
329-
<configLocation>${basedir}/checkstyle.xml</configLocation>
330+
<configLocation>${checkstyle.config.file}</configLocation>
330331
<enableRulesSummary>false</enableRulesSummary>
331-
<headerFile>${basedir}/LICENSE-header.txt</headerFile>
332+
<headerFile>${checkstyle.header.file}</headerFile>
332333
<includeTestSourceDirectory>true</includeTestSourceDirectory>
333334
<resourceExcludes>NOTICE.txt,LICENSE.txt,**/pom.properties,**/sha512.properties</resourceExcludes>
334335
</configuration>
@@ -362,9 +363,9 @@ limitations under the License.
362363
<artifactId>maven-checkstyle-plugin</artifactId>
363364
<version>${checkstyle.version}</version>
364365
<configuration>
365-
<configLocation>${basedir}/checkstyle.xml</configLocation>
366+
<configLocation>${checkstyle.config.file}</configLocation>
366367
<enableRulesSummary>false</enableRulesSummary>
367-
<headerFile>${basedir}/LICENSE-header.txt</headerFile>
368+
<headerFile>${checkstyle.header.file}</headerFile>
368369
<includeTestSourceDirectory>true</includeTestSourceDirectory>
369370
</configuration>
370371
<!-- We need to specify reportSets because 2.9.1 creates two reports -->

src/assembly/src.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
<fileSets>
2525
<fileSet>
2626
<includes>
27-
<include>checkstyle*.xml</include>
27+
<include>src/conf/*.*</include>
2828
<include>LICENSE.txt</include>
29-
<include>LICENSE-header.txt</include>
3029
<include>NOTICE.txt</include>
3130
<include>pmd.xml</include>
3231
<include>pom.xml</include>

checkstyle.xml renamed to src/conf/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<property name="localeLanguage" value="en" />
2626

2727
<module name="SuppressionFilter">
28-
<property name="file" value="checkstyle-suppressions.xml"/>
28+
<property name="file" value="src/conf/checkstyle-suppressions.xml"/>
2929
</module>
3030

3131
<!-- Checks whether files end with a new line. -->

0 commit comments

Comments
 (0)