Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16050: Upgrade to errorprone 2.11.0

Kevin Risdenff81fea8d53e
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index c6c412a3503..b66da215ace 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -64,6 +64,7 @@ allprojects { prj ->
'-Xep:ComparableType:OFF', // SolrTestCaseJ4.Doc and Fld are messy
'-Xep:AlmostJavadoc:OFF',
+ '-Xep:AlreadyChecked:OFF',
'-Xep:AmbiguousMethodReference:OFF',
'-Xep:ArgumentSelectionDefectChecker:OFF',
'-Xep:ArrayEquals:OFF',
@@ -104,9 +105,9 @@ allprojects { prj ->
'-Xep:MissingSummary:OFF',
'-Xep:MixedMutabilityReturnType:OFF',
'-Xep:ModifiedButNotUsed:OFF',
- '-Xep:MutableConstantField:OFF',
'-Xep:MutablePublicArray:OFF',
'-Xep:NarrowingCompoundAssignment:OFF',
+ '-Xep:NegativeCharLiteral:OFF',
'-Xep:NonAtomicVolatileUpdate:OFF',
'-Xep:NonCanonicalType:OFF',
'-Xep:ObjectToString:OFF',
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b519bad345e..5a78e23ffe2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -63,6 +63,8 @@ Build
---------------------
* SOLR-16053: Upgrade scriptDepVersions (Kevin Risden)
+* SOLR-16050: Upgrade to errorprone 2.11.0 (Kevin Risden)
+
================== 9.0.0 ==================
New Features
diff --git a/solr/licenses/error_prone_annotations-2.10.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.10.0.jar.sha1
deleted file mode 100644
index 6e07a544ad0..00000000000
--- a/solr/licenses/error_prone_annotations-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9bc20b94d3ac42489cf6ce1e42509c86f6f861a1
diff --git a/solr/licenses/error_prone_annotations-2.11.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.11.0.jar.sha1
new file mode 100644
index 00000000000..3300195ded6
--- /dev/null
+++ b/solr/licenses/error_prone_annotations-2.11.0.jar.sha1
@@ -0,0 +1 @@
+c5a0ace696d3f8b1c1d8cc036d8c03cc0cbe6b69
diff --git a/versions.lock b/versions.lock
index 1821637e527..3efc1fe97cb 100644
--- a/versions.lock
+++ b/versions.lock
@@ -33,7 +33,7 @@ com.google.cloud:google-cloud-core:2.3.5 (3 constraints: ba2ee5dd)
com.google.cloud:google-cloud-core-http:2.3.5 (1 constraints: ee0fe795)
com.google.cloud:google-cloud-storage:2.2.3 (2 constraints: 6e1c99f3)
com.google.code.gson:gson:2.8.9 (6 constraints: f25833c8)
-com.google.errorprone:error_prone_annotations:2.10.0 (4 constraints: 3038d4ba)
+com.google.errorprone:error_prone_annotations:2.11.0 (4 constraints: 3038d4ba)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:31.0.1-jre (17 constraints: 850e5ccb)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
diff --git a/versions.props b/versions.props
index 6b0f66917c0..6a3fb96ae86 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.github.ben-manes.caffeine:caffeine=3.0.5
com.github.spotbugs:*=4.5.3
com.github.zafarkhaja:java-semver=0.9.0
com.google.cloud:google-cloud-bom=0.166.0
-com.google.errorprone:*=2.10.0
+com.google.errorprone:*=2.11.0
com.google.guava:guava=31.0.1-jre
com.google.re2j:re2j=1.2
com.jayway.jsonpath:json-path=2.4.0