Skip to content

Commit 315bfcd

Browse files
solrbotjanhoy
solrbot
and
janhoy
authored
Update google.errorprone to v2.41.0 (#3116)
* Adapt errorProne startup args * Add new types to error-prone.gradle Co-authored-by: Jan Høydahl <janhoy@apache.org>
1 parent 01ba4c9 commit 315bfcd

File tree

35 files changed

+190
-179
lines changed

35 files changed

+190
-179
lines changed

‎gradle/java/javac.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ allprojects {
5959
"-Xlint:synchronization",
6060
"-Xlint:text-blocks",
6161
"-proc:none", // proc:none was added because of LOG4J2-1925 / JDK-8186647
62-
"-Xlint:removal"
62+
"-Xlint:removal",
63+
"--should-stop=ifError=FLOW" // error-prone 2.41
6364
]
6465

6566
if (propertyOrDefault("javac.failOnWarnings", true).toBoolean()) {

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ google-cloud-bom = "0.224.0"
9999
google-cloud-core = "2.60.1"
100100
google-cloud-nio = "0.127.3"
101101
google-cloud-storage = "2.27.0"
102-
google-errorprone = "2.31.0"
102+
google-errorprone = "2.41.0"
103103
# @keep for version alignment
104104
google-gson = "2.13.1"
105105
google-guava = "33.4.8-jre"

‎gradle/validation/error-prone.gradle‎

Lines changed: 56 additions & 15 deletions
Large diffs are not rendered by default.

‎solr/api/gradle.lockfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone
2020
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
2121
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
2222
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
23-
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
24-
com.google.errorprone:error_prone_annotations:2.36.0=jarValidation,testCompileClasspath,testRuntimeClasspath
25-
com.google.errorprone:error_prone_annotations:2.40.0=annotationProcessor,errorprone,testAnnotationProcessor
26-
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
27-
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
28-
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
23+
com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
24+
com.google.errorprone:error_prone_annotations:2.41.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
25+
com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
26+
com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
27+
com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
2928
com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3029
com.google.guava:guava:33.4.8-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3130
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

‎solr/api/src/java/org/apache/solr/client/api/util/SolrVersion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ public boolean equals(Object other) {
120120
if (this == other) {
121121
return true;
122122
}
123-
if (!(other instanceof SolrVersion)) {
123+
if (!(other instanceof SolrVersion solrVersion)) {
124124
return false;
125125
}
126-
return compareTo((SolrVersion) other) == 0;
126+
return compareTo(solrVersion) == 0;
127127
}
128128
}

‎solr/benchmark/gradle.lockfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone
1616
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
1717
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
1818
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
19-
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
20-
com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
21-
com.google.errorprone:error_prone_annotations:2.40.0=annotationProcessor,errorprone,testAnnotationProcessor
22-
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
23-
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
24-
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
19+
com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
20+
com.google.errorprone:error_prone_annotations:2.41.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
21+
com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
22+
com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
23+
com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
2524
com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
2625
com.google.guava:guava:33.4.8-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
2726
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error
2020
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
2121
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
2222
com.google.code.findbugs:jsr305:3.0.2=permitUnusedDeclared
23-
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
24-
com.google.errorprone:error_prone_annotations:2.36.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
25-
com.google.errorprone:error_prone_annotations:2.40.0=annotationProcessor,errorprone,testAnnotationProcessor
26-
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
27-
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
28-
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
23+
com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
24+
com.google.errorprone:error_prone_annotations:2.41.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
25+
com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
26+
com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
27+
com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
2928
com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3029
com.google.guava:guava:33.4.8-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3130
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

‎solr/cross-dc-manager/gradle.lockfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,error
2121
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
2222
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
2323
com.google.code.gson:gson:2.13.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
24-
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
25-
com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,solrPlatformLibs,testCompileClasspath
26-
com.google.errorprone:error_prone_annotations:2.40.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
27-
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
28-
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
29-
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
24+
com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
25+
com.google.errorprone:error_prone_annotations:2.41.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
26+
com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
27+
com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor
28+
com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor
3029
com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3130
com.google.guava:guava:33.4.8-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
3231
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

‎solr/licenses/error_prone_annotations-2.36.0.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/error_prone_annotations-2.38.0.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)