Author: henning
Date: Fri Jan 16 03:49:25 2015
New Revision: 1652339
URL: http://svn.apache.org/r1652339
Log:
Make checkstyle plugin work with checkstyle 6.2
Removed:
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-163/
Modified:
maven/plugins/branches/MCHECKSTYLE-272/pom.xml
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-129/pom.xml
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-137/checkstyle.xml
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-193/checkstyle.xml
maven/plugins/branches/MCHECKSTYLE-272/src/it/multi-modules/pom.xml
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/turbine_checks.xml
Modified: maven/plugins/branches/MCHECKSTYLE-272/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/pom.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
--- maven/plugins/branches/MCHECKSTYLE-272/pom.xml (original)
+++ maven/plugins/branches/MCHECKSTYLE-272/pom.xml Fri Jan 16 03:49:25 2015
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.16-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Checkstyle Plugin</name>
@@ -58,8 +58,10 @@ under the License.
</distributionManagement>
<properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
<mavenVersion>2.2.1</mavenVersion>
- <checkstyleVersion>5.9</checkstyleVersion>
+ <checkstyleVersion>6.2</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
<sitePluginVersion>3.4</sitePluginVersion>
</properties>
@@ -303,8 +305,6 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <!-- Cannot remove this version yet. maven-plugins:24 uses 1.7,
which breaks the ITs -->
- <version>1.8</version>
<configuration>
<goals>
<goal>clean</goal>
@@ -333,7 +333,7 @@ under the License.
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<requirements>
- <jdk>1.5</jdk>
+ <jdk>${maven.compiler.source}</jdk>
</requirements>
</configuration>
</plugin>
Modified: maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-129/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-129/pom.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
--- maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-129/pom.xml
(original)
+++ maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-129/pom.xml Fri
Jan 16 03:49:25 2015
@@ -57,7 +57,7 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyleVersion}</version>
<configuration>
-
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/sun_checks.xml</configLocation>
+
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml</configLocation>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-137/checkstyle.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-137/checkstyle.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
---
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-137/checkstyle.xml
(original)
+++
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-137/checkstyle.xml
Fri Jan 16 03:49:25 2015
@@ -110,7 +110,6 @@ under the License.
<property name="illegalClassNames"
value="java.lang.Error,java.lang.RuntimeException"/>
</module>
<module name="PackageDeclaration"/>
- <module name="JUnitTestCase"/>
<module name="DeclarationOrder"/>
<module name="ExplicitInitialization"/>
<module name="DefaultComesLast"/>
Modified:
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-193/checkstyle.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-193/checkstyle.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
---
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-193/checkstyle.xml
(original)
+++
maven/plugins/branches/MCHECKSTYLE-272/src/it/MCHECKSTYLE-193/checkstyle.xml
Fri Jan 16 03:49:25 2015
@@ -113,7 +113,6 @@ Checkstyle rules for Basis Technology.
<property name="illegalClassNames"
value="java.lang.Error,java.lang.RuntimeException"/>
</module>
<module name="PackageDeclaration"/>
- <module name="JUnitTestCase"/>
<module name="DeclarationOrder"/>
<module name="ExplicitInitialization"/>
<module name="DefaultComesLast"/>
Modified: maven/plugins/branches/MCHECKSTYLE-272/src/it/multi-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/it/multi-modules/pom.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
--- maven/plugins/branches/MCHECKSTYLE-272/src/it/multi-modules/pom.xml
(original)
+++ maven/plugins/branches/MCHECKSTYLE-272/src/it/multi-modules/pom.xml Fri Jan
16 03:49:25 2015
@@ -39,8 +39,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
-
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation>
-
<headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation>
+
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml</configLocation>
+
<headerLocation>http://svn.apache.org/repos/asf/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven-header.txt</headerLocation>
</configuration>
</plugin>
</plugins>
@@ -75,4 +75,4 @@
<module>multi-modules-child</module>
<module>multi-modules-child-nosource</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
---
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml
(original)
+++
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/maven_checks.xml
Fri Jan 16 03:49:25 2015
@@ -176,7 +176,6 @@ under the License.
<property name="ignoreNumbers" value="-4, -3, -2, -1, 0, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 31, 32, 37, 64, 100, 128, 256,
512, 1000, 1024"/>
</module>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
Modified:
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
---
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml
(original)
+++
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/sun_checks.xml
Fri Jan 16 03:49:25 2015
@@ -165,7 +165,6 @@
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
Modified:
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/turbine_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/turbine_checks.xml?rev=1652339&r1=1652338&r2=1652339&view=diff
==============================================================================
---
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/turbine_checks.xml
(original)
+++
maven/plugins/branches/MCHECKSTYLE-272/src/main/resources/config/turbine_checks.xml
Fri Jan 16 03:49:25 2015
@@ -178,7 +178,6 @@ under the License.
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
