[accumulo] 01/01: Merge remote-tracking branch 'upstream/2.1'

[edcoleman]

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

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

commit ce3a886c1cf90ff764edd872159cf3c036ff182a
Merge: 1415599a5b 1fd1f797ca
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Fri Oct 6 13:16:56 2023 +0000

    Merge remote-tracking branch 'upstream/2.1'

 .../org/apache/accumulo/test/shell/MockShell.java  | 17 ++----
 .../apache/accumulo/test/shell/ShellServerIT.java  | 68 +++++++++++++---------
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
index 03b6b1c1b2,59805e5118..39da70fcd4
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
@@@ -2113,4 -2294,13 +2120,13 @@@ public class ShellServerIT extends Shar
  
    }
  
+   /**
+    * Generates a string based on a random number that can be used to uniquely 
identify data in shell
+    * output
+    */
+   public String generateNonce() {
+     byte[] r = new byte[16];
 -    random.nextBytes(r);
++    RANDOM.get().nextBytes(r);
+     return new String(Base64.getEncoder().encode(r), UTF_8);
+   }
  }