Author: niallp Date: Thu May 22 23:10:00 2008 New Revision: 659438 URL: http://svn.apache.org/viewvc?rev=659438&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/proper/beanutils/trunk/checkstyle.xml commons/proper/beanutils/trunk/pom.xml commons/proper/beanutils/trunk/project.properties commons/proper/cli/trunk/pom.xml commons/proper/codec/trunk/checkstyle.xml commons/proper/codec/trunk/pom.xml commons/proper/codec/trunk/project.properties commons/proper/dbcp/trunk/pom.xml commons/proper/dbutils/trunk/pom.xml commons/proper/digester/trunk/checkstyle.xml commons/proper/digester/trunk/pom.xml commons/proper/digester/trunk/project.properties commons/proper/discovery/trunk/pom.xml commons/proper/email/trunk/conf/checkstyle.xml commons/proper/email/trunk/pom.xml commons/proper/fileupload/trunk/pom.xml commons/proper/fileupload/trunk/project.properties commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml commons/proper/io/trunk/pom.xml commons/proper/jexl/trunk/pom.xml commons/proper/logging/trunk/checkstyle.xml commons/proper/logging/trunk/license-header.txt commons/proper/logging/trunk/pom.xml commons/proper/logging/trunk/project.properties commons/proper/logging/trunk/project.xml commons/proper/math/trunk/checkstyle.xml commons/proper/math/trunk/pom.xml commons/proper/math/trunk/project.properties commons/proper/primitives/trunk/pom.xml commons/proper/proxy/trunk/checkstyle.xml commons/proper/proxy/trunk/pom.xml commons/proper/scxml/trunk/pom.xml commons/proper/scxml/trunk/scxml-checks.xml commons/proper/validator/trunk/checkstyle.xml commons/proper/validator/trunk/pom.xml commons/proper/validator/trunk/project.properties Modified: commons/proper/beanutils/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/beanutils/trunk/checkstyle.xml (original) +++ commons/proper/beanutils/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -44,7 +44,7 @@ <property name="allowUndeclaredRTE" value="true"/> </module> <module name="Header"> - <property name="headerFile" value="LICENSE-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> </module> </module> Modified: commons/proper/beanutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/beanutils/trunk/pom.xml (original) +++ commons/proper/beanutils/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -257,8 +257,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> Modified: commons/proper/beanutils/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/beanutils/trunk/project.properties (original) +++ commons/proper/beanutils/trunk/project.properties Thu May 22 23:10:00 2008 @@ -40,3 +40,4 @@ maven.changes.issue.template=%URL%/browse/%ISSUE% maven.checkstyle.properties=checkstyle.xml +maven.checkstyle.header.file=${basedir}/license-header.txt Modified: commons/proper/cli/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/cli/trunk/pom.xml (original) +++ commons/proper/cli/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -186,6 +186,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> @@ -203,14 +204,14 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.1</version> <configuration> - <configLocation>checkstyle.xml</configLocation> + <configLocation>${basedir}/checkstyle.xml</configLocation> <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>1.1.1</version> + <version>1.2</version> <configuration> <threshold>Normal</threshold> <effort>Default</effort> Modified: commons/proper/codec/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/codec/trunk/checkstyle.xml (original) +++ commons/proper/codec/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -27,7 +27,7 @@ <module name="TreeWalker"> <!-- Verify that EVERY source file has the appropriate license --> <module name="Header"> - <property name="headerFile" value="LICENSE-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <module name="OperatorWrap"> Modified: commons/proper/codec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/codec/trunk/pom.xml (original) +++ commons/proper/codec/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -218,8 +218,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> Modified: commons/proper/codec/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/codec/trunk/project.properties (original) +++ commons/proper/codec/trunk/project.properties Thu May 22 23:10:00 2008 @@ -30,6 +30,7 @@ maven.changes.issue.template=%URL%/show_bug.cgi?id=%ISSUE% maven.checkstyle.properties=${basedir}/checkstyle.xml +maven.checkstyle.header.file=${basedir}/LICENSE-header.txt maven.junit.fork=true maven.linkcheck.enable=false Modified: commons/proper/dbcp/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/dbcp/trunk/pom.xml (original) +++ commons/proper/dbcp/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -293,7 +293,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> @@ -302,12 +302,12 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> + <version>2.4</version> <configuration> <links> <link>http://java.sun.com/j2se/1.5.0/docs/api</link> @@ -319,7 +319,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}/xdocs/changes.xml</xmlPath> <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate> @@ -337,14 +337,14 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.1</version> <configuration> - <configLocation>checkstyle.xml</configLocation> + <configLocation>${basedir}/checkstyle.xml</configLocation> <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.2</version> + <version>2.3</version> <configuration> <rulesets> <ruleset>checkstyle.xml</ruleset> Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/dbutils/trunk/pom.xml (original) +++ commons/proper/dbutils/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -211,6 +211,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> + <version>2.0</version> <configuration> <xmlPath>xdocs/changes.xml</xmlPath> <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate> @@ -226,8 +227,9 @@ <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> Modified: commons/proper/digester/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/digester/trunk/checkstyle.xml (original) +++ commons/proper/digester/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -11,8 +11,8 @@ <module name="TreeWalker"> <!-- Verify that EVERY source file has the appropriate license --> <module name="Header"> - <property name="headerFile" value="${basedir}/LICENSE-header.txt"/> - <property name="ignoreLines" value="1,3"/> + <property name="headerFile" value="${checkstyle.header.file}"/> + <property name="ignoreLines" value="1"/> </module> <!-- no tabs allowed in files --> Modified: commons/proper/digester/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/digester/trunk/pom.xml (original) +++ commons/proper/digester/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -274,6 +274,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> + <version>2.0</version> <configuration> <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate> </configuration> @@ -289,13 +290,17 @@ <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}/file-header.txt</headerFile> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> + <version>2.3</version> <!--Use default rules--> </plugin> </plugins> Modified: commons/proper/digester/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/digester/trunk/project.properties (original) +++ commons/proper/digester/trunk/project.properties Thu May 22 23:10:00 2008 @@ -7,6 +7,7 @@ maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory maven.checkstyle.properties=${basedir}/checkstyle.xml +maven.checkstyle.header.file=${basedir}/file-header.txt maven.checkstyle.excludes=**/parser/* maven.junit.fork=true maven.linkcheck.enable=true Modified: commons/proper/discovery/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/discovery/trunk/pom.xml (original) +++ commons/proper/discovery/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -162,8 +162,9 @@ <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> Modified: commons/proper/email/trunk/conf/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/conf/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/email/trunk/conf/checkstyle.xml (original) +++ commons/proper/email/trunk/conf/checkstyle.xml Thu May 22 23:10:00 2008 @@ -67,8 +67,7 @@ <!-- Checks for Headers --> <!-- See http://checkstyle.sf.net/config_header.html --> <module name="Header"> - <property name="headerFile" value="conf/HEADER.txt"/> - <property name="ignoreLines" value="2"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <!-- Following interprets the header file as regular expressions. --> Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -298,13 +298,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> <configuration> - <configLocation>conf/checkstyle.xml</configLocation> + <configLocation>${basedir}/conf/checkstyle.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + <headerFile>${basedir}/conf/HEADER.txt</headerFile> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> + <version>2.2</version> <configuration> <comparisonArtifacts> <comparisonArtifact> @@ -318,6 +322,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> + <version>2.0</version> <configuration> <xmlPath>${basedir}/xdocs/changes.xml</xmlPath> </configuration> Modified: commons/proper/fileupload/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/fileupload/trunk/pom.xml (original) +++ commons/proper/fileupload/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -197,6 +197,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> + <version>2.0</version> <configuration> <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate> </configuration> @@ -212,13 +213,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> <configuration> - <configLocation>src/checkstyle/fileupload_checks.xml</configLocation> + <configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + <headerFile>${basedir}/src/checkstyle/license-header.txt</headerFile> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> + <version>2.3</version> <configuration> <rulesets> <ruleset>src/checkstyle/fileupload_basic.xml</ruleset> @@ -228,9 +233,15 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> + <version>2.2</version> <configuration> - <comparisonVersion>1.2</comparisonVersion> - <minSeverity>info</minSeverity> + <comparisonArtifacts> + <comparisonArtifact> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2</version> + </comparisonArtifact> + </comparisonArtifacts> </configuration> </plugin> </plugins> Modified: commons/proper/fileupload/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/fileupload/trunk/project.properties (original) +++ commons/proper/fileupload/trunk/project.properties Thu May 22 23:10:00 2008 @@ -41,6 +41,7 @@ maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target} maven.checkstyle.properties = ${basedir}/src/checkstyle/fileupload_checks.xml +maven.checkstyle.header.file=${basedir}/src/checkstyle/license-header.txt maven.pmd.rulesetfiles=src/checkstyle/fileupload_basic.xml,rulesets/unusedcode.xml,rulesets/imports.xml Modified: commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml (original) +++ commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml Thu May 22 23:10:00 2008 @@ -126,7 +126,7 @@ <!-- Following interprets the header file as regular expressions. --> <!-- <module name="RegexpHeader"/> --> <module name="RegexpHeader"> - <property name="headerFile" value="src/checkstyle/license-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> Modified: commons/proper/io/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/io/trunk/pom.xml (original) +++ commons/proper/io/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -256,6 +256,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <version>2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -281,14 +282,14 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.1</version> <configuration> - <configLocation>checkstyle.xml</configLocation> + <configLocation>${basedir}/checkstyle.xml</configLocation> <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> <configuration> <comparisonVersion>1.4</comparisonVersion> <minSeverity>info</minSeverity> Modified: commons/proper/jexl/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/jexl/trunk/pom.xml (original) +++ commons/proper/jexl/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -154,10 +154,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> <configuration> - <configLocation>src/conf/checkstyle.xml</configLocation> + <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation> <excludes>org/apache/commons/jexl/parser/*.java</excludes> - <headerFile>src/conf/header.txt</headerFile> + <headerFile>${basedir}/src/conf/header.txt</headerFile> <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> Modified: commons/proper/logging/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/logging/trunk/checkstyle.xml (original) +++ commons/proper/logging/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -30,7 +30,7 @@ <module name="TreeWalker"> <!-- Verify that EVERY source file has the appropriate license --> <module name="Header"> - <property name="headerFile" value="${basedir}/LICENSE-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <module name="OperatorWrap"> Modified: commons/proper/logging/trunk/license-header.txt URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/license-header.txt?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/logging/trunk/license-header.txt (original) +++ commons/proper/logging/trunk/license-header.txt Thu May 22 23:10:00 2008 @@ -1,18 +1,16 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ \ No newline at end of file + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ Modified: commons/proper/logging/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/logging/trunk/pom.xml (original) +++ commons/proper/logging/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -483,19 +483,20 @@ <reporting> <plugins> - <!-- <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.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> - <version>2.1.1</version> + <version>2.2</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: commons/proper/logging/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/logging/trunk/project.properties (original) +++ commons/proper/logging/trunk/project.properties Thu May 22 23:10:00 2008 @@ -19,6 +19,7 @@ maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory maven.checkstyle.properties=checkstyle.xml +maven.checkstyle.header.file=${basedir}/license-header.txt # documentation properties maven.xdoc.date=left Modified: commons/proper/logging/trunk/project.xml URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/project.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/logging/trunk/project.xml (original) +++ commons/proper/logging/trunk/project.xml Thu May 22 23:10:00 2008 @@ -281,9 +281,7 @@ </build> <reports> - <!-- <report>maven-checkstyle-plugin</report> - --> <report>maven-javadoc-plugin</report> <report>maven-jdepend-plugin</report> <report>maven-junit-report-plugin</report> Modified: commons/proper/math/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/math/trunk/checkstyle.xml (original) +++ commons/proper/math/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -27,8 +27,7 @@ <!-- Verify that EVERY source file has the appropriate license --> <module name="Header"> - <property name="headerFile" value="${basedir}/LICENSE-header.txt"/> - <property name="ignoreLines" value="2"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <!-- Operator must be at end of wrapped line --> Modified: commons/proper/math/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/math/trunk/pom.xml (original) +++ commons/proper/math/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -277,7 +277,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> @@ -295,8 +295,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> @@ -312,7 +313,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> Modified: commons/proper/math/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/math/trunk/project.properties (original) +++ commons/proper/math/trunk/project.properties Thu May 22 23:10:00 2008 @@ -27,6 +27,7 @@ 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 Modified: commons/proper/primitives/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/primitives/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/primitives/trunk/pom.xml (original) +++ commons/proper/primitives/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -135,6 +135,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> @@ -150,8 +151,9 @@ <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> Modified: commons/proper/proxy/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/proxy/trunk/checkstyle.xml (original) +++ commons/proper/proxy/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -28,7 +28,7 @@ <module name="TreeWalker"> <!-- Verify that EVERY source file has the appropriate license --> <module name="Header"> - <property name="headerFile" value="${basedir}/LICENSE-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <!-- no tabs allowed in files --> Modified: commons/proper/proxy/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/proxy/trunk/pom.xml (original) +++ commons/proper/proxy/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -207,14 +207,17 @@ <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-javadoc-plugin</artifactId> - + <version>2.4</version> <configuration> <linksource>true</linksource> <links> Modified: commons/proper/scxml/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/scxml/trunk/pom.xml (original) +++ commons/proper/scxml/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -259,8 +259,9 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.1</version> <configuration> - <configLocation>scxml-checks.xml</configLocation> + <configLocation>${basedir}/scxml-checks.xml</configLocation> <enableRulesSummary>false</enableRulesSummary> + <headerFile>${basedir}/scxml-asl-header.txt</headerFile> </configuration> </plugin> </plugins> Modified: commons/proper/scxml/trunk/scxml-checks.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/scxml-checks.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/scxml/trunk/scxml-checks.xml (original) +++ commons/proper/scxml/trunk/scxml-checks.xml Thu May 22 23:10:00 2008 @@ -105,7 +105,7 @@ <!-- <property --> <!-- name="headerFile" --> <!-- value="${basedir}/java.header"/> --> - <property name="headerFile" value="scxml-asl-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> <!-- Following interprets the header file as regular expressions. --> Modified: commons/proper/validator/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/checkstyle.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/validator/trunk/checkstyle.xml (original) +++ commons/proper/validator/trunk/checkstyle.xml Thu May 22 23:10:00 2008 @@ -139,7 +139,7 @@ <!-- enforce License Header --> <module name="Header"> - <property name="headerFile" value="LICENSE-header.txt"/> + <property name="headerFile" value="${checkstyle.header.file}"/> </module> </module> Modified: commons/proper/validator/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/pom.xml?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/validator/trunk/pom.xml (original) +++ commons/proper/validator/trunk/pom.xml Thu May 22 23:10:00 2008 @@ -237,8 +237,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> Modified: commons/proper/validator/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/project.properties?rev=659438&r1=659437&r2=659438&view=diff ============================================================================== --- commons/proper/validator/trunk/project.properties (original) +++ commons/proper/validator/trunk/project.properties Thu May 22 23:10:00 2008 @@ -24,6 +24,7 @@ maven.repo.remote=http://repo1.maven.org/maven maven.checkstyle.properties=checkstyle.xml +maven.checkstyle.header.file=${basedir}/license-header.txt maven.compile.source=1.4 maven.compile.target=1.4