diff --git a/checkstyle.xml b/checkstyle.xml
index 9d2f4bbe9..d7917523a 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,318 +1,268 @@
-
+
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
+
-
-
-
+ Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/pom.xml b/pom.xml
index 3f296b7b7..2afa6b892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,7 +335,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- 3.0.0
+ 3.1.0
org.codehaus.mojo
@@ -448,22 +448,6 @@
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- ${project.root-directory}/checkstyle.xml
- true
- ${project.root-directory}/checkstyle-suppressions.xml
-
-
-
-
- check
-
-
-
-
org.codehaus.mojo
findbugs-maven-plugin
@@ -622,6 +606,7 @@
+
root-directory
@@ -634,5 +619,40 @@
.
+
+
+
+ checkstyle-tests
+
+ [1.8,)
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+
+ com.puppycrawl.tools
+ checkstyle
+ 8.23
+
+
+
+ checkstyle.xml
+ true
+ checkstyle-suppressions.xml
+
+
+
+
+ check
+
+
+
+
+
+
+
diff --git a/samples/checkstyle.xml b/samples/checkstyle.xml
deleted file mode 100644
index 66cd0c954..000000000
--- a/samples/checkstyle.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml
index 8c5ca35fb..c7977fc01 100644
--- a/samples/dailymotion-simple-cmdline-sample/pom.xml
+++ b/samples/dailymotion-simple-cmdline-sample/pom.xml
@@ -33,23 +33,6 @@
-
- maven-checkstyle-plugin
- 3.0.0
-
- ../../checkstyle.xml
- true
- false
- ../../checkstyle-suppressions.xml
-
-
-
-
- check
-
-
-
-
org.codehaus.mojo
findbugs-maven-plugin
@@ -95,4 +78,41 @@
UTF-8
+
+
+
+
+ checkstyle-tests
+
+ [1.8,)
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+
+ com.puppycrawl.tools
+ checkstyle
+ 8.23
+
+
+
+ ../../checkstyle.xml
+ true
+ ../../checkstyle-suppressions.xml
+
+
+
+
+ check
+
+
+
+
+
+
+
+