Skip to content

Commit 60e0cdc

Browse files
committed
Update code analysis tools
1 parent 6dee370 commit 60e0cdc

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

check.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<!-- Ant Checkstyle -->
5959
<property name="checkstyle.src.dir" location="${etc.dir}/checkstyle"/>
6060
<property name="checkstyle.version"
61-
value="6.19"
61+
value="8.28"
6262
description="Which version of Checkstyle to use"/>
6363
<property name="checkstyle.reportdir"
6464
location="${reports.dir}/checkstyle"
@@ -88,7 +88,7 @@
8888

8989
<!-- Findbugs: Running SpotBugs -->
9090
<property name="spotbugs.version"
91-
value="3.1.4"
91+
value="3.1.12"
9292
description="Which version of SpotBugs to use"/>
9393
<property name="findbugs.reportdir"
9494
location="${reports.dir}/findbugs"
@@ -130,7 +130,7 @@
130130

131131
<!-- OWASP Dependency Check -->
132132
<property name="owasp.dc.version"
133-
value="3.2.1"
133+
value="5.2.4"
134134
description="Which version of OWASP Dependency Check to use"/>
135135
<property name="owasp.dc.report.dir"
136136
value="${reports.dir}/owasp-dc"

src/etc/checkstyle/checkstyle-config

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@
2929
<!-- size limits -->
3030
<module name="FileLength"/>
3131
<module name="FileTabCharacter"/>
32+
<module name="LineLength">
33+
<property name="max" value="100"/>
34+
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
35+
<property name="tabWidth" value="4"/>
36+
</module>
37+
38+
<module name="RegexpSingleline">
39+
<!-- \s matches whitespace character, $ matches end of line. -->
40+
<property name="format" value="\s+$"/>
41+
</module>
3242

3343
<module name="TreeWalker">
3444
<!-- Javadoc requirements -->
@@ -37,7 +47,7 @@
3747
</module>
3848
<module name="JavadocMethod">
3949
<property name="scope" value="protected"/>
40-
<property name="allowUndeclaredRTE" value="true"/>
50+
<!-- <property name="allowUndeclaredRTE" value="true"/> -->
4151
</module>
4252
<module name="JavadocVariable">
4353
<property name="scope" value="public"/>
@@ -61,11 +71,6 @@
6171
<module name="UnusedImports"/>
6272

6373
<!-- size limits -->
64-
<module name="LineLength">
65-
<property name="max" value="100"/>
66-
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
67-
<property name="tabWidth" value="4"/>
68-
</module>
6974
<module name="MethodLength"/>
7075
<module name="ParameterNumber"/>
7176

@@ -93,13 +98,14 @@
9398

9499
<!-- Checks for common coding problems -->
95100
<!-- <module name="AvoidInlineConditionals"/> -->
101+
<!-- <module name="DoubleCheckedLocking"/> --> <!-- removed in checkstyle 5.6 -->
96102
<module name="EmptyStatement"/>
97103
<module name="EqualsHashCode"/>
98104
<module name="IllegalInstantiation">
99105
<property name="classes" value="java.lang.Boolean"/>
100106
</module>
101-
<!-- <module name="InnerAssignment"/> -->
102-
<!-- <module name="MagicNumber"/> -->
107+
<module name="InnerAssignment"/>
108+
<module name="MagicNumber"/>
103109
<module name="MissingSwitchDefault"/>
104110
<!-- Allow redundant throw declarations for doc purposes
105111
<module name="RedundantThrows">
@@ -121,19 +127,19 @@
121127
<!-- <module name="TodoComment"/> -->
122128
<module name="UpperEll"/>
123129
<!-- allow comment suppression of checks -->
124-
<module name="FileContentsHolder"/>
125-
</module>
126-
127-
<module name="RegexpSingleline">
128-
<!-- \s matches whitespace character, $ matches end of line. -->
129-
<property name="format" value="\s+$"/>
130+
<!-- <module name="FileContentsHolder"/> --><!-- removed in 8.2 -->
131+
<!--
132+
<module name="GenericIllegalRegexp">
133+
<property name="format" value="\s+$"/>
134+
<property name="message" value="Line has trailing spaces."/>
135+
</module>
136+
-->
137+
<module name="SuppressionCommentFilter">
138+
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
139+
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
140+
<property name="checkFormat" value="$1"/>
141+
</module>
130142
</module>
131143

132144
<!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
133-
<module name="SuppressionCommentFilter">
134-
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
135-
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
136-
<property name="checkFormat" value="$1"/>
137-
</module>
138-
139145
</module>

0 commit comments

Comments
 (0)