From 17ef95ce5bad3ace92c9055a426b2b173aacc512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Leszko?= <rafal@hazelcast.com>
Date: Wed, 5 Aug 2020 15:59:34 +0200
Subject: [PATCH] Update checkstyle version and licenses (#46)

---
 checkstyle/ClassHeader.txt                    |  2 +-
 checkstyle/checkstyle.xml                     | 23 +++++++++++--------
 checkstyle/suppressions.xml                   | 11 ---------
 pom.xml                                       |  6 +++--
 ...ast.spi.discovery.DiscoveryStrategyFactory |  1 +
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/checkstyle/ClassHeader.txt b/checkstyle/ClassHeader.txt
index 304ad2ca97b8..0ad6f3ca5047 100644
--- a/checkstyle/ClassHeader.txt
+++ b/checkstyle/ClassHeader.txt
@@ -11,4 +11,4 @@
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
- */
+ */
\ No newline at end of file
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 24a22cd95ae8..45500c7a0220 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -58,7 +58,9 @@
     </module>
 
     <!-- Enable suppression of file contents using //CHECKSTYLE:[ON|OFF] comments -->
+    <!--
     <module name="SuppressionCommentFilter"/>
+    -->
 
     <!-- Enable the suppression annotation @SuppressWarnings("checkstyle:lowercasecheckname"} -->
     <module name="SuppressWarningsFilter"/>
@@ -103,10 +105,11 @@
         <property name="fileExtensions" value="java"/>
     </module>
 
-    <module name="TreeWalker">
-        <!-- Activate comment suppression filters -->
-        <module name="FileContentsHolder"/>
+    <module name="LineLength">
+        <property name="max" value="130"/>
+    </module>
 
+    <module name="TreeWalker">
         <!-- Needed for SuppressWarningsFilter to work -->
         <module name="SuppressWarningsHolder"/>
 
@@ -158,9 +161,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="130"/>
-        </module>
         <module name="MethodLength">
             <property name="tokens" value="METHOD_DEF"/>
             <property name="max" value="60"/>
@@ -224,7 +224,6 @@
 
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="ArrayTrailingComma"/>
         <module name="CovariantEquals"/>
         <module name="DeclarationOrder"/>
         <module name="ExplicitInitialization"/>
@@ -250,6 +249,7 @@
         <module name="InnerAssignment"/>
         <module name="ReturnCount">
             <property name="max" value="8"/>
+            <property name="maxForVoid" value="8"/>
         </module>
         <module name="NestedIfDepth">
             <property name="max" value="2"/>
@@ -297,7 +297,12 @@
             <property name="max" value="12"/>
         </module>
         <module name="NPathComplexity">
-            <property name="max" value="50"/>
+            <!-- TODO Agree on the value
+                 Checkstyle 7.7 improved the NPath algorithm further that leads to higher NPath counts.
+                 7.6 passes with max 50, 7.7 needs it to be set to at least 216
+                 the default threshold is 200
+            -->
+            <property name="max" value="250"/>
         </module>
 
         <!-- Miscellaneous other checks.                   -->
@@ -313,4 +318,4 @@
                       value="Please use UuidUtil.newUnsecureUUID() or UuidUtil.newSecureUUID() instead of UUID.randomUUID()"/>
         </module>
     </module>
-</module>
\ No newline at end of file
+</module>
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index d2ada7da0d18..53a11bd6362d 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -21,15 +21,4 @@
 
 <suppressions>
 
-    <!-- Suppress strict duplicate code checking -->
-    <suppress checks="StrictDuplicateCode" files="\.java" lines="1-15"/>
-
-    <!-- Exclude implementation packages from JavaDoc checks -->
-    <suppress checks="JavadocPackage" files="/impl/"/>
-    <suppress checks="JavadocType" files="/impl/"/>
-    <suppress checks="JavadocVariable" files="/impl/"/>
-
-    <!-- Exclude Clover instrumented sources -->
-    <suppress checks="" files="/src-instrumented/"/>
-
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 0d142f5a0458..9888eaacc6b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,9 @@
   ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
   ~ WARRANTIES OF ANY KIND, either express or implied. See the License for the
   ~ specific language governing permissions and limitations under the License.
-  --><project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <name>hazelcast-gcp</name>
@@ -41,7 +43,7 @@
         <maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>
 
         <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
-        <maven.checkstyle.plugin.version>2.15</maven.checkstyle.plugin.version>
+        <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
         <maven.spotbuts.plugin.version>3.1.5</maven.spotbuts.plugin.version>
         <maven.sonar.plugin.version>3.3.0.603</maven.sonar.plugin.version>
         <maven.jacoco.plugin.version>0.8.5</maven.jacoco.plugin.version>
diff --git a/src/main/resources/META-INF/services/com.hazelcast.spi.discovery.DiscoveryStrategyFactory b/src/main/resources/META-INF/services/com.hazelcast.spi.discovery.DiscoveryStrategyFactory
index 9a011bea4812..ef05fc0e568c 100644
--- a/src/main/resources/META-INF/services/com.hazelcast.spi.discovery.DiscoveryStrategyFactory
+++ b/src/main/resources/META-INF/services/com.hazelcast.spi.discovery.DiscoveryStrategyFactory
@@ -12,4 +12,5 @@
 # WARRANTIES OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
 #
+
 com.hazelcast.gcp.GcpDiscoveryStrategyFactory
\ No newline at end of file