diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 792229cfc..cd19cae45 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">
@@ -84,11 +87,13 @@
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
             <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
                 java.util.Collections.*,
                 java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -110,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."/>
@@ -369,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"/>
@@ -422,6 +422,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -435,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
@@ -468,10 +469,9 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
         <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>
diff --git a/build.gradle b/build.gradle
index eee063c77..55dd7ae73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.65.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.48.1'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.15.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.2.0'
diff --git a/conjure-python-core/src/main/java/com/palantir/conjure/python/PythonAliasTopologicalSorter.java b/conjure-python-core/src/main/java/com/palantir/conjure/python/PythonAliasTopologicalSorter.java
index 4a0514c6c..6e6a16089 100644
--- a/conjure-python-core/src/main/java/com/palantir/conjure/python/PythonAliasTopologicalSorter.java
+++ b/conjure-python-core/src/main/java/com/palantir/conjure/python/PythonAliasTopologicalSorter.java
@@ -90,7 +90,7 @@ static class AliasEdgeVisitor implements Type.Visitor<List<AliasSnippet>> {
         }
 
         @Override
-        public List<AliasSnippet> visitPrimitive(PrimitiveType value) {
+        public List<AliasSnippet> visitPrimitive(PrimitiveType _value) {
             return Collections.emptyList();
         }
 
@@ -126,7 +126,7 @@ public List<AliasSnippet> visitReference(TypeName value) {
         }
 
         @Override
-        public List<AliasSnippet> visitExternal(ExternalReference value) {
+        public List<AliasSnippet> visitExternal(ExternalReference _value) {
             return Collections.emptyList();
         }
 
diff --git a/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java b/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java
index 509dbb9a2..d5b3f54f4 100644
--- a/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java
+++ b/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java
@@ -223,7 +223,7 @@ static Builder builder() {
     }
 
     @Value.Immutable
-    public interface PythonEndpointParam {
+    interface PythonEndpointParam {
 
         String paramName();
 
diff --git a/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonPoetWriter.java b/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonPoetWriter.java
index 372f0bea8..ab7b72381 100644
--- a/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonPoetWriter.java
+++ b/conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonPoetWriter.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
+import com.google.errorprone.annotations.FormatMethod;
 import java.io.PrintStream;
 
 public final class PythonPoetWriter {
@@ -86,6 +87,7 @@ public PythonPoetWriter writeIndentedLine(String content) {
         return this;
     }
 
+    @FormatMethod
     public PythonPoetWriter writeIndentedLine(String formatString, Object... args) {
         return writeIndentedLine(String.format(formatString, args));
     }
diff --git a/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java b/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
index 0f5eb7a03..bd7bbd219 100644
--- a/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
+++ b/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
@@ -149,7 +149,7 @@ private Optional<RunnerScheduler> maybeParallelScheduler(ParentFolder annotation
             @Override
             @SuppressWarnings("FutureReturnValueIgnored")
             public void schedule(Runnable childStatement) {
-                executor.submit(childStatement);
+                executor.execute(childStatement);
             }
 
             @Override
diff --git a/conjure-python-core/src/test/java/com/palantir/conjure/python/InMemoryPythonFileWriter.java b/conjure-python-core/src/test/java/com/palantir/conjure/python/InMemoryPythonFileWriter.java
index 471dbb79f..3ec80678f 100644
--- a/conjure-python-core/src/test/java/com/palantir/conjure/python/InMemoryPythonFileWriter.java
+++ b/conjure-python-core/src/test/java/com/palantir/conjure/python/InMemoryPythonFileWriter.java
@@ -16,7 +16,6 @@
 
 package com.palantir.conjure.python;
 
-import com.google.common.collect.Maps;
 import com.palantir.conjure.python.poet.PythonFile;
 import com.palantir.conjure.python.poet.PythonPoetWriter;
 import java.io.ByteArrayOutputStream;
@@ -24,11 +23,12 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
 
 public final class InMemoryPythonFileWriter implements PythonFileWriter {
 
-    private final Map<Path, String> pythonFiles = Maps.newHashMap();
+    private final Map<Path, String> pythonFiles = new HashMap<>();
 
     public Map<Path, String> getPythonFiles() {
         return pythonFiles;
diff --git a/conjure-python/src/main/java/com/palantir/conjure/python/cli/ConjurePythonCli.java b/conjure-python/src/main/java/com/palantir/conjure/python/cli/ConjurePythonCli.java
index e77325f7f..23f64488c 100644
--- a/conjure-python/src/main/java/com/palantir/conjure/python/cli/ConjurePythonCli.java
+++ b/conjure-python/src/main/java/com/palantir/conjure/python/cli/ConjurePythonCli.java
@@ -90,7 +90,7 @@ public static final class GenerateCommand implements Runnable {
         private boolean writeCondaRecipe;
 
         @CommandLine.Unmatched
-        @SuppressWarnings("UnusedVariable")
+        @SuppressWarnings("StrictUnusedVariable")
         private List<String> unmatchedOptions;
 
         @Override
diff --git a/versions.props b/versions.props
index 80b27c7c4..b6da1e98c 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,8 @@
 com.fasterxml.jackson.*:jackson-* = 2.9.8
 com.google.code.findbugs:jsr305 = 3.0.2
-com.google.errorprone:error_prone_annotations = 2.3.3
 com.google.guava:guava = 23.6.1-jre
+com.google.errorprone:error_prone_annotations = 2.3.4
+com.google.errorprone:error_prone_core = 2.3.4
 com.palantir.conjure.verification:* = 0.16.6
 com.palantir.conjure:* = 4.4.0
 commons-cli:commons-cli = 1.4
@@ -15,3 +16,6 @@ org.slf4j:* = 1.7.25
 
 # linter:OFF
 com.palantir.conjure.python:conjure-python-client = 1.4.0
+
+# conflict resolution
+org.checkerframework:checker-qual = 3.0.0