Revert "Excavator: Upgrades Baseline to the latest version (#720)"

.baseline/checkstyle/checkstyle.xml

@@ -374,8 +374,9 @@
             <property name="message" value="Redundant ''static'' modifier."/>
         </module>
         <module name="RegexpSinglelineJava">
+            <property name="id" value="TodoFormat"/>
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
-            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
+            <property name="message" value="TODO format: '// TODO(#issue): explanation' or '// TODO(username): explanation'"/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
@@ -422,7 +423,6 @@
             <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."/>
@@ -436,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="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="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"/>

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java

@@ -98,7 +98,6 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
                                 .build())
                         .build())
                 .findAny()
-                .orElseThrow(
-                        () -> new IllegalStateException("Expected to match a known replaceable exception type"));
+                .orElseThrow(() -> new IllegalStateException("Expected to match a known replaceable exception type"));
     }
 }

baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/OptionalOrElseSupplier.java

@@ -22,7 +22,6 @@
 import java.util.function.Supplier;
 
 public class OptionalOrElseSupplier<T> {
-    @SuppressWarnings("OptionalOrElseMethodInvocation")
     @BeforeTemplate
     final T eagerOrElse(Optional<T> optional, Supplier<T> supplier) {
         return optional.orElse(supplier.get());

build.gradle

@@ -9,7 +9,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:13.1.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:1.10.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.65.0'
     }
 }
 
@@ -51,17 +51,5 @@ allprojects {
     group = 'com.palantir.baseline'
     version System.env.CIRCLE_TAG ?: gitVersion()
     description = 'A Gradle plugin for applying Baseline-recommended build and IDE settings'
-
-    // All projects here are to be used inside gradle, so safe-logging is not necessary
-    pluginManager.withPlugin 'com.palantir.baseline-error-prone', {
-        pluginManager.withPlugin 'java', {
-            tasks.withType(JavaCompile) {
-                options.errorprone.errorproneArgs += [
-                        '-Xep:PreferSafeLoggingPreconditions:OFF',
-                        '-Xep:PreferSafeLoggableExceptions:OFF',
-                ]
-            }
-        }
-    }
 }