From bbdcf80030c24598726c5f641d91d08819955237 Mon Sep 17 00:00:00 2001
From: Dave Marion <dlmarion@apache.org>
Date: Mon, 22 Jun 2026 16:29:19 +0000
Subject: [PATCH] Changed required Java runtime version from 17 to 21.

This change also changes references to Thread.getId() to
Thread.threadId() due to deprecation.
---
 .../main/java/org/apache/accumulo/core/fate/FateExecutor.java | 2 +-
 .../org/apache/accumulo/core/trace/ScanInstrumentation.java   | 4 ++--
 .../java/org/apache/accumulo/core/util/threads/Threads.java   | 2 +-
 pom.xml                                                       | 2 +-
 .../server/metadata/AsyncConditionalTabletsMutatorImpl.java   | 2 +-
 .../main/java/org/apache/accumulo/tserver/scan/ScanTask.java  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/fate/FateExecutor.java b/core/src/main/java/org/apache/accumulo/core/fate/FateExecutor.java
index de4bf9c9953..d8d788367cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/FateExecutor.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/FateExecutor.java
@@ -434,7 +434,7 @@ private boolean isInterruptedException(Throwable e) {
     public void run() {
       runnerLog.trace("A TransactionRunner is starting for {} {} ", fate.getStore().type(),
           fateOps);
-      threadId = Thread.currentThread().getId();
+      threadId = Thread.currentThread().threadId();
       try {
         while (fate.getKeepRunning().get() && !isShutdown() && !stop.get()) {
           FateTxStore<T> txStore = null;
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/ScanInstrumentation.java b/core/src/main/java/org/apache/accumulo/core/trace/ScanInstrumentation.java
index 8ed962c53a8..c0412d57cea 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/ScanInstrumentation.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/ScanInstrumentation.java
@@ -85,9 +85,9 @@ public interface ScanScope extends AutoCloseable {
   public static ScanScope enable(Span span) {
     if (span.isRecording()) {
       INSTRUMENTED_SCANS.set(new ScanInstrumentationImpl());
-      var id = Thread.currentThread().getId();
+      var id = Thread.currentThread().threadId();
       return () -> {
-        Preconditions.checkState(id == Thread.currentThread().getId());
+        Preconditions.checkState(id == Thread.currentThread().threadId());
         INSTRUMENTED_SCANS.remove();
       };
     } else {
diff --git a/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java b/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java
index 1407671a13c..a0739fdc2aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java
@@ -95,7 +95,7 @@ public static Thread createCriticalThread(String name, OptionalInt priority, Run
   // required Java version is at least 19
   public static String toString(Thread t) {
     StringBuilder sb = new StringBuilder("Thread[#");
-    sb.append(t.getId()).append(",").append(t.getName()).append(",").append(t.getPriority())
+    sb.append(t.threadId()).append(",").append(t.getName()).append(",").append(t.getPriority())
         .append(",");
     ThreadGroup group = t.getThreadGroup();
     if (group != null) {
diff --git a/pom.xml b/pom.xml
index 17280fd496c..151cbbbeabc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@ under the License.
     <failsafe.forkCount>1</failsafe.forkCount>
     <failsafe.groups />
     <failsafe.reuseForks>false</failsafe.reuseForks>
-    <javaVersion>17</javaVersion>
+    <javaVersion>21</javaVersion>
     <!-- prevent introduction of new compiler warnings -->
     <maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
     <maven.javadoc.failOnWarnings>true</maven.javadoc.failOnWarnings>
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/AsyncConditionalTabletsMutatorImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/AsyncConditionalTabletsMutatorImpl.java
index 8b76607d709..8faa9c8b59d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/AsyncConditionalTabletsMutatorImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/AsyncConditionalTabletsMutatorImpl.java
@@ -48,7 +48,7 @@ public AsyncConditionalTabletsMutatorImpl(Consumer<Ample.ConditionalResult> resu
     this.resultsConsumer = Objects.requireNonNull(resultsConsumer);
     this.mutatorFactory = mutatorFactory;
     this.bufferingMutator = mutatorFactory.get();
-    var creatorId = Thread.currentThread().getId();
+    var creatorId = Thread.currentThread().threadId();
     this.executor = Executors.newSingleThreadExecutor(runnable -> Threads.createCriticalThread(
         "Async conditional tablets mutator background thread, created by : #" + creatorId,
         runnable));
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
index f1d3e3bc1a8..e2334226f30 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java
@@ -88,7 +88,7 @@ public static class ScanThreadStackTrace {
     public final StackTraceElement[] stackTrace;
 
     private ScanThreadStackTrace(Thread thread) {
-      this.threadId = thread.getId();
+      this.threadId = thread.threadId();
       this.stackTrace = thread.getStackTrace();
       this.threadName = thread.getName();
     }