Skip to content

Excavator: Upgrades Baseline to the latest version #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svc-excavator-bot wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −5
Open

Excavator: Upgrades Baseline to the latest version #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .baseline/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
<property name="max" value="120"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
</module>
<module name="SuppressWithPlainTextCommentFilter"> <!-- Suppression to prevent LineLength Check from flagging lines in Text-blocks -->
<property name="checkFormat" value="LineLength"/>
<property name="offCommentFormat" value="^.*&quot;&quot;&quot;\s*$"/>
<property name="onCommentFormat" value="^\s*&quot;&quot;&quot;\s*(?:[,;]|.+)$"/>
</module>
<module name="TreeWalker">
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
<module name="SuppressionCommentFilter">
Expand Down Expand Up @@ -407,7 +412,9 @@
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
</module>
<module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
<module name="JavadocStyle"><!-- Java Style Guide: Javadoc -->
<property name="checkFirstSentence" value="false"/>
</module>
<module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
<property name="offset" value="0"/>
</module>
Expand All @@ -432,9 +439,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="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
</module>

<!-- Stricter checks end -->
</module>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.83.0'
classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.26.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.7.0'
classpath 'com.palantir.baseline:gradle-baseline-java:6.54.0'
classpath 'com.palantir.baseline:gradle-baseline-java:6.81.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.2.0'
classpath 'com.palantir.gradle.guide:gradle-guide:1.13.0'
classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'
Expand Down
2 changes: 2 additions & 0 deletions ...va/com/palantir/gradle/configcache/incremental/ValidateConfigurationCacheEnabledTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.palantir.gradle.configcache.incremental.RunResult.Failure;
import com.palantir.gradle.utils.circleciartifacts.ArtifactLocation;
import com.palantir.gradle.utils.circleciartifacts.CircleCiArtifacts;
import com.palantir.logsafe.Unsafe;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -56,6 +57,7 @@ public final void check() throws IOException {
}
}

@Unsafe
private String errorMessage(String output) {
try {
String artifactPath = "configuration-cache-validation-report/validation-report.txt";
Expand Down