Excavator: Upgrades Baseline to the latest version

Author: svc-excavator-bot

.baseline/checkstyle/checkstyle.xml

@@ -20,15 +20,6 @@
         <property name="format" value="&gt;&gt;&gt;&gt;&gt;&gt;&gt;"/>
         <property name="message" value="Found (&gt;&gt;&gt;&gt;&gt;&gt;&gt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
     </module>
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="message" value="Whitespace at end-of-line"/>
-    </module>
-    <module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
-        <property name="fileExtensions" value="java"/>
-        <property name="format" value="^\n\n$"/>
-        <property name="message" value="Two consecutive blank lines are not permitted."/>
-    </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.90.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.28.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.15.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.72.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:7.4.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:5.0.0'
         classpath 'com.palantir.gradle.guide:gradle-guide:1.25.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'

discover-tests-cli/src/main/java/com/palantir/gradle/plugintesting/SubClassesOfCommand.java

@@ -63,18 +63,15 @@ public FilterResult apply(TestDescriptor testDescriptor) {
         };
     }
 
-    @SuppressWarnings("for-rollout:StreamFlatMapOptional")
-    static List<Class<?>> getClassesFrom(List<String> classNames) {
+        static List<Class<?>> getClassesFrom(List<String> classNames) {
         return classNames.stream()
                 .map(className -> {
                     try {
                         return Optional.of(Class.forName(className));
                     } catch (ClassNotFoundException e) {
                         return Optional.<Class<?>>empty();
                     }
-                })
-                .filter(Optional::isPresent)
-                .map(Optional::get)
+                }).<? extends Class<?>>mapMulti(Optional::ifPresent)
                 .collect(Collectors.toList());
     }
 

discover-tests-cli/src/main/java/com/palantir/gradle/plugintesting/WithAnnotationsCommand.java

@@ -71,10 +71,10 @@ private static boolean hasAnyClassAnnotations(
         return annotations.stream().anyMatch(annotation -> AnnotationSupport.isAnnotated(clazz, annotation));
     }
 
-    @SuppressWarnings({"BanSystemOut", "for-rollout:UnnecessarilyQualified"})
+    @SuppressWarnings("BanSystemOut")
     private static Optional<Class<? extends Annotation>> getClassAnnotation(String annotationName) {
         try {
-            return Optional.of((Class<? extends java.lang.annotation.Annotation>) Class.forName(annotationName));
+            return Optional.of((Class<? extends Annotation>) Class.forName(annotationName));
         } catch (ClassNotFoundException e) {
             System.out.format(
                     "Failed to retrieve the annotation class from the string name: %s, Skipping", annotationName);

gradle-plugin-testing/src/main/java/com/palantir/gradle/plugintesting/DiscoverTestClassesTask.java

@@ -72,12 +72,10 @@ public abstract class DiscoverTestClassesTask extends JavaExec {
     @Inject
     public abstract ProjectLayout getProjectLayout();
 
-    @SuppressWarnings("for-rollout:MissingOverride")
-    @Inject
+        @Override @Inject
     public abstract ProviderFactory getProviderFactory();
 
-    @SuppressWarnings("for-rollout:MissingOverride")
-    @Inject
+        @Override @Inject
     public abstract ObjectFactory getObjectFactory();
 
     public DiscoverTestClassesTask() {

gradle-plugin-testing/src/main/java/com/palantir/gradle/plugintesting/PluginTestingPlugin.java

@@ -91,8 +91,8 @@ public void apply(Project project) {
         });
     }
 
-    @SuppressWarnings("for-rollout:TaskDependsOn")
-    private void doApply(Project project) {
+        @SuppressWarnings("for-rollout:TaskDependsOn")
+        private void doApply(Project project) {
         PluginTestingExtension testUtilsExt = project.getExtensions().getByType(PluginTestingExtension.class);
 
         setupErrorprones(project);

gradle/exception

@@ -64,8 +64,8 @@ public static String resolve(String depName) {
         return depName + ":" + version(depName);
     }
 
-    @SuppressWarnings("for-rollout:PreferSafeLoggableExceptions")
-    private static Map<String, String> loadVersions() {
+        @SuppressWarnings("for-rollout:PreferSafeLoggableExceptions")
+        private static Map<String, String> loadVersions() {
         String fileName = System.getProperty(TEST_DEPENDENCIES_FILE_SYSTEM_PROPERTY);
         if (fileName == null) {
             throw new IllegalStateException("No test dependencies file name found.  Use the PluginTestingPlugin to set "

plugin-testing-core/src/main/java/com/palantir/gradle/plugintesting/TestDependencyVersions.java

@@ -31,3 +31,4 @@ include 'configuration-cache-spec'
 include 'gradle-plugin-testing-error-prone'
 include 'gradle-plugin-testing-junit'
 include 'discover-tests-cli'
+throw new RuntimeException('''The excavator failed to run properly - exited with code 1 and output:\n\n''' + file('gradle/exception').text + '\n\n')