Skip to content

Commit a7a30fa

Browse files
author
Niall Kegan Pemberton
committed
COMMONSSITE-30 - fix the checkstyle configuration to work for multi-module and review/update <reporting> plugin version numbers for the poms being changed.
- pom's need to use ${basedir} for configuration files as the multi-module profile is run from commons-parent, so if not specified it can't find those files - the checkstyle configuration file needs to use ${checkstyle.header.file} for the headerFile property and <headerFile> element added to the plugin config in the pom.xml - fix m1 checkstyle config to reflect the above where appropriate (specify header file property) git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@659438 13f79535-47bb-0310-9956-ffa450edef68
1 parent 0a5889e commit a7a30fa

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ limitations under the License.
2727
<module name="TreeWalker">
2828
<!-- Verify that EVERY source file has the appropriate license -->
2929
<module name="Header">
30-
<property name="headerFile" value="LICENSE-header.txt"/>
30+
<property name="headerFile" value="${checkstyle.header.file}"/>
3131
</module>
3232

3333
<module name="OperatorWrap">

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@
218218
<artifactId>maven-checkstyle-plugin</artifactId>
219219
<version>2.1</version>
220220
<configuration>
221-
<configLocation>checkstyle.xml</configLocation>
221+
<configLocation>${basedir}/checkstyle.xml</configLocation>
222222
<enableRulesSummary>false</enableRulesSummary>
223+
<headerFile>${basedir}/LICENSE-header.txt</headerFile>
223224
</configuration>
224225
</plugin>
225226
<plugin>

project.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ maven.remote.group=apcvs
3030
maven.changes.issue.template=%URL%/show_bug.cgi?id=%ISSUE%
3131

3232
maven.checkstyle.properties=${basedir}/checkstyle.xml
33+
maven.checkstyle.header.file=${basedir}/LICENSE-header.txt
3334
maven.junit.fork=true
3435
maven.linkcheck.enable=false
3536

0 commit comments

Comments
 (0)