Skip to content

Commit 319b41d

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent 01b4c5d commit 319b41d

File tree

4 files changed

+59
-6
lines changed

4 files changed

+59
-6
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 8 additions & 4 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">
@@ -407,7 +412,9 @@
407412
<property name="allowMissingReturnTag" value="true"/>
408413
<property name="allowedAnnotations" value="Override, Test"/>
409414
</module>
410-
<module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
415+
<module name="JavadocStyle"><!-- Java Style Guide: Javadoc -->
416+
<property name="checkFirstSentence" value="false"/>
417+
</module>
411418
<module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
412419
<property name="offset" value="0"/>
413420
</module>
@@ -432,9 +439,6 @@
432439
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
433440
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
434441
</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>
438442

439443
<!-- Stricter checks end -->
440444
</module>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.81.0'
1414
classpath 'org.revapi:gradle-revapi:1.8.0'
1515
classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
16-
classpath 'com.palantir.baseline:gradle-baseline-java:6.60.0'
16+
classpath 'com.palantir.baseline:gradle-baseline-java:6.66.0'
1717
classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.1.0'
1818
classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.7.0'
1919
classpath 'com.palantir.metricschema:gradle-metric-schema:0.33.0'

conjure-java-jaxrs-client/src/test/java/com/palantir/conjure/java/client/jaxrs/JaxRsClientConfigRefreshTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void testConfigRefresh() throws Exception {
4545
ClientConfiguration config2 = createTestConfig("http://localhost:" + server2.getPort());
4646

4747
Refreshable<ClientConfiguration> refreshableConfig = Refreshable.of(config1);
48-
@SuppressWarnings("for-rollout:deprecation")
4948
TestService proxy = JaxRsClient.create(
5049
TestService.class, UserAgents.tryParse("agent"), new HostMetricsRegistry(), refreshableConfig);
5150

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Danger! Multiple jars contain identically named classes. This may cause different behaviour depending on classpath ordering.
2+
# Run ./gradlew checkClassUniqueness --fix to update this file
3+
4+
## runtimeClasspath
5+
[javax.el:javax.el-api, org.glassfish:jakarta.el]
6+
- javax.el.ArrayELResolver
7+
- javax.el.BeanELResolver
8+
- javax.el.BeanELResolver$1
9+
- javax.el.BeanELResolver$BPSoftReference
10+
- javax.el.BeanELResolver$BeanProperties
11+
- javax.el.BeanELResolver$BeanProperty
12+
- javax.el.BeanELResolver$SoftConcurrentHashMap
13+
- javax.el.BeanNameELResolver
14+
- javax.el.BeanNameResolver
15+
- javax.el.CompositeELResolver
16+
- javax.el.CompositeELResolver$CompositeIterator
17+
- javax.el.ELClass
18+
- javax.el.ELContext
19+
- javax.el.ELContextEvent
20+
- javax.el.ELException
21+
- javax.el.ELManager
22+
- javax.el.ELProcessor
23+
- javax.el.ELResolver
24+
- javax.el.ELUtil
25+
- javax.el.ELUtil$1
26+
- javax.el.EvaluationListener
27+
- javax.el.Expression
28+
- javax.el.ExpressionFactory
29+
- javax.el.FactoryFinder
30+
- javax.el.FunctionMapper
31+
- javax.el.ImportHandler
32+
- javax.el.LambdaExpression
33+
- javax.el.ListELResolver
34+
- javax.el.MapELResolver
35+
- javax.el.MethodExpression
36+
- javax.el.MethodInfo
37+
- javax.el.MethodNotFoundException
38+
- javax.el.PropertyNotFoundException
39+
- javax.el.PropertyNotWritableException
40+
- javax.el.ResourceBundleELResolver
41+
- javax.el.StandardELContext
42+
- javax.el.StandardELContext$1
43+
- javax.el.StandardELContext$DefaultFunctionMapper
44+
- javax.el.StandardELContext$DefaultVariableMapper
45+
- javax.el.StandardELContext$LocalBeanNameResolver
46+
- javax.el.StaticFieldELResolver
47+
- javax.el.TypeConverter
48+
- javax.el.ValueExpression
49+
- javax.el.ValueReference
50+
- javax.el.VariableMapper

0 commit comments

Comments
 (0)