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.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new fbf9a7cb2f Fix trivial issues preventing builds on JDK 25
fbf9a7cb2f is described below

commit fbf9a7cb2ffe8d545dcc2af4e6914ab18675ba3c
Author: Christopher Tubbs <[email protected]>
AuthorDate: Tue Mar 3 16:12:42 2026 -0500

    Fix trivial issues preventing builds on JDK 25
---
 .github/workflows/maven-full-its.yaml                              | 6 +++---
 .github/workflows/maven-on-demand.yaml                             | 6 +++---
 .github/workflows/maven.yaml                                       | 7 ++++---
 .github/workflows/scripts.yaml                                     | 6 +++---
 .../core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java  | 2 +-
 core/src/main/scripts/generate-thrift.sh                           | 2 ++
 .../org/apache/accumulo/core/clientImpl/thrift/ClientService.java  | 2 +-
 .../apache/accumulo/core/clientImpl/thrift/ConfigurationType.java  | 2 +-
 .../apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java  | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java     | 2 +-
 .../accumulo/core/clientImpl/thrift/TVersionedProperties.java      | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/TableOperation.java | 2 +-
 .../core/clientImpl/thrift/TableOperationExceptionType.java        | 2 +-
 .../clientImpl/thrift/ThriftConcurrentModificationException.java   | 2 +-
 .../core/clientImpl/thrift/ThriftNotActiveServiceException.java    | 2 +-
 .../accumulo/core/clientImpl/thrift/ThriftSecurityException.java   | 2 +-
 .../core/clientImpl/thrift/ThriftTableOperationException.java      | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java     | 2 +-
 .../core/compaction/thrift/CompactionCoordinatorService.java       | 2 +-
 .../apache/accumulo/core/compaction/thrift/CompactorService.java   | 2 +-
 .../apache/accumulo/core/compaction/thrift/TCompactionState.java   | 2 +-
 .../accumulo/core/compaction/thrift/TCompactionStatusUpdate.java   | 2 +-
 .../accumulo/core/compaction/thrift/TExternalCompaction.java       | 2 +-
 .../accumulo/core/compaction/thrift/TExternalCompactionList.java   | 2 +-
 .../apache/accumulo/core/compaction/thrift/TNextCompactionJob.java | 2 +-
 .../core/compaction/thrift/UnknownCompactionIdException.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/InitialScan.java      | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/IterInfo.java         | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java      | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java  | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/ScanResult.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCMResult.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TColumn.java          | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCondition.java       | 2 +-
 .../apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java | 2 +-
 .../apache/accumulo/core/dataImpl/thrift/TConditionalSession.java  | 2 +-
 .../accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKey.java             | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TMutation.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TRange.java           | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TRowRange.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummaries.java       | 2 +-
 .../accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java    | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummary.java         | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java  | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java     | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GCMonitorService.java       | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GCStatus.java               | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GcCycleStats.java           | 2 +-
 .../org/apache/accumulo/core/manager/thrift/DeadServer.java        | 2 +-
 .../org/apache/accumulo/core/manager/thrift/FateOperation.java     | 2 +-
 .../org/apache/accumulo/core/manager/thrift/FateService.java       | 2 +-
 .../apache/accumulo/core/manager/thrift/ManagerClientService.java  | 2 +-
 .../org/apache/accumulo/core/manager/thrift/ManagerGoalState.java  | 2 +-
 .../apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java    | 2 +-
 .../org/apache/accumulo/core/manager/thrift/ManagerState.java      | 2 +-
 .../org/apache/accumulo/core/manager/thrift/RecoveryException.java | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TabletLoadState.java   | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TabletSplit.java       | 2 +-
 .../accumulo/core/manager/thrift/ThriftPropertyException.java      | 2 +-
 .../org/apache/accumulo/core/master/thrift/BulkImportState.java    | 2 +-
 .../org/apache/accumulo/core/master/thrift/BulkImportStatus.java   | 2 +-
 .../org/apache/accumulo/core/master/thrift/Compacting.java         | 2 +-
 .../org/apache/accumulo/core/master/thrift/RecoveryStatus.java     | 2 +-
 .../org/apache/accumulo/core/master/thrift/TableInfo.java          | 2 +-
 .../org/apache/accumulo/core/master/thrift/TabletServerStatus.java | 2 +-
 .../apache/accumulo/core/process/thrift/ServerProcessService.java  | 2 +-
 .../org/apache/accumulo/core/replication/thrift/KeyValues.java     | 2 +-
 .../core/replication/thrift/RemoteReplicationErrorCode.java        | 2 +-
 .../core/replication/thrift/RemoteReplicationException.java        | 2 +-
 .../accumulo/core/replication/thrift/ReplicationCoordinator.java   | 2 +-
 .../core/replication/thrift/ReplicationCoordinatorErrorCode.java   | 2 +-
 .../core/replication/thrift/ReplicationCoordinatorException.java   | 2 +-
 .../accumulo/core/replication/thrift/ReplicationServicer.java      | 2 +-
 .../org/apache/accumulo/core/replication/thrift/WalEdits.java      | 2 +-
 .../accumulo/core/securityImpl/thrift/TAuthenticationKey.java      | 2 +-
 .../core/securityImpl/thrift/TAuthenticationTokenIdentifier.java   | 2 +-
 .../org/apache/accumulo/core/securityImpl/thrift/TCredentials.java | 2 +-
 .../apache/accumulo/core/securityImpl/thrift/TDelegationToken.java | 2 +-
 .../accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java  | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ActionStats.java  | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java   | 2 +-
 .../core/tabletserver/thrift/ConstraintViolationException.java     | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/InputFile.java    | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/IteratorConfig.java   | 2 +-
 .../accumulo/core/tabletserver/thrift/NoSuchScanIDException.java   | 2 +-
 .../core/tabletserver/thrift/NotServingTabletException.java        | 2 +-
 .../accumulo/core/tabletserver/thrift/ScanServerBusyException.java | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ScanState.java    | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ScanType.java     | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionKind.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java | 2 +-
 .../accumulo/core/tabletserver/thrift/TCompactionReason.java       | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionStats.java | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionType.java  | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/TDurability.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TExternalCompactionJob.java  | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java | 2 +-
 .../core/tabletserver/thrift/TSampleNotPresentException.java       | 2 +-
 .../accumulo/core/tabletserver/thrift/TSamplerConfiguration.java   | 2 +-
 .../accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java       | 2 +-
 .../accumulo/core/tabletserver/thrift/TabletClientService.java     | 2 +-
 .../accumulo/core/tabletserver/thrift/TabletScanClientService.java | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/TabletStats.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TooManyFilesException.java   | 2 +-
 .../org/apache/accumulo/core/trace/thrift/TInfo.java               | 2 +-
 .../java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java    | 2 +-
 .../org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java   | 2 +-
 113 files changed, 123 insertions(+), 120 deletions(-)

diff --git a/.github/workflows/maven-full-its.yaml 
b/.github/workflows/maven-full-its.yaml
index 2f26cad182..f771edac81 100644
--- a/.github/workflows/maven-full-its.yaml
+++ b/.github/workflows/maven-full-its.yaml
@@ -112,21 +112,21 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v6
+      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@v6
+      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@v6
+      uses: actions/upload-artifact@v7
       with:
         name: mini-tests-logs-${{ matrix.profile.name }}
         path: ./**/target/**/mini-tests/**/logs/
diff --git a/.github/workflows/maven-on-demand.yaml 
b/.github/workflows/maven-on-demand.yaml
index 101b3672fd..e1676014f0 100644
--- a/.github/workflows/maven-on-demand.yaml
+++ b/.github/workflows/maven-on-demand.yaml
@@ -92,21 +92,21 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: surefire-reports
         path: ./**/target/surefire-reports/
         if-no-files-found: ignore
     - name: Upload integration test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: failsafe-reports
         path: ./**/target/failsafe-reports/
         if-no-files-found: ignore
     - name: Upload mini test logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: mini-tests-logs
         path: ./**/target/**/mini-tests/**/logs/
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 91c98caed0..8ac280ab3d 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -67,6 +67,7 @@ jobs:
           - {name: 'qa-checks',     javaver: 21, args: 'verify javadoc:jar 
-Psec-bugs -DskipTests -Dspotbugs.timeout=3600000'}
           - {name: 'compat',        javaver: 21, args: 'package -DskipTests 
-Dversion.hadoop=3.0.3 -Dversion.zookeeper=3.5.10'}
           - {name: 'errorprone',    javaver: 21, args: 'verify -Derrorprone 
-PskipQA'}
+          - {name: 'jdk25',         javaver: 25, args: 'verify javadoc:jar 
-DskipTests'}
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
@@ -99,21 +100,21 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v6
+      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@v6
+      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@v6
+      uses: actions/upload-artifact@v7
       with:
         name: mini-tests-logs-${{ matrix.profile.name }}
         path: ./**/target/**/mini-tests/**/logs/
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index 2911dcb1a0..57e8f22ee1 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -36,7 +36,7 @@ jobs:
     timeout-minutes: 3
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Show the first log message
       run: git log -n1
     - name: Install shfmt
@@ -49,7 +49,7 @@ jobs:
     timeout-minutes: 3
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Show the first log message
       run: git log -n1
     - name: Install shfmt
@@ -62,7 +62,7 @@ jobs:
     timeout-minutes: 3
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Show the first log message
       run: git log -n1
     - name: Update package repository
diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
index e68d21d454..27ecf19db5 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java
@@ -33,7 +33,7 @@ public final class LruBlockCacheConfiguration {
 
   public static final String PROPERTY_PREFIX = "lru";
 
-  /** Default Configuration Parameters */
+  /* Default Configuration Parameters */
 
   /** Backing Concurrent Map Configuration */
   public static final Float DEFAULT_LOAD_FACTOR = 0.75f;
diff --git a/core/src/main/scripts/generate-thrift.sh 
b/core/src/main/scripts/generate-thrift.sh
index 2c9ad16132..7893c25bbc 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -137,6 +137,8 @@ ${LINE_NOTATION} KIND, either express or implied.  See the 
License for the
 ${LINE_NOTATION} specific language governing permissions and limitations
 ${LINE_NOTATION} under the License.${SUFFIX}
 EOF
+      # Fix java comment; should not be javadoc, but regular multi-line comment
+      [[ $lang == 'java' ]] && sed -i -e 'N; s#^/[*][*]\n [*] 
Autogenerated#/*\n * Autogenerated#' "${f}-with-license"
     done
   done
 done
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
index 91b78f9a10..2916759bc1 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
index 4eed9e0e56..cc20c603cf 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
index 419f656cca..73a68858f9 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
index b8dad208ee..4e940fbad7 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java
index 3a8efb7f87..703b255af3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
index 8f4553ced7..5f56ba6a8d 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
index 4b8ec29d61..550da6c8f8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java
index 1da23a9ac9..44c72ede28 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
index 585f3a5129..1bb8521b8a 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
index 6b765a1481..39fd9b9181 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
index 5393c038c0..7a0f46dae8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
index 790a3f5582..d93c412945 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
index a59cec5ae9..f2b10606f9 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
index 90996c584d..57cbc70eff 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
index f18b356d09..0ad4c35720 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionStatusUpdate.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionStatusUpdate.java
index 5833f7cd79..cc2d4dbb38 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionStatusUpdate.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionStatusUpdate.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompaction.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompaction.java
index bcbe43a4b6..35e4b0fcc7 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompaction.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompaction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java
index e51aeaa333..60cec0669f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java
index 4af09b806e..483febe726 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
index 1bcf623e38..6bb54f596b 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
index 721a79a042..06706faae3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
index 2d0824be75..becdf7fa7e 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
index c782b84da1..1ef80ac032 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
index 0d7de77a00..d19b37f9d5 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
index b0ddd51c58..03e8125341 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
index ff872d0608..c720fd6b10 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
index 0b735e12c3..2f2842876d 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
index e92df497a1..4aaaa38ac6 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
index 8412d22cd2..a99e4a54c8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
index f0312d61c0..8511f86b55 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
index 641709fe3e..0b327555bc 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
index 9e652757f2..16b4fc2961 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
index cefcc048bc..b83b805424 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
index e554afed85..01f826e9b9 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
index 960a2032c1..e26f3dcd7a 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
index aa7a296292..dc2774c427 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
index b27e8d2b72..c5e8fd3797 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
index ee3cca19b7..125cfaf421 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
index 8f241ab842..e421350ef3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
index 9ddd35a695..478b814b8a 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
index 702725a887..8bcfd1dc5f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
index 472cf7b2cb..c0c76b44eb 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
index f10479346f..c517d2e70d 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
index 84943e92c5..894a83d2f8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
index c9f280970c..bdc9e13e88 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
index c531b71d94..50a95d8100 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
index 9ded99be12..acb7f5bc89 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
index fcbd5f3d66..5973fe45d4 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
index f803d85064..7cad33128f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
index c9c06480c5..5898220d3e 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
index 60e46630d5..8259635621 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
index 66878b384c..8d155ceee7 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
index 8d2c3ce361..59b0a2ec8f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
index a24e19b847..7a808a3938 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
index 32eb228521..3477c24fb3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
index aa837333fc..3e8f4caf4f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
index 871ffb4137..f01ebef75f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
index 9ce07396ca..d5764c0eb0 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
index 0e5f17d9d4..8e3e760562 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
index 5c92beec94..07e223ca99 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
index 7e67064058..c9f377300f 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
index 9372d5f5d1..03709b26fa 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
index c9fb233fba..534a7127cc 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
index c6261fc2e5..0364992661 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java
index 273d44e49f..0f6b5abe78 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
index b700d31e83..fa56d51494 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
index 9d9d810e75..6eadff549c 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
index 8c250e052e..3412e79e97 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
index b4e79d6d21..202b9625a0 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
index 2f1c3378c8..ca88700679 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
index 48ad99aa50..d41e56d2d5 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
index 7d7e41c89b..72b5636e60 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
index 48df668777..a9d7be0602 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
index 4deb255f54..47afc0b40c 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
index 3a8a931b9f..ec3c3533ab 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
index 94cc6e2c64..8557c348e9 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
index 9718d15283..76f362ac57 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
index ffb0689590..6dec8348a7 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index ef970b002d..2766371838 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index e44aec20ff..315c6d67b8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index fddf9b234c..d486b9fe0a 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index ca15e656fd..5adbfe7183 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
index b0bea134d3..1ffd1780a8 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index 83ab70d8df..4a03483216 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index 3c99c7056a..c2dd40ca76 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index 403fb75519..8ae323d207 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanServerBusyException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanServerBusyException.java
index 894136d8b6..e707064d89 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanServerBusyException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanServerBusyException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index 5f20e90ad5..483103e011 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index 6c3122947d..2070b7f0d3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
index eb0aae36f6..16aab8ce37 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
index 3cb3b853d0..17391e5ef0 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
index 2c640dc5b5..c2ff810c31 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
index 6780d74941..41134460fb 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
index d09fb11ba0..3c1d68200d 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
index b5e8a95913..805be879d5 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
index 80cec3805c..9b238869ce 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index a58faa4cdd..9170db0ca7 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
index 061ba5190d..dd5f5162cd 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
index 607dac226b..3c23a379dd 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
index 4c65ad92f3..0ea9a8de15 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index b5446c41f3..475e14af44 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletScanClientService.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletScanClientService.java
index 5fd64fd8cb..ea7ac66ad3 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletScanClientService.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletScanClientService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index d4aa10b1a3..0d589e513c 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
index f4e5084447..45086bdffb 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/trace/thrift/TInfo.java
 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/trace/thrift/TInfo.java
index e657138527..d2d9598d54 100644
--- 
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/trace/thrift/TInfo.java
+++ 
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/trace/thrift/TInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 095d9dd490..0e5430fa23 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -245,10 +245,10 @@ public class GarbageCollectionAlgorithm {
     return blipCount;
   }
 
-  @VisibleForTesting
   /**
    * Double check no tables were missed during GC
    */
+  @VisibleForTesting
   protected void ensureAllTablesChecked(Set<TableId> tableIdsBefore, 
Set<TableId> tableIdsSeen,
       Set<TableId> tableIdsAfter) {
 
diff --git 
a/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
 
b/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
index 79c6d6087c..1cb24f0d3d 100644
--- 
a/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+++ 
b/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
+/*
  * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING

Reply via email to