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/math/branches/MATH_2_0@659441 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
93a8bb4f13
commit
beae2e9891
|
@ -27,8 +27,7 @@
|
|||
|
||||
<!-- Verify that EVERY source file has the appropriate license -->
|
||||
<module name="Header">
|
||||
<property name="headerFile" value="license-header.txt"/>
|
||||
<property name="ignoreLines" value="2"/>
|
||||
<property name="headerFile" value="${checkstyle.header.file}"/>
|
||||
</module>
|
||||
|
||||
<!-- Operator must be at end of wrapped line -->
|
||||
|
|
7
pom.xml
7
pom.xml
|
@ -253,7 +253,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-changes-plugin</artifactId>
|
||||
<version>2.0-beta-2</version>
|
||||
<version>2.0</version>
|
||||
<configuration>
|
||||
<xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
|
||||
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
|
||||
|
@ -271,8 +271,9 @@
|
|||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
<configuration>
|
||||
<configLocation>checkstyle.xml</configLocation>
|
||||
<configLocation>${basedir}/checkstyle.xml</configLocation>
|
||||
<enableRulesSummary>false</enableRulesSummary>
|
||||
<headerFile>${basedir}/license-header.txt</headerFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
@ -290,7 +291,7 @@
|
|||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>clirr-maven-plugin</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<version>2.2</version>
|
||||
<configuration>
|
||||
<minSeverity>info</minSeverity>
|
||||
</configuration>
|
||||
|
|
|
@ -27,6 +27,7 @@ maven.repo.remote=http://repo1.maven.org/maven
|
|||
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
|
||||
|
||||
maven.checkstyle.properties=${basedir}/checkstyle.xml
|
||||
maven.checkstyle.header.file=${basedir}/license-header.txt
|
||||
maven.xdoc.poweredby.image=maven-feather.png
|
||||
|
||||
#If you wish to skip tests when doing builds, uncomment
|
||||
|
|
Loading…
Reference in New Issue