You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/12/08 15:06:18 UTC
[solr] 02/03: SOLR-16578: Upgrade to errorprone 2.16
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 591f06ba0e778e13ac7ee03d3d114549bfec788d
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Dec 7 14:31:13 2022 -0500
SOLR-16578: Upgrade to errorprone 2.16
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/backup/BackupManager.java | 2 +-
solr/licenses/error_prone_annotations-2.15.0.jar.sha1 | 1 -
solr/licenses/error_prone_annotations-2.16.jar.sha1 | 1 +
versions.lock | 2 +-
versions.props | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e1bbe77f93d..73748ccd87e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -112,6 +112,8 @@ Build
* SOLR-16508: Upgrade gradle wrapper to 7.6 (Kevin Risden)
+* SOLR-16578: Upgrade to errorprone 2.16 (Kevin Risden)
+
Other Changes
---------------------
* SOLR-16545: Upgrade Carrot2 to 4.5.0 (Dawid Weiss)
diff --git a/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java b/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
index 647886bca6a..faae2b9a70c 100644
--- a/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
+++ b/solr/core/src/java/org/apache/solr/core/backup/BackupManager.java
@@ -252,7 +252,7 @@ public class BackupManager {
String sourceConfigName, String targetConfigName, ConfigSetService configSetService)
throws IOException {
URI source = repository.resolveDirectory(getZkStateDir(), CONFIG_STATE_DIR, sourceConfigName);
- Preconditions.checkState(repository.exists(source), "Path {} does not exist", source);
+ Preconditions.checkState(repository.exists(source), "Path %s does not exist", source);
uploadConfigToSolrCloud(configSetService, source, targetConfigName, "");
}
diff --git a/solr/licenses/error_prone_annotations-2.15.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.15.0.jar.sha1
deleted file mode 100644
index 1d051d4a495..00000000000
--- a/solr/licenses/error_prone_annotations-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38c8485a652f808c8c149150da4e5c2b0bd17f9a
diff --git a/solr/licenses/error_prone_annotations-2.16.jar.sha1 b/solr/licenses/error_prone_annotations-2.16.jar.sha1
new file mode 100644
index 00000000000..26d24ce352b
--- /dev/null
+++ b/solr/licenses/error_prone_annotations-2.16.jar.sha1
@@ -0,0 +1 @@
+3fdb501b45ba22c6e9c0f2abdb6ed747a48c71af
diff --git a/versions.lock b/versions.lock
index 85d429cb1e2..21906099add 100644
--- a/versions.lock
+++ b/versions.lock
@@ -34,7 +34,7 @@ com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
com.google.code.gson:gson:2.9.1 (6 constraints: d958afbf)
-com.google.errorprone:error_prone_annotations:2.15.0 (4 constraints: 8a38f11d)
+com.google.errorprone:error_prone_annotations:2.16 (4 constraints: 8a38f11d)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:31.1-jre (19 constraints: 5d28985f)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
diff --git a/versions.props b/versions.props
index 431c8fe086a..f96f92f1749 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.fasterxml.woodstox:woodstox-core=6.4.0
com.github.ben-manes.caffeine:caffeine=3.1.1
com.github.spotbugs:*=4.7.2
com.google.cloud:google-cloud-bom=0.178.0
-com.google.errorprone:*=2.15.0
+com.google.errorprone:*=2.16
com.google.guava:guava=31.1-jre
com.google.re2j:re2j=1.2
com.jayway.jsonpath:json-path=2.7.0