Skip to content

Commit 109ce63

Browse files
tisonkungosonzhang
authored andcommitted
Downgrade checkstyle version to be compatible with Java 1.7 (Tencent#94)
1 parent 38941ff commit 109ce63

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

codestyle/checkstyle.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ page at http://checkstyle.sourceforge.net/config.html -->
5757
<property name="file" value="${checkstyle.suppressions.file}" default="suppressions.xml" />
5858
</module>
5959

60+
<!-- Allow use of comment to suppress javadocstyle -->
61+
<module name="SuppressionCommentFilter">
62+
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
63+
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
64+
<property name="checkFormat" value="$1"/>
65+
</module>
66+
6067
<!-- All Java AST specific tests live under TreeWalker module. -->
6168
<module name="TreeWalker">
6269

@@ -65,13 +72,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
6572
-->
6673
<module name="Indentation"/>
6774

68-
<!-- Allow use of comment to suppress javadocstyle -->
69-
<module name="SuppressionCommentFilter">
70-
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
71-
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
72-
<property name="checkFormat" value="$1"/>
73-
</module>
74-
7575
<module name="TodoComment">
7676
<!-- Checks that disallowed strings are not used in comments. -->
7777
<property name="format" value="(FIXME)|(XXX)|(@author)" />

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<powermock.version>1.6.5</powermock.version>
4545
<exec.maven.version>1.6.0</exec.maven.version>
4646
<build.helper.maven.version>3.0.0</build.helper.maven.version>
47-
<checkstyle.version>8.18</checkstyle.version>
47+
<checkstyle.version>6.19</checkstyle.version>
4848
<protobuf.version>2.5.0</protobuf.version>
4949
<je.version>7.3.7</je.version>
5050
</properties>
@@ -108,7 +108,7 @@
108108
<plugin>
109109
<groupId>org.apache.maven.plugins</groupId>
110110
<artifactId>maven-checkstyle-plugin</artifactId>
111-
<version>3.1.0</version>
111+
<version>2.16</version>
112112
<dependencies>
113113
<dependency>
114114
<groupId>com.puppycrawl.tools</groupId>

0 commit comments

Comments
 (0)