Upgrade checkstyle to solve alert

Also changes a couple of things that had broken through bitrot in the intervening time.
spotify · Mar 15, 2019 · 53a1925 · 53a1925
1 parent 8b1c4ff
commit 53a1925
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -3,7 +3,6 @@
     "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 <module name="Checker">
-    <module name="SuppressionCommentFilter"/>
     <module name="NewlineAtEndOfFile"/>
 
     <module name="FileLength"/>
@@ -19,7 +18,7 @@
     </module>
 
     <module name="TreeWalker">
-        <module name="FileContentsHolder"/>
+        <module name="SuppressionCommentFilter"/>
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
         <!--module name="ConstantName"/-->
         <module name="LocalFinalVariableName"/>
@@ -81,7 +80,6 @@
         <module name="InnerAssignment"/>
         <!--module name="MagicNumber"/-->
         <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
         <!--module name="SimplifyBooleanReturn"/-->
 

diff --git a/core/src/main/java/com/spotify/missinglink/datamodel/MethodDescriptors.java b/core/src/main/java/com/spotify/missinglink/datamodel/MethodDescriptors.java
@@ -58,7 +58,7 @@ private static class MethodKey {
     private final String name;
     private final String desc;
 
-    public MethodKey(String name, String desc) {
+    MethodKey(String name, String desc) {
       this.name = Preconditions.checkNotNull(name);
       this.desc = Preconditions.checkNotNull(desc);
     }

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.spotify</groupId>
@@ -123,7 +125,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.13</version>
+        <version>3.0.0</version>
         <configuration>
           <configLocation>checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
@@ -132,7 +134,9 @@
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <maxAllowedViolations>0</maxAllowedViolations>
           <!-- make sure automatter generated classes are not checked by checkstyle -->
-          <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+          <sourceDirectories>
+            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+          </sourceDirectories>
         </configuration>
         <executions>
           <execution>
@@ -151,7 +155,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>5.9</version>
+            <version>[8.18,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -198,7 +202,7 @@
   </build>
 
   <profiles>
-    <profile> 
+    <profile>
       <id>release</id>
       <build>
         <plugins>