Skip to content

Commit 5df17df

Browse files
committed
Update Checkstyle
1 parent 2aaf01b commit 5df17df

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
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.28"
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: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
<!-- Items moved out of TreeWalker for new versions of Checkstyle -->
2929
<module name="FileLength"/>
3030
<module name="FileTabCharacter"/>
31+
<module name="LineLength">
32+
<property name="max" value="100"/>
33+
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
34+
<property name="tabWidth" value="4"/>
35+
</module>
36+
37+
<module name="RegexpSingleline">
38+
<!-- \s matches whitespace character, $ matches end of line. -->
39+
<property name="format" value="\s+$"/>
40+
</module>
3141

3242
<module name="TreeWalker">
3343
<!-- Javadoc requirements -->
@@ -36,7 +46,7 @@
3646
</module>
3747
<module name="JavadocMethod">
3848
<property name="scope" value="protected"/>
39-
<property name="allowUndeclaredRTE" value="true"/>
49+
<!-- <property name="allowUndeclaredRTE" value="true"/> -->
4050
</module>
4151
<module name="JavadocVariable">
4252
<property name="scope" value="public"/>
@@ -60,11 +70,6 @@
6070
<module name="UnusedImports"/>
6171

6272
<!-- 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>
6873
<module name="MethodLength"/>
6974
<module name="ParameterNumber"/>
7075

@@ -121,29 +126,22 @@
121126
<!-- <module name="TodoComment"/> -->
122127
<module name="UpperEll"/>
123128
<!-- allow comment suppression of checks -->
124-
<module name="FileContentsHolder"/>
129+
<!-- <module name="FileContentsHolder"/> --><!-- removed in 8.2 -->
125130
<!--
126131
<module name="GenericIllegalRegexp">
127132
<property name="format" value="\s+$"/>
128133
<property name="message" value="Line has trailing spaces."/>
129134
</module>
130135
-->
131-
</module>
132-
133-
<module name="RegexpSingleline">
134-
<!-- \s matches whitespace character, $ matches end of line. -->
135-
<property name="format" value="\s+$"/>
136+
<module name="SuppressionCommentFilter">
137+
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
138+
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
139+
<property name="checkFormat" value="$1"/>
140+
</module>
136141
</module>
137142

138143
<!-- <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-
145144
<module name="SuppressionFilter">
146145
<property name="file" value="${checkstyle.src.dir}/checkstyle-suppress.xml"/>
147146
</module>
148-
149147
</module>

0 commit comments

Comments
 (0)