(accumulo-testing) branch 2.1 updated: Update accumulo version to 2.1.6 and other fixes (#312)

[ctubbsii]

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

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


The following commit(s) were added to refs/heads/2.1 by this push:
     new 5ac572a  Update accumulo version to 2.1.6 and other fixes (#312)
5ac572a is described below

commit 5ac572af060011191399c1a69150a53997d60a4a
Author: Dom G. <domgargu...@apache.org>
AuthorDate: Tue Jul 21 20:07:02 2026 -0400

    Update accumulo version to 2.1.6 and other fixes (#312)
---
 pom.xml                                                             | 6 +++---
 .../java/org/apache/accumulo/testing/randomwalk/shard/Merge.java    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b187960..29fec54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,15 +24,15 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>31</version>
+    <version>37</version>
   </parent>
   <groupId>org.apache.accumulo</groupId>
   <artifactId>accumulo-testing</artifactId>
-  <version>2.1.4-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <name>Apache Accumulo Testing</name>
   <description>Testing tools for Apache Accumulo</description>
   <properties>
-    <accumulo.version>2.1.4</accumulo.version>
+    <accumulo.version>2.1.6</accumulo.version>
     <!-- prevent introduction of new compiler warnings -->
     <maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
     <maven.compiler.release>11</maven.compiler.release>
diff --git 
a/src/main/java/org/apache/accumulo/testing/randomwalk/shard/Merge.java 
b/src/main/java/org/apache/accumulo/testing/randomwalk/shard/Merge.java
index 6cd69f4..2e8f7ce 100644
--- a/src/main/java/org/apache/accumulo/testing/randomwalk/shard/Merge.java
+++ b/src/main/java/org/apache/accumulo/testing/randomwalk/shard/Merge.java
@@ -39,7 +39,8 @@ public class Merge extends Test {
     log.debug("merging " + indexTableName);
     env.getAccumuloClient().tableOperations().merge(indexTableName, null, 
null);
     org.apache.accumulo.core.util.Merge merge = new 
org.apache.accumulo.core.util.Merge();
-    merge.mergomatic(env.getAccumuloClient(), indexTableName, null, null, 256 
* 1024 * 1024, true);
+    merge.mergomatic(env.getAccumuloClient(), indexTableName, null, null, 256 
* 1024 * 1024, true,
+        false);
     splits = 
env.getAccumuloClient().tableOperations().listSplits(indexTableName);
     if (splits.size() > splitSet.size()) {
       // throw an exception so that test will die and no further changes to 
table will occur...