(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 221735d0456a9245f5c801d749c0ffe4706aa68b Merge: 996952ff55 c4ceb7e7a9 Author: Daniel Roberts AuthorDate: Mon Apr 1 15:45:33 2024 + Merge branch 'main' into elasticity .../java/org/apache/accumulo/core/util/Retry.java | 53 .../org/apache/accumulo/core/util/RetryTest.java | 98 ++ pom.xml| 2 +- .../shell/commands/HistoryCommandTest.java | 11 +-- 4 files changed, 158 insertions(+), 6 deletions(-)
(accumulo) branch elasticity updated (996952ff55 -> 221735d045)
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 996952ff55 Added missing Fate.shutdown in FateOpsCommandsIT (#4428) add 5d741657e7 Add duration based maxRetries option to Retry class (#4337) add 01ccb96472 Fix Illegal Reflective Access Warning in Shell (#4427) add c4ceb7e7a9 Merge branch '2.1' new 221735d045 Merge branch 'main' into elasticity The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/accumulo/core/util/Retry.java | 53 .../org/apache/accumulo/core/util/RetryTest.java | 98 ++ pom.xml| 2 +- .../shell/commands/HistoryCommandTest.java | 11 +-- 4 files changed, 158 insertions(+), 6 deletions(-)
(accumulo) 01/01: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c4ceb7e7a9f183059d753386d6a09cd880f1bb08 Merge: 5d741657e7 01ccb96472 Author: Daniel Roberts AuthorDate: Mon Apr 1 15:25:19 2024 + Merge branch '2.1' pom.xml | 2 +- .../apache/accumulo/shell/commands/HistoryCommandTest.java| 11 ++- 2 files changed, 7 insertions(+), 6 deletions(-)
(accumulo) branch main updated (5d741657e7 -> c4ceb7e7a9)
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git from 5d741657e7 Add duration based maxRetries option to Retry class (#4337) add 01ccb96472 Fix Illegal Reflective Access Warning in Shell (#4427) new c4ceb7e7a9 Merge branch '2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- .../apache/accumulo/shell/commands/HistoryCommandTest.java| 11 ++- 2 files changed, 7 insertions(+), 6 deletions(-)
(accumulo) branch 2.1 updated: Fix Illegal Reflective Access Warning in Shell (#4427)
This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 01ccb96472 Fix Illegal Reflective Access Warning in Shell (#4427)
01ccb96472 is described below
commit 01ccb9647269bbf216043721afa298721dd80699
Author: Daniel Roberts
AuthorDate: Mon Apr 1 10:58:18 2024 -0400
Fix Illegal Reflective Access Warning in Shell (#4427)
Jline 3.24.1 throws an illegal reflective access warning when starting
an accumulo shell using java 11.
Updates jline to use 3.25.1 which includes the fix.
---
pom.xml | 2 +-
.../apache/accumulo/shell/commands/HistoryCommandTest.java| 11 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb747c50a8..fbffd60171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -624,7 +624,7 @@
org.jline
jline
-3.24.1
+3.25.1
org.latencyutils
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
index 4228eaa7e2..6e45768f8f 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.shell.commands;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -38,7 +39,7 @@ import org.jline.reader.LineReaderBuilder;
import org.jline.reader.impl.DefaultExpander;
import org.jline.reader.impl.history.DefaultHistory;
import org.jline.terminal.Terminal;
-import org.jline.terminal.TerminalBuilder;
+import org.jline.terminal.impl.ExternalTerminal;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -69,8 +70,8 @@ public class HistoryCommandTest {
baos = new ByteArrayOutputStream();
String input = String.format("!1%n"); // Construct a platform dependent
new-line
-terminal = TerminalBuilder.builder().system(false)
-.streams(new ByteArrayInputStream(input.getBytes()), baos).build();
+terminal = new ExternalTerminal("shell", "ansi", new
ByteArrayInputStream(input.getBytes()),
+baos, UTF_8);
reader =
LineReaderBuilder.builder().history(history).terminal(terminal).build();
shell = new Shell(reader);
@@ -80,8 +81,8 @@ public class HistoryCommandTest {
public void testCorrectNumbering() throws IOException {
command.execute("", cl, shell);
terminal.writer().flush();
-
-assertTrue(baos.toString().contains("2: bar"));
+assertTrue(baos.toString().contains("2: bar"),
+"History order is not correct: " + baos.toString());
}
@Test
