diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 0de6d7769..5d8bc6ef7 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -468,7 +468,6 @@
             <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 3c41c7d25..1c545c747 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.31.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.35.2'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
diff --git a/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java b/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java
index 3f1aa3ac9..014b030e5 100644
--- a/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java
+++ b/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java
@@ -61,7 +61,7 @@ public LockState readLocks() {
                 testDeps = lines.subList(testDependenciesPosition + 1, lines.size()).stream();
             } else {
                 productionDeps = lines.stream().filter(line -> !line.trim().startsWith("#"));
-                testDeps = Stream.of();
+                testDeps = Stream.empty();
             }
 
             return LockState.from(parseLines(productionDeps), parseLines(testDeps));
diff --git a/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java b/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java
index 2dc649099..1efefcf95 100644
--- a/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java
+++ b/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java
@@ -881,8 +881,9 @@ private static LockedConfigurations computeConfigurationsToLock(Project project,
                 Collections2.transform(ext.getTestConfigurations(), project.getConfigurations()::getByName));
 
         if (ext.isUseJavaPluginDefaults() && project.getPluginManager().hasPlugin("java")) {
-            SourceSetContainer sourceSets =
-                    project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
+            SourceSetContainer sourceSets = project.getConvention()
+                    .getPlugin(JavaPluginConvention.class)
+                    .getSourceSets();
 
             lockedConfigurations.addAllProductionConfigurations(
                     getConfigurationsForSourceSet(project, sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)));
diff --git a/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java b/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java
index 5390c7171..aa89c44c9 100644
--- a/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java
+++ b/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java
@@ -70,8 +70,9 @@ public final void taskAction() {
                 .collect(Multimaps.toMultimap(Line::dependentsHash, Function.identity(), HashMultimap::create));
 
         if (!hashOption.isPresent()) {
-            Optional<String> example =
-                    lineByHash.keySet().stream().map(h -> ", e.g. './gradlew why --hash " + h + "'").findFirst();
+            Optional<String> example = lineByHash.keySet().stream()
+                    .map(h -> ", e.g. './gradlew why --hash " + h + "'")
+                    .findFirst();
             throw new RuntimeException(
                     "./gradlew why requires a '--hash <hash>' from versions.lock" + example.orElse(""));
         }
diff --git a/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java b/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java
index fca68b5bf..37d166a46 100644
--- a/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java
+++ b/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java
@@ -41,7 +41,10 @@ public interface LockState extends Serializable {
 
     @Value.Lazy
     default List<Line> allLines() {
-        return ImmutableList.<Line>builder().addAll(productionLines()).addAll(testLines()).build();
+        return ImmutableList.<Line>builder()
+                .addAll(productionLines())
+                .addAll(testLines())
+                .build();
     }
 
     /** Mapping from {@code group:artifact} to the full line. */
diff --git a/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java b/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java
index 534db5539..9850c6b26 100644
--- a/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java
+++ b/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java
@@ -72,7 +72,7 @@ private static Line componentWithDependentsToLine(ModuleVersionIdentifier compon
     public static List<String> prettyPrintConstraints(Dependents dependents) {
         Stream<Entry<String, Collection<VersionConstraint>>> constraintEntries = Streams.concat(
                 dependents.projectConstraints().isEmpty()
-                        ? Stream.of()
+                        ? Stream.empty()
                         : Stream.of(Maps.immutableEntry("projects", dependents.projectConstraints())),
                 dependents.nonProjectConstraints().entrySet().stream()
                         .map(e -> Maps.immutableEntry(formatComponentIdentifier(e.getKey()), e.getValue())));