[accumulo] 01/01: Merge branch '2.1'

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 19b4c508bf316671af4158d46d49b29eed9caf48
Merge: b9fdbc3beb 84d034589d
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Sep 28 20:03:47 2023 -0400

    Merge branch '2.1'

 .../rpc/ProtocolOverridingSSLSocketFactory.java    | 111 ---------------------
 .../accumulo/core/rpc/SslConnectionParams.java     |  20 +---
 .../org/apache/accumulo/core/rpc/ThriftUtil.java   | 108 +-------------------
 .../apache/accumulo/server/rpc/TServerUtils.java   |   2 +-
 4 files changed, 8 insertions(+), 233 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
index 5be5ce82aa,6924b4c862..dd44653dd3
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
@@@ -18,14 -18,11 +18,12 @@@
   */
  package org.apache.accumulo.core.rpc;
  
 +import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
 +
- import java.io.FileInputStream;
  import java.io.IOException;
  import java.io.UncheckedIOException;
  import java.net.InetAddress;
  import java.nio.channels.ClosedByInterruptException;
- import java.security.KeyStore;
 -import java.security.SecureRandom;
  import java.util.HashMap;
  import java.util.Map;
  
@@@ -52,10 -44,6 +44,8 @@@ import org.apache.thrift.transport.TTra
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 +import com.google.common.net.HostAndPort;
 +
- import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
- 
  /**
   * Factory methods for creating Thrift client objects
   */