Skip to content

Commit 7c1c864

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent 9fe1dad commit 7c1c864

File tree

7 files changed

+18
-15
lines changed

7 files changed

+18
-15
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<property name="max" value="120"/>
4646
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
4747
</module>
48+
<module name="SuppressWithPlainTextCommentFilter"> <!-- Suppression to prevent LineLength Check from flagging lines in Text-blocks -->
49+
<property name="checkFormat" value="LineLength"/>
50+
<property name="offCommentFormat" value="^.*&quot;&quot;&quot;\s*$"/>
51+
<property name="onCommentFormat" value="^\s*&quot;&quot;&quot;\s*(?:[,;]|.+)$"/>
52+
</module>
4853
<module name="TreeWalker">
4954
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
5055
<module name="SuppressionCommentFilter">
@@ -173,6 +178,7 @@
173178
</module>
174179
<module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
175180
<property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
181+
<message key="illegal.type" value="Usage of type ''{0}'' is not allowed to limit coupling on concrete classes. For example, prefer Multimap over HashMultimap, List over ArrayList, and Set over TreeSet."/>
176182
</module>
177183
<module name="IllegalType">
178184
<property name="id" value="BanGuavaCaches"/>
@@ -292,14 +298,6 @@
292298
<property name="format" value="ImmutableSet\.Builder.*new ImmutableSet\.Builder"/>
293299
<property name="message" value="Use ImmutableSet.builder() for variable assignment."/>
294300
</module>
295-
<module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
296-
<property name="format" value="Preconditions\.checkNotNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
297-
<property name="message" value="Use Preconditions.checkNotNull(Object, String)."/>
298-
</module>
299-
<module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
300-
<property name="format" value="Validate\.notNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
301-
<property name="message" value="Use Validate.notNull(Object, String)."/>
302-
</module>
303301
<module name="RegexpSinglelineJava">
304302
<property name="format" value="^\s*super\(\);"/>
305303
<property name="message" value="This is unnecessary; please delete."/>
@@ -414,7 +412,9 @@
414412
<property name="allowMissingReturnTag" value="true"/>
415413
<property name="allowedAnnotations" value="Override, Test"/>
416414
</module>
417-
<module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
415+
<module name="JavadocStyle"><!-- Java Style Guide: Javadoc -->
416+
<property name="checkFirstSentence" value="false"/>
417+
</module>
418418
<module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
419419
<property name="offset" value="0"/>
420420
</module>
@@ -439,9 +439,6 @@
439439
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
440440
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
441441
</module>
442-
<module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
443-
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
444-
</module>
445442

446443
<!-- Stricter checks end -->
447444
</module>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.72.0'
1313
classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.15.0'
1414
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.2.0'
15-
classpath 'com.palantir.baseline:gradle-baseline-java:6.16.0'
15+
classpath 'com.palantir.baseline:gradle-baseline-java:6.66.0'
1616
classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.1.0'
1717
classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.7.0'
1818
classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'

docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/DockerContainerInfoUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ private DockerContainerInfoUtils() {
5050
// Utility class
5151
}
5252

53+
@SuppressWarnings("for-rollout:deprecation")
5354
public static List<String> getAllNamesForContainerId(DockerExecutable docker, String containerId) {
5455
try {
5556
String labelsFormat = StreamEx.of(DOCKER_NAME_LABELS)

docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/DockerProxyManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void after() {
103103
dockerComposeRule.after();
104104
}
105105

106+
@SuppressWarnings("for-rollout:deprecation")
106107
private static File getDockerComposeFile(String networkName, String imageName) {
107108
try {
108109
File proxyFile = File.createTempFile("proxy", ".yml");

docker-proxy-rule-core/src/test/java/com/palantir/docker/proxy/DockerProxySelectorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ private static Cluster setupProxyContainer() {
134134
.build();
135135
}
136136

137+
@SuppressWarnings("for-rollout:deprecation")
137138
private static URI createUriUnsafe(String uriString) {
138139
try {
139140
return new URI(uriString);

versions.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ one.util:streamex:0.8.1 (2 constraints: cd1a403c)
7070

7171
org.apache.commons:commons-lang3:3.7 (1 constraints: 661571a7)
7272

73-
org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac)
73+
org.apiguardian:apiguardian-api:1.1.2 (6 constraints: 5366ce6e)
7474

7575
org.awaitility:awaitility:4.0.2 (1 constraints: c015bbd2)
7676

@@ -108,7 +108,9 @@ org.junit.jupiter:junit-jupiter-engine:5.8.2 (1 constraints: 0c0edf3b)
108108

109109
org.junit.jupiter:junit-jupiter-params:5.8.2 (1 constraints: 0c0edf3b)
110110

111-
org.junit.platform:junit-platform-engine:1.8.2 (1 constraints: ab1027b4)
111+
org.junit.platform:junit-platform-engine:1.8.2 (2 constraints: f522a808)
112+
113+
org.junit.platform:junit-platform-launcher:1.8.2 (1 constraints: 0d050a36)
112114

113115
org.mockito:mockito-core:4.4.0 (2 constraints: f11021d5)
114116

versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ junit:junit = 4.13.2
66
one.util:streamex = 0.8.1
77
org.assertj:assertj-core = 3.22.0
88
org.junit.jupiter:* = 5.8.2
9+
org.junit.platform:* = 1.8.2
910
org.mockito:* = 4.4.0
1011
org.hamcrest:* = 2.1
1112
net.bytebuddy:* = 1.14.11

0 commit comments

Comments
 (0)