Author: niallp
Date: Fri May 23 19:25:23 2008
New Revision: 659747
URL: http://svn.apache.org/viewvc?rev=659747&view=rev
Log:
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)
Modified:
commons/sandbox/compress/trunk/checkstyle.xml
commons/sandbox/compress/trunk/pom.xml
commons/sandbox/compress/trunk/project.properties
commons/sandbox/csv/trunk/pom.xml
commons/sandbox/exec/trunk/pom.xml
commons/sandbox/finder/trunk/pom.xml
commons/sandbox/i18n/trunk/pom.xml
commons/sandbox/id/trunk/checkstyle.xml
commons/sandbox/id/trunk/pom.xml
commons/sandbox/id/trunk/project.properties
commons/sandbox/jnet/trunk/pom.xml
commons/sandbox/monitoring/trunk/pom.xml
commons/sandbox/nabla/trunk/checkstyle.xml
commons/sandbox/nabla/trunk/pom.xml
commons/sandbox/performance/trunk/pom.xml
commons/sandbox/pipeline/trunk/pom.xml
Modified: commons/sandbox/compress/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/checkstyle.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/checkstyle.xml (original)
+++ commons/sandbox/compress/trunk/checkstyle.xml Fri May 23 19:25:23 2008
@@ -45,7 +45,7 @@
<!-- Checks that are different from the sun coding conventions ones -->
<!-- ************************************************************** -->
<module name="Header">
- <property name="headerFile" value="LICENSE-header.txt"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<property name="tabWidth" value="4"/>
<module name="LeftCurly">
Modified: commons/sandbox/compress/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/pom.xml (original)
+++ commons/sandbox/compress/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -97,8 +97,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<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>
</plugins>
Modified: commons/sandbox/compress/trunk/project.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/project.properties?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/project.properties (original)
+++ commons/sandbox/compress/trunk/project.properties Fri May 23 19:25:23 2008
@@ -23,6 +23,7 @@
maven.xdoc.includeProjectDocumentation=yes
maven.checkstyle.properties = checkstyle.xml
+maven.checkstyle.header.file=${basedir}/license-header.txt
# Compile targets
maven.compile.source=1.4
Modified: commons/sandbox/csv/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/pom.xml (original)
+++ commons/sandbox/csv/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -73,7 +73,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>2.0</version>
<configuration>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
</configuration>
@@ -88,8 +88,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
</plugins>
Modified: commons/sandbox/exec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/exec/trunk/pom.xml (original)
+++ commons/sandbox/exec/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0</version>
<reportSets>
<reportSet>
<reports>
Modified: commons/sandbox/finder/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/finder/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/finder/trunk/pom.xml (original)
+++ commons/sandbox/finder/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -81,6 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
</configuration>
@@ -95,8 +96,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
</plugins>
Modified: commons/sandbox/i18n/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/i18n/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/i18n/trunk/pom.xml (original)
+++ commons/sandbox/i18n/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -120,6 +120,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -136,6 +137,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
</plugin>
-->
</plugins>
Modified: commons/sandbox/id/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/id/trunk/checkstyle.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/id/trunk/checkstyle.xml (original)
+++ commons/sandbox/id/trunk/checkstyle.xml Fri May 23 19:25:23 2008
@@ -46,7 +46,7 @@
<!-- Checks that are different from the sun coding conventions ones -->
<!-- ************************************************************** -->
<module name="Header">
- <property name="headerFile" value="LICENSE-header.txt"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<property name="tabWidth" value="4"/>
<module name="LeftCurly">
Modified: commons/sandbox/id/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/id/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/id/trunk/pom.xml (original)
+++ commons/sandbox/id/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -137,8 +137,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<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>
</plugins>
Modified: commons/sandbox/id/trunk/project.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/id/trunk/project.properties?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/id/trunk/project.properties (original)
+++ commons/sandbox/id/trunk/project.properties Fri May 23 19:25:23 2008
@@ -16,6 +16,7 @@
maven.repo.remote=http://repo1.maven.org/maven
maven.checkstyle.properties = checkstyle.xml
+maven.checkstyle.header.file=${basedir}/license-header.txt
# uncomment the next line to work in offline mode (no jar download & no
linkcheck)
#maven.mode.online=
Modified: commons/sandbox/jnet/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/jnet/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/jnet/trunk/pom.xml (original)
+++ commons/sandbox/jnet/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -76,6 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<linksource>true</linksource>
<links>
Modified: commons/sandbox/monitoring/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/pom.xml (original)
+++ commons/sandbox/monitoring/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -242,6 +242,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: commons/sandbox/nabla/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/checkstyle.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/checkstyle.xml (original)
+++ commons/sandbox/nabla/trunk/checkstyle.xml Fri May 23 19:25:23 2008
@@ -36,8 +36,7 @@
<property name="message" value="developers names should be in pom
file"/>
</module>
<module name="Header">
- <property name="headerFile" value="license-header.txt"/>
- <property name="ignoreLines" value="2" />
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<module name="HiddenField">
<property name="ignoreConstructorParameter" value="true"/>
Modified: commons/sandbox/nabla/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/pom.xml (original)
+++ commons/sandbox/nabla/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -117,37 +117,36 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<linkXref>true</linkXref>
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0</version>
<configuration>
<xmlPath>
${basedir}/src/site/xdoc/changes.xml
Modified: commons/sandbox/performance/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/pom.xml (original)
+++ commons/sandbox/performance/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -141,6 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
@@ -151,7 +152,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.2</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
@@ -160,7 +161,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</plugin>
</plugins>
</reporting>
Modified: commons/sandbox/pipeline/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/pipeline/trunk/pom.xml?rev=659747&r1=659746&r2=659747&view=diff
==============================================================================
--- commons/sandbox/pipeline/trunk/pom.xml (original)
+++ commons/sandbox/pipeline/trunk/pom.xml Fri May 23 19:25:23 2008
@@ -118,16 +118,6 @@
<optional>true</optional>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
<distributionManagement>
<site>
<id>website</id>
