This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new d31b55ac789 Update dependency
com.google.errorprone:error_prone_annotations to v2.23.0 (#2035)
d31b55ac789 is described below
commit d31b55ac789d71ffa8d067de83b8dd78dcf4e2ad
Author: Solr Bot <125606113+solr...@users.noreply.github.com>
AuthorDate: Tue Oct 24 20:45:45 2023 +0200
Update dependency com.google.errorprone:error_prone_annotations to v2.23.0
(#2035)
* Update dependency com.google.errorprone:error_prone_annotations to v2.23.0
* Use StandardCharsets.UTF_8
---------
Co-authored-by: Kevin Risden <kris...@apache.org>
---
gradle/validation/error-prone.gradle | 5 +++++
solr/core/src/java/org/apache/solr/handler/CatStream.java | 4 +++-
.../java/org/apache/solr/packagemanager/PackageUtils.java | 2 +-
.../org/apache/solr/packagemanager/RepositoryManager.java | 13 ++++++++-----
.../src/java/org/apache/solr/rest/BaseSolrResource.java | 3 ++-
solr/core/src/java/org/apache/solr/rest/RestManager.java | 8 ++------
.../core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 6 +++---
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 3 +--
.../test/org/apache/solr/cloud/CollectionsAPISolrJTest.java | 3 ++-
.../src/test/org/apache/solr/handler/TestRestoreCore.java | 12 +++++++++---
.../org/apache/solr/servlet/DirectSolrConnectionTest.java | 7 ++++++-
solr/licenses/error_prone_annotations-2.22.0.jar.sha1 | 1 -
solr/licenses/error_prone_annotations-2.23.0.jar.sha1 | 1 +
.../hdfs/src/test/org/apache/hadoop/fs/FileUtil.java | 4 ++--
.../hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java | 3 ++-
.../org/apache/solr/client/solrj/io/sql/DriverImpl.java | 3 ++-
.../solr/client/solrj/impl/SolrClientCloudManager.java | 3 ++-
versions.lock | 2 +-
versions.props | 2 +-
19 files changed, 53 insertions(+), 32 deletions(-)
diff --git a/gradle/validation/error-prone.gradle
b/gradle/validation/error-prone.gradle
index d2800242425..de8ee8d1de0 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -305,6 +305,7 @@ allprojects { prj ->
// '-Xep:DoNotMockAutoValue:OFF', // we don't use autovalue
// '-Xep:DoNotUseRuleChain:OFF', // todo could be fixed but not
easy
// '-Xep:DoubleCheckedLocking:OFF', // todo check if useful or
comment why not
+ '-Xep:DuplicateDateFormatField:WARN',
'-Xep:EmptyBlockTag:WARN',
// '-Xep:EmptyCatch:OFF', // todo check if useful or comment why
not - might be handled by ECJ?
// '-Xep:EmptySetMultibindingContributions:OFF', // we don't use
this annotation
@@ -420,6 +421,7 @@ allprojects { prj ->
// '-Xep:NonAtomicVolatileUpdate:OFF', // todo check if useful or
comment why not
'-Xep:NonCanonicalType:WARN',
'-Xep:NonOverridingEquals:WARN',
+ //'-Xep:NonFinalStaticField:WARN', // todo there are problems that
should be fixed
'-Xep:NotJavadoc:WARN',
'-Xep:NullOptional:WARN',
// '-Xep:NullableConstructor:OFF', // we don't use this annotation
@@ -464,7 +466,10 @@ allprojects { prj ->
// '-Xep:StreamResourceLeak:OFF', // todo check if useful or
comment why not
'-Xep:StreamToIterable:WARN',
// '-Xep:StringCaseLocaleUsage:OFF', // we have forbiddenapis for
that
+ '-Xep:StringCharset:WARN',
+ '-Xep:StringFormatWithLiteral:WARN',
// '-Xep:StringSplitter:OFF', // todo check if useful or comment
why not - might be able to use forbidden-apis for this?
+ '-Xep:SuperEqualsIsObjectEquals:WARN',
// '-Xep:SwigMemoryLeak:OFF', // we don't use swig
// '-Xep:SynchronizeOnNonFinalField:OFF', // todo check if useful
or comment why not
// '-Xep:ThreadJoinLoop:OFF', // todo check if useful or comment
why not
diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java
b/solr/core/src/java/org/apache/solr/handler/CatStream.java
index 9c7bda7bc24..70ee2b65242 100644
--- a/solr/core/src/java/org/apache/solr/handler/CatStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java
@@ -196,7 +196,9 @@ public class CatStream extends TupleStream implements
Expressible {
new
GZIPInputStream(Files.newInputStream(currentFilePath.absolutePath)),
StandardCharsets.UTF_8));
} else {
- currentFileLines =
FileUtils.lineIterator(currentFilePath.absolutePath.toFile(), "UTF-8");
+ currentFileLines =
+ FileUtils.lineIterator(
+ currentFilePath.absolutePath.toFile(),
StandardCharsets.UTF_8.name());
}
if (currentFileLines.hasNext()) return true;
}
diff --git
a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
index 9d330b49bb8..c380764a678 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
@@ -179,7 +179,7 @@ public class PackageUtils {
NamedList<Object> response = solrClient.request(request);
String manifestJson = (String) response.get("response");
String calculatedSHA512 =
-
BlobRepository.sha512Digest(ByteBuffer.wrap(manifestJson.getBytes("UTF-8")));
+
BlobRepository.sha512Digest(ByteBuffer.wrap(manifestJson.getBytes(StandardCharsets.UTF_8)));
if (expectedSHA512.equals(calculatedSHA512) == false) {
throw new SolrException(
ErrorCode.UNAUTHORIZED,
diff --git
a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java
b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java
index 8ef29ba5552..1899d8b4786 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java
@@ -26,6 +26,7 @@ import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -122,13 +123,13 @@ public class RepositoryManager {
if (packageManager.zkClient.exists(PackageUtils.REPOSITORIES_ZK_PATH,
true) == false) {
packageManager.zkClient.create(
PackageUtils.REPOSITORIES_ZK_PATH,
- getMapper().writeValueAsString(repos).getBytes("UTF-8"),
+
getMapper().writeValueAsString(repos).getBytes(StandardCharsets.UTF_8),
CreateMode.PERSISTENT,
true);
} else {
packageManager.zkClient.setData(
PackageUtils.REPOSITORIES_ZK_PATH,
- getMapper().writeValueAsString(repos).getBytes("UTF-8"),
+
getMapper().writeValueAsString(repos).getBytes(StandardCharsets.UTF_8),
true);
}
@@ -155,7 +156,8 @@ public class RepositoryManager {
throws UnsupportedEncodingException, KeeperException,
InterruptedException {
if (zkClient.exists(PackageUtils.REPOSITORIES_ZK_PATH, true)) {
return new String(
- zkClient.getData(PackageUtils.REPOSITORIES_ZK_PATH, null, null,
true), "UTF-8");
+ zkClient.getData(PackageUtils.REPOSITORIES_ZK_PATH, null, null,
true),
+ StandardCharsets.UTF_8);
}
return "[]";
}
@@ -191,10 +193,11 @@ public class RepositoryManager {
}
String manifestJson = getMapper().writeValueAsString(release.manifest);
String manifestSHA512 =
-
BlobRepository.sha512Digest(ByteBuffer.wrap(manifestJson.getBytes("UTF-8")));
+ BlobRepository.sha512Digest(
+ ByteBuffer.wrap(manifestJson.getBytes(StandardCharsets.UTF_8)));
PackageUtils.postFile(
solrClient,
- ByteBuffer.wrap(manifestJson.getBytes("UTF-8")),
+ ByteBuffer.wrap(manifestJson.getBytes(StandardCharsets.UTF_8)),
String.format(Locale.ROOT, "/package/%s/%s/%s", packageName,
version, "manifest.json"),
null);
diff --git a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
index cbfa72993b7..0ecb8b4f101 100644
--- a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
+++ b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
@@ -20,6 +20,7 @@ import static org.apache.solr.common.params.CommonParams.JSON;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
@@ -159,6 +160,6 @@ public abstract class BaseSolrResource {
/** Decode URL-encoded strings as UTF-8, and avoid converting "+" to space */
protected static String urlDecode(String str) throws
UnsupportedEncodingException {
- return URLDecoder.decode(str.replace("+", "%2B"), "UTF-8");
+ return URLDecoder.decode(str.replace("+", "%2B"), StandardCharsets.UTF_8);
}
}
diff --git a/solr/core/src/java/org/apache/solr/rest/RestManager.java
b/solr/core/src/java/org/apache/solr/rest/RestManager.java
index 1078168628b..c7f6c053690 100644
--- a/solr/core/src/java/org/apache/solr/rest/RestManager.java
+++ b/solr/core/src/java/org/apache/solr/rest/RestManager.java
@@ -19,10 +19,10 @@ package org.apache.solr.rest;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Reader;
-import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -253,11 +253,7 @@ public class RestManager {
/** Determines the ManagedResource resourceId from the request path. */
public static String resolveResourceId(final String path) {
String resourceId;
- try {
- resourceId = URLDecoder.decode(path, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e); // shouldn't happen
- }
+ resourceId = URLDecoder.decode(path, StandardCharsets.UTF_8);
int at = resourceId.indexOf("/schema");
if (at == -1) {
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index a4d647fec0a..e93c412676e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -37,8 +37,8 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -450,7 +450,7 @@ public class HttpSolrCall {
}
protected void extractRemotePath(String collectionName, String origCorename)
- throws UnsupportedEncodingException, KeeperException,
InterruptedException, SolrException {
+ throws KeeperException, InterruptedException, SolrException {
assert core == null;
coreUrl = getRemoteCoreUrl(collectionName, origCorename);
// don't proxy for internal update requests
@@ -461,7 +461,7 @@ public class HttpSolrCall {
// it does not make sense to send the request to a remote node
throw new SolrException(
SolrException.ErrorCode.INVALID_STATE,
- new String(Utils.toJSON(invalidStates),
org.apache.lucene.util.IOUtils.UTF_8));
+ new String(Utils.toJSON(invalidStates), StandardCharsets.UTF_8));
}
action = REMOTEQUERY;
} else {
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 0b008a43d74..255f0489af4 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -27,7 +27,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.lang.invoke.MethodHandles;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -999,7 +998,7 @@ public class UpdateLog implements PluginInfoInitialized,
SolrMetricProducer {
entry
+ " is not a partial doc"
+ ", while looking for id="
- + new String(id.bytes, Charset.forName("UTF-8")));
+ + new String(id.bytes, StandardCharsets.UTF_8));
}
// This update is an inplace update, get the partial doc. The input doc
is always at last
// position.
diff --git
a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 4877b27aee6..9eabee8a970 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -24,6 +24,7 @@ import static
org.apache.solr.common.params.CollectionAdminParams.DEFAULTS;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -585,7 +586,7 @@ public class CollectionsAPISolrJTest extends
SolrCloudTestCase {
cluster.waitForActiveCollection(collectionName, 2, 4);
SolrClient client = cluster.getSolrClient();
- byte[] binData = collectionName.getBytes("UTF-8");
+ byte[] binData = collectionName.getBytes(StandardCharsets.UTF_8);
// index some docs
for (int i = 0; i < 10; i++) {
SolrInputDocument doc = new SolrInputDocument();
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
index b46bbfb6ff6..593f0af7bd9 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -128,7 +129,7 @@ public class TestRestoreCore extends SolrJettyTestBase {
.getCoreContainer()
.getAllowPaths()
.add(Path.of(location)); // Allow core to be created outside
SOLR_HOME
- params += "&location=" + URLEncoder.encode(location, "UTF-8");
+ params += "&location=" + URLEncoder.encode(location,
StandardCharsets.UTF_8);
}
// named snapshot vs default snapshot name
@@ -188,7 +189,8 @@ public class TestRestoreCore extends SolrJettyTestBase {
public void testBackupFailsMissingAllowPaths() throws Exception {
final String params =
- "&location=" +
URLEncoder.encode(createTempDir().toFile().getAbsolutePath(), "UTF-8");
+ "&location="
+ + URLEncoder.encode(createTempDir().toFile().getAbsolutePath(),
StandardCharsets.UTF_8);
Throwable t =
expectThrows(
IOException.class,
@@ -207,7 +209,11 @@ public class TestRestoreCore extends SolrJettyTestBase {
String location = createTempDir().toFile().getAbsolutePath();
leaderJetty.getCoreContainer().getAllowPaths().add(Path.of(location));
String snapshotName = TestUtil.randomSimpleString(random(), 1, 5);
- String params = "&name=" + snapshotName + "&location=" +
URLEncoder.encode(location, "UTF-8");
+ String params =
+ "&name="
+ + snapshotName
+ + "&location="
+ + URLEncoder.encode(location, StandardCharsets.UTF_8);
String baseUrl = leaderJetty.getBaseUrl().toString();
TestReplicationHandlerBackup.runBackupCommand(
diff --git
a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
index 33c04688009..8166578f8e2 100644
--- a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
@@ -17,6 +17,7 @@
package org.apache.solr.servlet;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.junit.BeforeClass;
@@ -65,7 +66,11 @@ public class DirectSolrConnectionTest extends SolrTestCaseJ4
{
// Test using the Stream body parameter
for (String cmd : cmds) {
direct.request(
- "/update?" + CommonParams.STREAM_BODY + "=" + URLEncoder.encode(cmd,
"UTF-8"), null);
+ "/update?"
+ + CommonParams.STREAM_BODY
+ + "="
+ + URLEncoder.encode(cmd, StandardCharsets.UTF_8),
+ null);
}
String got = direct.request(getIt, null);
assertTrue(got.indexOf(value) > 0);
diff --git a/solr/licenses/error_prone_annotations-2.22.0.jar.sha1
b/solr/licenses/error_prone_annotations-2.22.0.jar.sha1
deleted file mode 100644
index a0a78a421a9..00000000000
--- a/solr/licenses/error_prone_annotations-2.22.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bfb9e4281a4cea34f0ec85b3acd47621cfab35b4
diff --git a/solr/licenses/error_prone_annotations-2.23.0.jar.sha1
b/solr/licenses/error_prone_annotations-2.23.0.jar.sha1
new file mode 100644
index 00000000000..4e95d96af0c
--- /dev/null
+++ b/solr/licenses/error_prone_annotations-2.23.0.jar.sha1
@@ -0,0 +1 @@
+43a27853b6c7d54893e0b1997c2c778c347179eb
diff --git a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
index f9a8717c1c7..29c08364fe3 100644
--- a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
+++ b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java
@@ -736,7 +736,7 @@ public class FileUtil {
try (BufferedReader reader =
new BufferedReader(
new InputStreamReader(process.getInputStream(),
- Charset.forName("UTF-8")))) {
+ StandardCharsets.UTF_8))) {
String line;
while((line = reader.readLine()) != null) {
LOG.debug(line);
@@ -759,7 +759,7 @@ public class FileUtil {
try (BufferedReader reader =
new BufferedReader(
new InputStreamReader(process.getErrorStream(),
- Charset.forName("UTF-8")))) {
+ StandardCharsets.UTF_8))) {
String line;
while((line = reader.readLine()) != null) {
LOG.debug(line);
diff --git
a/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
b/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
index 3961fc29641..26536002d27 100644
---
a/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
+++
b/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
@@ -55,6 +55,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -497,7 +498,7 @@ public class BlockPoolSlice {
File.pathSeparator + "." + file.getName() + ".restart");
Scanner sc = null;
try {
- sc = new Scanner(restartMeta, "UTF-8");
+ sc = new Scanner(restartMeta, StandardCharsets.UTF_8);
// The restart meta file exists
if (sc.hasNextLong() && (sc.nextLong() > timer.now())) {
// It didn't expire. Load the replica as a RBW.
diff --git
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
index 47366bb02dc..3509b54abd1 100644
---
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
+++
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.io.sql;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -124,7 +125,7 @@ public class DriverImpl implements Driver {
}
private void loadParams(URI uri, Properties props) throws SQLException {
- List<NameValuePair> parsedParams = URLEncodedUtils.parse(uri, "UTF-8");
+ List<NameValuePair> parsedParams = URLEncodedUtils.parse(uri,
StandardCharsets.UTF_8);
for (NameValuePair pair : parsedParams) {
if (pair.getValue() != null) {
props.put(pair.getName(), pair.getValue());
diff --git
a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientCloudManager.java
b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientCloudManager.java
index b7645a9a671..626a917e7ed 100644
---
a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientCloudManager.java
+++
b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientCloudManager.java
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.impl;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -139,7 +140,7 @@ public class SolrClientCloudManager implements
SolrCloudManager {
final HttpRequestBase req;
HttpEntity entity = null;
if (payload != null) {
- entity = new StringEntity(payload, "UTF-8");
+ entity = new StringEntity(payload, StandardCharsets.UTF_8);
}
switch (method) {
case GET:
diff --git a/versions.lock b/versions.lock
index 40b972f5339..98e2d7365b7 100644
--- a/versions.lock
+++ b/versions.lock
@@ -42,7 +42,7 @@ com.google.cloud:google-cloud-core-grpc:2.23.0 (1
constraints: 1b1002a6)
com.google.cloud:google-cloud-core-http:2.23.0 (1 constraints: 1b1002a6)
com.google.cloud:google-cloud-storage:2.27.0 (2 constraints: d71c8a27)
com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)
-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: b286c424)
+com.google.errorprone:error_prone_annotations:2.23.0 (11 constraints: b286c424)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:32.1.3-jre (26 constraints: 417ba570)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2
constraints: 4b35b0a0)
diff --git a/versions.props b/versions.props
index 88a579658a5..775683e91e3 100644
--- a/versions.props
+++ b/versions.props
@@ -10,7 +10,7 @@ com.github.ben-manes.caffeine:caffeine=3.1.8
com.github.spotbugs:*=4.8.0
com.github.stephenc.jcip:jcip-annotations=1.0-1
com.google.cloud:google-cloud-bom=0.204.0
-com.google.errorprone:*=2.22.0
+com.google.errorprone:*=2.23.0
com.google.guava:guava=32.1.3-jre
com.google.re2j:re2j=1.7
com.jayway.jsonpath:json-path=2.8.0
