Skip to content

Commit de7f5f8

Browse files
committed
[add] upgrade checkstyle
1 parent 7022179 commit de7f5f8

File tree

3 files changed

+44
-40
lines changed

3 files changed

+44
-40
lines changed

Diff for: checkstyle_checks.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,14 @@
180180
<module name="FinalParameters"/>
181181
<!-- <module name="TodoComment"/> -->
182182
<module name="UpperEll"/>
183-
<module name="FileContentsHolder"/>
184-
185-
</module>
186-
187-
<module name="SuppressionCommentFilter"/>
188-
<module name="SuppressWithNearbyCommentFilter">
189-
<property name="commentFormat" value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
190-
<property name="checkFormat" value="$1"/>
191-
<property name="influenceFormat" value="$2"/>
183+
<module name="SuppressionCommentFilter"/>
184+
<module name="SuppressWithNearbyCommentFilter">
185+
<property name="commentFormat" value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
186+
<property name="checkFormat" value="$1"/>
187+
<property name="influenceFormat" value="$2"/>
188+
</module>
189+
<module name="SuppressWarningsHolder" />
192190
</module>
191+
<module name="SuppressWarningsFilter" />
193192

194193
</module>

Diff for: licenseheader.txt

+35-30
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
1-
2-
Copyright (c) 2001-2017, Zoltan Farkas All Rights Reserved.
3-
4-
This library is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU Lesser General Public
6-
License as published by the Free Software Foundation; either
7-
version 2.1 of the License, or (at your option) any later version.
8-
9-
This library is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
13-
14-
You should have received a copy of the GNU Lesser General Public
15-
License along with this program; if not, write to the Free Software
16-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
18-
Additionally licensed with:
19-
20-
Licensed under the Apache License, Version 2.0 (the "License");
21-
you may not use this file except in compliance with the License.
22-
You may obtain a copy of the License at
23-
24-
http://www.apache.org/licenses/LICENSE-2.0
25-
26-
Unless required by applicable law or agreed to in writing, software
27-
distributed under the License is distributed on an "AS IS" BASIS,
28-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
29-
See the License for the specific language governing permissions and
30-
limitations under the License.
1+
<#if licenseFirst??>
2+
${licenseFirst}
3+
</#if>
4+
${licensePrefix}Copyright (c) 2001-2017, Zoltan Farkas All Rights Reserved.
5+
${licensePrefix}
6+
${licensePrefix}This library is free software; you can redistribute it and/or
7+
${licensePrefix}modify it under the terms of the GNU Lesser General Public
8+
${licensePrefix}License as published by the Free Software Foundation; either
9+
${licensePrefix}version 2.1 of the License, or (at your option) any later version.
10+
${licensePrefix}
11+
${licensePrefix}This library is distributed in the hope that it will be useful,
12+
${licensePrefix}but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
${licensePrefix}MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
${licensePrefix}GNU General Public License for more details.
15+
${licensePrefix}
16+
${licensePrefix}You should have received a copy of the GNU Lesser General Public
17+
${licensePrefix}License along with this program; if not, write to the Free Software
18+
${licensePrefix}Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19+
${licensePrefix}
20+
${licensePrefix}Additionally licensed with:
21+
${licensePrefix}
22+
${licensePrefix}Licensed under the Apache License, Version 2.0 (the "License");
23+
${licensePrefix}you may not use this file except in compliance with the License.
24+
${licensePrefix}You may obtain a copy of the License at
25+
${licensePrefix}
26+
${licensePrefix} http://www.apache.org/licenses/LICENSE-2.0
27+
${licensePrefix}
28+
${licensePrefix}Unless required by applicable law or agreed to in writing, software
29+
${licensePrefix}distributed under the License is distributed on an "AS IS" BASIS,
30+
${licensePrefix}WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31+
${licensePrefix}See the License for the specific language governing permissions and
32+
${licensePrefix}limitations under the License.
33+
<#if licenseLast??>
34+
${licenseLast}
35+
</#if>

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ java.util.Calendar#getInstance()
404404
<dependency>
405405
<groupId>com.puppycrawl.tools</groupId>
406406
<artifactId>checkstyle</artifactId>
407-
<version>7.8.1</version>
407+
<version>8.2</version>
408408
</dependency>
409409
</dependencies>
410410
<configuration>

0 commit comments

Comments
 (0)