Skip to content

Commit 6e37d02

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent 2019f2f commit 6e37d02

3 files changed

Lines changed: 6 additions & 18 deletions

File tree

.baseline/checkstyle/checkstyle.xml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
<property name="format" value="&gt;&gt;&gt;&gt;&gt;&gt;&gt;"/>
2121
<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."/>
2222
</module>
23-
<module name="RegexpSingleline">
24-
<property name="format" value="\s+$"/>
25-
<property name="message" value="Whitespace at end-of-line"/>
26-
</module>
27-
<module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
28-
<property name="fileExtensions" value="java"/>
29-
<property name="format" value="^\n\n$"/>
30-
<property name="message" value="Two consecutive blank lines are not permitted."/>
31-
</module>
3223
<module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
3324
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
3425
</module>
@@ -41,10 +32,6 @@
4132
<module name="BeforeExecutionExclusionFileFilter">
4233
<property name="fileNamePattern" value="module\-info\.java$"/>
4334
</module>
44-
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
45-
<property name="max" value="120"/>
46-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
47-
</module>
4835
<module name="TreeWalker">
4936
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
5037
<module name="SuppressionCommentFilter">
@@ -407,7 +394,9 @@
407394
<property name="allowMissingReturnTag" value="true"/>
408395
<property name="allowedAnnotations" value="Override, Test"/>
409396
</module>
410-
<module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
397+
<module name="JavadocStyle"><!-- Java Style Guide: Javadoc -->
398+
<property name="checkFirstSentence" value="false"/>
399+
</module>
411400
<module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
412401
<property name="offset" value="0"/>
413402
</module>
@@ -432,9 +421,6 @@
432421
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
433422
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
434423
</module>
435-
<module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
436-
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
437-
</module>
438424

439425
<!-- Stricter checks end -->
440426
</module>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.90.0'
1515
classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.28.0'
1616
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.15.0'
17-
classpath 'com.palantir.baseline:gradle-baseline-java:6.54.0'
17+
classpath 'com.palantir.baseline:gradle-baseline-java:7.5.0'
1818
classpath 'com.palantir.gradle.gitversion:gradle-git-version:5.0.0'
1919
classpath 'com.palantir.gradle.guide:gradle-guide:1.13.0'
2020
classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'

gradle-incremental-configuration-cache/src/main/java/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.palantir.gradle.configcache.incremental.RunResult.Failure;
2222
import com.palantir.gradle.utils.circleciartifacts.ArtifactLocation;
2323
import com.palantir.gradle.utils.circleciartifacts.CircleCiArtifacts;
24+
import com.palantir.logsafe.Unsafe;
2425
import java.io.IOException;
2526
import java.nio.file.Files;
2627
import java.nio.file.Path;
@@ -56,6 +57,7 @@ public final void check() throws IOException {
5657
}
5758
}
5859

60+
@Unsafe
5961
private String errorMessage(String output) {
6062
try {
6163
String artifactPath = "configuration-cache-validation-report/validation-report.txt";

0 commit comments

Comments
 (0)