You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2014/04/13 20:40:22 UTC
svn commit: r1587074 - in /maven/plugins/trunk/maven-checkstyle-plugin/src:
it/avalon-checks/ it/avalon-checks/src/main/java/org/ it/turbine-checks/
it/turbine-checks/src/main/java/org/ main/resources/config/
Author: dennisl
Date: Sun Apr 13 18:40:22 2014
New Revision: 1587074
URL: http://svn.apache.org/r1587074
Log:
[MCHECKSTYLE-227] Avalon and turbine checks are broken
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/
- copied from r1587030, maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/
- copied from r1587030, maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/src/main/java/org/MyClass.java
maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/src/main/java/org/MyClass.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/pom.xml?rev=1587074&r1=1587030&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/pom.xml Sun Apr 13 18:40:22 2014
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.checkstyle</groupId>
- <artifactId>check-pass</artifactId>
+ <artifactId>avalon-checks</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -40,6 +40,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
+ <configuration>
+ <configLocation>config/avalon_checks.xml</configLocation>
+ <headerLocation>config/maven-header.txt</headerLocation>
+ </configuration>
<executions>
<execution>
<id>check</id>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/src/main/java/org/MyClass.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/src/main/java/org/MyClass.java?rev=1587074&r1=1587030&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/src/main/java/org/MyClass.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/avalon-checks/src/main/java/org/MyClass.java Sun Apr 13 18:40:22 2014
@@ -22,5 +22,6 @@ package org;
/**
* Yada yada yada.
*/
-public class MyClass {
+public class MyClass
+{
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml?rev=1587074&r1=1587030&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml Sun Apr 13 18:40:22 2014
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.checkstyle</groupId>
- <artifactId>check-pass</artifactId>
+ <artifactId>turbine-checks</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -40,6 +40,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
+ <configuration>
+ <configLocation>config/turbine_checks.xml</configLocation>
+ <headerLocation>config/maven-header.txt</headerLocation>
+ </configuration>
<executions>
<execution>
<id>check</id>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/src/main/java/org/MyClass.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/src/main/java/org/MyClass.java?rev=1587074&r1=1587030&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/src/main/java/org/MyClass.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/src/main/java/org/MyClass.java Sun Apr 13 18:40:22 2014
@@ -22,5 +22,6 @@ package org;
/**
* Yada yada yada.
*/
-public class MyClass {
+public class MyClass
+{
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml?rev=1587074&r1=1587073&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml Sun Apr 13 18:40:22 2014
@@ -67,8 +67,12 @@ under the License.
<module name="FileLength"/>
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="RegexpHeader">
+ <property name="fileExtensions" value="java"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
@@ -129,16 +133,6 @@ under the License.
<module name="LocalFinalVariableName"/>
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. -->
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml?rev=1587074&r1=1587073&r2=1587074&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml Sun Apr 13 18:40:22 2014
@@ -67,8 +67,13 @@ under the License.
<module name="FileLength"/>
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="RegexpHeader">
+ <property name="fileExtensions" value="java"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <!-- The ignoreLines property no longer exists -->
+ </module>
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
@@ -124,17 +129,6 @@ under the License.
<module name="TypeName"/>
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. -->
- <property name="headerFile" value="${checkstyle.header.file}"/>
- <property name="ignoreLines" value="1,6"/>
- </module>
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>