From 25689c4f6894ecdbf6c3bf4beff8ba0a54219af7 Mon Sep 17 00:00:00 2001
From: Dom Garguilo <domgarguilo@apache.org>
Date: Tue, 2 Jun 2026 12:32:39 -0400
Subject: [PATCH 1/5] Update parent, java versions. remove maven min

Align the parent pom version with main accumulo repo (37)
Align java build version min with main accumulo repo (21)
Remove min maven version since its updated in the parent pom as of parent pom v36
---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad6d9739..e055a8f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>31</version>
+    <version>37</version>
   </parent>
   <groupId>org.apache.accumulo</groupId>
   <artifactId>accumulo-testing</artifactId>
@@ -43,8 +43,7 @@
     <maven.site.skip>true</maven.site.skip>
     <!-- versions-maven-plugin ignore patterns for snapshots, alpha, beta, milestones, and release candidates -->
     <maven.version.ignore>.+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+</maven.version.ignore>
-    <minimalJavaBuildVersion>17</minimalJavaBuildVersion>
-    <minimalMavenBuildVersion>3.9</minimalMavenBuildVersion>
+    <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
     <!-- timestamp for reproducible outputs, updated on release by the release plugin -->
     <project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
   </properties>

From ad19ff63afc85a578086242a1529234a9cc32040 Mon Sep 17 00:00:00 2001
From: Dom Garguilo <domgarguilo@apache.org>
Date: Tue, 2 Jun 2026 13:09:57 -0400
Subject: [PATCH 2/5] bump deps to match main accumulo repo

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index e055a8f6..3bfdb434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,12 +127,12 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>2.16.1</version>
+          <version>2.21.0</version>
         </plugin>
         <plugin>
           <groupId>com.mycila</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>4.3</version>
+          <version>5.0.0</version>
           <configuration>
             <licenseSets>
               <licenseSet>
@@ -195,7 +195,7 @@
         <plugin>
           <groupId>com.github.ekryd.sortpom</groupId>
           <artifactId>sortpom-maven-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>4.0.0</version>
           <configuration>
             <createBackupFile>false</createBackupFile>
             <expandEmptyElements>false</expandEmptyElements>
@@ -212,7 +212,7 @@
         <plugin>
           <groupId>net.revelc.code.formatter</groupId>
           <artifactId>formatter-maven-plugin</artifactId>
-          <version>2.23.0</version>
+          <version>2.29.0</version>
           <configuration>
             <configFile>src/build/eclipse-codestyle.xml</configFile>
             <lineEnding>LF</lineEnding>
@@ -226,7 +226,7 @@
         <plugin>
           <groupId>net.revelc.code</groupId>
           <artifactId>impsort-maven-plugin</artifactId>
-          <version>1.9.0</version>
+          <version>1.13.0</version>
           <configuration>
             <removeUnused>true</removeUnused>
             <groups>java.,javax.,jakarta.,org.,com.</groups>

From 8d38e307254e55aa37e02c1df541ae88ea15b205 Mon Sep 17 00:00:00 2001
From: Dom Garguilo <domgarguilo@apache.org>
Date: Tue, 2 Jun 2026 13:16:36 -0400
Subject: [PATCH 3/5] replace deprecated prop

---
 .../apache/accumulo/testing/randomwalk/concurrent/Config.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
index c6978519..901e8e96 100644
--- a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
+++ b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
@@ -75,7 +75,7 @@ static Setting s(Property property, long min, long max) {
 			s(Property.TSERV_THREADCHECK, 100, 10000),
 			s(Property.TSERV_MINTHREADS, 1, 100),
 			s(Property.TSERV_SESSION_MAXIDLE, 100, 5 * 60 * 1000),
-			s(Property.TSERV_WAL_SORT_BUFFER_SIZE, 1024 * 1024, 1024 * 1024 * 1024L),
+			s(Property.GENERAL_SERVER_WAL_SORT_BUFFER_SIZE, 1024 * 1024, 1024 * 1024 * 1024L),
 			s(Property.TSERV_WAL_BLOCKSIZE, 1024 * 1024,1024 * 1024 * 1024 * 10L),
 			s(Property.MANAGER_BULK_TIMEOUT, 10, 600),
 			s(Property.MANAGER_RECOVERY_DELAY, 0, 100),

From 610331b2efabb934ecf68ef0d29b6b93004e5709 Mon Sep 17 00:00:00 2001
From: Dom Garguilo <domgarguilo@apache.org>
Date: Tue, 2 Jun 2026 13:34:30 -0400
Subject: [PATCH 4/5] Add block to pull snapshots to pom

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3bfdb434..39d857f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,19 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+    </repository>
+  </repositories>
   <build>
     <pluginManagement>
       <plugins>

From 34d6bf9d8ee6af50dff893a150f6444a9e4fc968 Mon Sep 17 00:00:00 2001
From: Dom Garguilo <domgarguilo@apache.org>
Date: Tue, 2 Jun 2026 13:39:16 -0400
Subject: [PATCH 5/5] Update GitHub Actions to align with main accumulo repo

---
 .github/workflows/maven.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index abe01cc1..32f0cb3e 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -38,12 +38,12 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v6
+    - name: Set up JDK 21
+      uses: actions/setup-java@v5
       with:
         distribution: adopt
-        java-version: 17
+        java-version: 21
         cache: 'maven'
     - name: Build with Maven (${{ matrix.profile.name }})
       run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }}
@@ -51,21 +51,21 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: surefire-reports-${{ matrix.profile.name }}
         path: ./**/target/surefire-reports/
         if-no-files-found: ignore
     - name: Upload integration test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: failsafe-reports-${{ matrix.profile.name }}
         path: ./**/target/failsafe-reports/
         if-no-files-found: ignore
     - name: Upload mini test logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mini-tests-logs-${{ matrix.profile.name }}
         path: ./**/target/**/mini-tests/**/logs/