aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle1
-rw-r--r--gradle/checkstyle.xml11
-rw-r--r--pom.xml16
3 files changed, 8 insertions, 20 deletions
diff --git a/build.gradle b/build.gradle
index 7ee6b7a95..8e65bfdd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@ sourceCompatibility = "1.8"
compileJava.options.encoding = "UTF-8"
checkstyle {
+ toolVersion = "8.26"
configFile = "gradle/checkstyle.xml" as File
checkstyleTest.enabled = false
}
diff --git a/gradle/checkstyle.xml b/gradle/checkstyle.xml
index f84df396d..72950c7bd 100644
--- a/gradle/checkstyle.xml
+++ b/gradle/checkstyle.xml
@@ -5,7 +5,10 @@
<module name="Checker">
- <suppress files="[\\/]protobuf[\\/]" checks="[a-zA-Z0-9]*" />
+ <module name="SuppressionSingleFilter">
+ <property name="files" value="[/\\]protobuf[/\\]"/>
+ <property name="checks" value=".*"/>
+ </module>
<!--<property name="fileExtensions" value="java, properties, xml"/>-->
@@ -22,6 +25,9 @@
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="FileLength"/>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
@@ -66,9 +72,6 @@
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
<module name="MethodLength">
<property name="max" value="200"/>
</module>
diff --git a/pom.xml b/pom.xml
index 1b405aa4c..050321d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,22 +256,6 @@
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <configLocation>gradle/checkstyle.xml</configLocation>
- </configuration>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>