Author: cduffy
Date: Wed Dec 18 16:46:30 2013
New Revision: 1552014
URL: http://svn.apache.org/r1552014
Log:
Update checkstyle configuration for version 5.7
Modified:
ant/ivy/core/trunk/.project
ant/ivy/core/trunk/src/etc/checkstyle/checkstyle-config
Modified: ant/ivy/core/trunk/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/.project?rev=1552014&r1=1552013&r2=1552014&view=diff
==============================================================================
--- ant/ivy/core/trunk/.project (original)
+++ ant/ivy/core/trunk/.project Wed Dec 18 16:46:30 2013
@@ -34,7 +34,7 @@
</arguments>
</buildCommand>
<buildCommand>
-
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -42,7 +42,7 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
-
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
</projectDescription>
Modified: ant/ivy/core/trunk/src/etc/checkstyle/checkstyle-config
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/etc/checkstyle/checkstyle-config?rev=1552014&r1=1552013&r2=1552014&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/etc/checkstyle/checkstyle-config (original)
+++ ant/ivy/core/trunk/src/etc/checkstyle/checkstyle-config Wed Dec 18 16:46:30
2013
@@ -19,6 +19,17 @@
under the License.
-->
<module name="Checker">
+
+ <!-- required licence file -->
+ <module name="Header">
+ <property name="headerFile"
value="${checkstyle.src.dir}/RequiredHeader.txt"/>
+ <property name="ignoreLines" value="2"/>
+ </module>
+
+ <!-- Items moved out of TreeWalker for new versions of Checkstyle -->
+ <module name="FileLength"/>
+ <module name="FileTabCharacter"/>
+
<module name="TreeWalker">
<!-- Javadoc requirements -->
<!-- TODO uncomment this when javadoc will be improved
@@ -45,12 +56,6 @@
<module name="ParameterName"/>
<module name="StaticVariableName"/>
- <!-- required licence file -->
- <module name="Header">
- <property name="headerFile"
value="${checkstyle.src.dir}/RequiredHeader.txt"/>
- <property name="ignoreLines" value="2"/>
- </module>
-
<!-- Import conventions -->
<module name="AvoidStarImport"/>
<!-- <module name="IllegalImport"/> -->
@@ -58,7 +63,6 @@
<module name="UnusedImports"/>
<!-- size limits -->
- <module name="FileLength"/>
<module name="LineLength">
<property name="max" value="100"/>
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
@@ -73,7 +77,6 @@
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
@@ -93,7 +96,7 @@
<!-- Checks for common coding problems -->
<!--<module name="AvoidInlineConditionals"/> -->
- <module name="DoubleCheckedLocking"/>
+ <!--<module name="DoubleCheckedLocking"/>--> <!-- removed in checkstyle
5.6 -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation">
