diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 43ec38a3..d1d0ffaf 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -53,6 +53,9 @@
         <property name="optional" value="true"/>
     </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
         <module name="SuppressionCommentFilter">
@@ -112,7 +115,6 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
             <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
@@ -371,10 +373,6 @@
             <property name="format" value="\bIOUtils\.toString\("/>
             <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
         </module>
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="static enum"/>
-            <property name="message" value="Redundant ''static'' modifier."/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
             <property name="message" value="TODO format: // TODO(#issue): explanation"/>
diff --git a/build.gradle b/build.gradle
index 51d6a529..9c818902 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         classpath 'com.gradle.publish:plugin-publish-plugin:0.10.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.27.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.31.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
diff --git a/src/main/java/com/palantir/gradle/graal/NativeImageTask.java b/src/main/java/com/palantir/gradle/graal/NativeImageTask.java
index 90afaeda..98a829f9 100644
--- a/src/main/java/com/palantir/gradle/graal/NativeImageTask.java
+++ b/src/main/java/com/palantir/gradle/graal/NativeImageTask.java
@@ -80,7 +80,7 @@ public final void setMainClass(Provider<String> provider) {
         mainClass.set(provider);
     }
 
-    private class LogAction implements Action<Task> {
+    private final class LogAction implements Action<Task> {
         @Override
         public void execute(Task _task) {
             getLogger().warn("native image available at {} ({} MB)",
diff --git a/src/main/java/com/palantir/gradle/graal/SharedLibraryTask.java b/src/main/java/com/palantir/gradle/graal/SharedLibraryTask.java
index 4a891eef..32affc32 100644
--- a/src/main/java/com/palantir/gradle/graal/SharedLibraryTask.java
+++ b/src/main/java/com/palantir/gradle/graal/SharedLibraryTask.java
@@ -68,7 +68,7 @@ public final void sharedLibrary() throws IOException {
         });
     }
 
-    private class LogAction implements Action<Task> {
+    private final class LogAction implements Action<Task> {
         @Override
         public void execute(Task _task) {
             getLogger().warn("shared library available at {} ({} MB)",