Skip to content

Commit d588acd

Browse files
committed
Update Checkstyle
1 parent 2aaf01b commit d588acd

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@
595595
</target>
596596

597597
<target name="init-checkstyle" depends="jar">
598-
<ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="8.0"
598+
<ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="8.26"
599599
inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
600600
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
601601
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>

src/etc/checkstyle/checkstyle-config

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<module name="FileLength"/>
3030
<module name="FileTabCharacter"/>
3131

32-
<module name="TreeWalker">
32+
<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
3333
<!-- Javadoc requirements -->
3434
<module name="JavadocType">
3535
<property name="scope" value="protected"/>
@@ -60,11 +60,6 @@
6060
<module name="UnusedImports"/>
6161

6262
<!-- size limits -->
63-
<module name="LineLength">
64-
<property name="max" value="100"/>
65-
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
66-
<property name="tabWidth" value="4"/>
67-
</module>
6863
<module name="MethodLength"/>
6964
<module name="ParameterNumber"/>
7065

@@ -121,13 +116,26 @@
121116
<!-- <module name="TodoComment"/> -->
122117
<module name="UpperEll"/>
123118
<!-- allow comment suppression of checks -->
119+
<!--
124120
<module name="FileContentsHolder"/>
121+
-->
125122
<!--
126123
<module name="GenericIllegalRegexp">
127124
<property name="format" value="\s+$"/>
128125
<property name="message" value="Line has trailing spaces."/>
129126
</module>
130127
-->
128+
<module name="SuppressionCommentFilter">
129+
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
130+
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
131+
<property name="checkFormat" value="$1"/>
132+
</module>
133+
</module>
134+
135+
<module name="LineLength">
136+
<property name="max" value="100"/>
137+
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
138+
<property name="tabWidth" value="4"/>
131139
</module>
132140

133141
<module name="RegexpSingleline">
@@ -136,14 +144,7 @@
136144
</module>
137145

138146
<!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
139-
<module name="SuppressionCommentFilter">
140-
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
141-
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
142-
<property name="checkFormat" value="$1"/>
143-
</module>
144-
145147
<module name="SuppressionFilter">
146148
<property name="file" value="${checkstyle.src.dir}/checkstyle-suppress.xml"/>
147149
</module>
148-
149150
</module>

0 commit comments

Comments
 (0)