diff --git a/.github/workflows/auto-jdk-os-matrix.yml b/.github/workflows/auto-jdk-os-matrix.yml
index 232f2514..62288457 100644
--- a/.github/workflows/auto-jdk-os-matrix.yml
+++ b/.github/workflows/auto-jdk-os-matrix.yml
@@ -6,66 +6,31 @@ on:
     branches: [ 'main', '[0-9]+.[0-9]+.[Xx]', 'v[0-9]+.[0-9]+.[Xx]']
   pull_request:
     paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/LICENSE', '**/NOTICE' ]
-    # The branches below must be a subset of the branches above
     branches: [ 'main', '[0-9]+.[0-9]+.[Xx]', 'v[0-9]+.[0-9]+.[Xx]']
-  workflow_dispatch:
+  workflow_dispatch: 
 
-env:
-  MAVEN_OPTS: -Xmx4g -Xms1g
-  MAVEN_ARGS: "-B -Dmaven.javadoc.skip=true -Dgpg.skip=true"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build, Test, Install
-    runs-on: ${{ matrix.os }}
-
+  run-matrix:
     strategy:
       fail-fast: false
       matrix:
         jdk: [ 25 ]
         os: [ windows-latest, ubuntu-latest, macos-latest ]
-
-    steps:
-      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Install Matrix JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.jdk }}
-          distribution: 'temurin'
-          java-package: jdk
-          architecture: x64
-          cache: 'maven'  # performance optimization
-          overwrite-settings: true  # ensures the runner's .m2/settings.xml is current
-
-      - name: Verify Toolchain Configuration
-        shell: bash
-        run: |
-          if [ -f ~/.m2/toolchains.xml ]; then
-            cat ~/.m2/toolchains.xml
-          else
-            echo "toolchains.xml not found in ~/.m2/"
-          fi
-
-      - name: Echo Java & Maven Version
-        run: mvn -version #also prints java-version
-
-      - name: Print Current workflow
-        run: cat .github/workflows/auto-jdk-os-matrix.yml
-
-      - name: Test
-        run: mvn clean test
-
-      - name: Install
-        run: mvn clean install "-DskipTests=true" "-Dmaven.clean.failOnError=false" #windows os hack
-
-
-# Architecture options: x86, x64, armv7, aarch64, ppc64le
-# Lifecycle: validate, compile, test, package, verify, install, deploy
-# -B batch mode, never stops for user input
-# -V show Version without stopping
-# -X debug mode
-# -q quiet, only show errors
+        include:
+          - os: windows-latest
+            arch: x64
+          - os: ubuntu-latest
+            arch: x64
+          - os: macos-latest
+            arch: aarch64
+
+    # Reference the reusable workflow on the "workflows" branch
+    uses: apache/datasketches-memory/.github/workflows/reusable-jdk-os-matrix.yml@workflows
+    with:
+      jdk_version: ${{ matrix.jdk }}
+      os_type: ${{ matrix.os }}
+      java_arch: ${{ matrix.arch }}
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00000000..87735fa0
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,5 @@
+# suppresses the warning:
+# Direct modification of testCompileSourceRoots through add() is deprecated and will not work in Maven 4.0.0. Please use the add/remove methods instead. 
+# If you're using a plugin that causes this warning, please upgrade to the latest version and report an issue if the warning persists. 
+# To disable these warnings, set -Dmaven.project.sourceRoots.warningsDisabled=true on the command line or in the .mvn/maven.config file.
+-Dmaven.project.sourceRoots.warningsDisabled=true
diff --git a/DS-Java-Memory-24.code-workspace b/DS-Java-Memory-24.code-workspace
deleted file mode 100644
index 5285c6ef..00000000
--- a/DS-Java-Memory-24.code-workspace
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "../datasketches-java21"
-		}
-	],
-	"settings": {
-		"maven.view": "flat"
-	}
-}
\ No newline at end of file
diff --git a/README.md b/README.md
index 208862dc..ea3cfe3d 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@
 -->
 
 [![Build Status](https://travis-ci.org/apache/datasketches-memory.svg?branch=master)](https://travis-ci.org/apache/datasketches-memory)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.datasketches/datasketches-memory/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.datasketches/datasketches-memory)
-[![Coverage Status](https://coveralls.io/repos/github/apache/datasketches-memory/badge.svg?branch=master)](https://coveralls.io/github/apache/datasketches-memory?branch=master)
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.datasketches/datasketches-memory)](https://central.sonatype.com/artifact/org.apache.datasketches/datasketches-memory)
+[![Coverage Status](https://coveralls.io/repos/github/apache/datasketches-memory/badge.svg?branch=main)](https://coveralls.io/github/apache/datasketches-memory?branch=main)
 
 =================
 
diff --git a/pom.xml b/pom.xml
index 681af90a..e0a5fd4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,44 +76,53 @@ under the License.
 
   <properties>
     <!-- Test -->
-    <testng.version>7.11.0</testng.version>
+    <testng.version>7.12.0</testng.version>
 
     <!-- System-wide properties -->
-    <maven.version>3.6.3</maven.version>
+    <maven.version>3.9.12</maven.version>
     <java.version>25</java.version>
-    <jvm-arguments></jvm-arguments>
     <maven.compiler.release>${java.version}</maven.compiler.release>
-    <argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${jvm-arguments}</argLine>
+    <jvm.mem>-Xmx4g</jvm.mem>
+    <jvm.locale.language>-Duser.language=en</jvm.locale.language>
+    <jvm.locale.country>-Duser.country=US</jvm.locale.country>
+    <jvm.locale.encoding>-Dfile.encoding=UTF-8</jvm.locale.encoding>
+    <jvm.args>${jvm.mem} ${jvm.locale.language} ${jvm.locale.country} ${jvm.locale.encoding}</jvm.args>
     <charset.encoding>UTF-8</charset.encoding>
     <project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
     <project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
     <project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding>
+    <project.reporting.outputDirectory>${project.build.directory}/site</project.reporting.outputDirectory>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH-mm-ss'Z'</maven.build.timestamp.format>
 
-    <!--  org.apache.maven plugins -->
-    <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
-    <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
-    <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
+    <!--  Covered by Apache Parent POM -->
+    <!--    org.apache.maven plugins -->
+    <maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
+    <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version> <!-- parent 37: 3.14.1 -->
+    <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
     <maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
-    <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+    <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-    <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
-    <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
-    <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-    <!-- for surefire, failsafe and surefire-report: -->
-    <maven-surefire-failsafe-plugins.version>3.5.2</maven-surefire-failsafe-plugins.version>
+    <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
+    <maven-release-plugin.version>3.3.1</maven-release-plugin.version>
+    <maven-source-plugin.version>3.4.0</maven-source-plugin.version>
+    <maven-surefire-failsafe-plugins.version>3.5.4</maven-surefire-failsafe-plugins.version> <!-- for surefire, failsafe and surefire-report -->
+
+    <!--    org.apache.rat plugins -->
+    <apache-rat-plugin.version>0.17</apache-rat-plugin.version> <!-- parent 37: 0.16.1 -->
+
+    <!-- Not covered by Apache Parent POM-->
     <maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
-    <!-- com.github plugins -->
-    <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-    <!-- org.apache.creadur plugins -->
-    <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
-    <!-- org.eluder maven plugins -->
+
+    <!-- com.github maven plugins -->
     <coveralls-repo-token></coveralls-repo-token>
-    <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
+    <coveralls-maven-plugin.version>5.0.0</coveralls-maven-plugin.version>
+
+    <!-- io.github plugins -->
+    <git-commit-id-maven-plugin.version>9.0.2</git-commit-id-maven-plugin.version>
+
     <!-- org.jacoco.maven plugins -->
-    <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
-    <!-- org.mojohaus plugins -->
-    <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
+    <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
+
     <!-- other -->
     <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
   </properties>
@@ -133,6 +142,7 @@ under the License.
       <plugins>
 
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>${maven-assembly-plugin.version}</version>
         </plugin>
@@ -143,14 +153,10 @@ under the License.
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
             <fork>true</fork>
-            <compilerArgs>
-              <arg>${jvm-arguments}</arg>
-            </compilerArgs>
           </configuration>
         </plugin>
 
         <plugin>
-          <!-- We want to deploy the artifacts to a staging location for perusal -->
           <!-- Apache Parent pom: apache-release profile -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -169,11 +175,11 @@ under the License.
               </goals>
               <configuration>
                 <rules>
-                  <!-- The normal Java enforcer rule out of the box is toolchain unaware 
-                  and is really only usefull for checking what java version is available 
-                  via the users shell environment. It does not check that the java compiler 
-                  version is sane or matches the java command version. 
-                  In the context of toolchains this rule is useless. 
+                  <!-- The normal Java enforcer rule out of the box is toolchain unaware
+                  and is really only useful for checking what java version is available
+                  via the users shell environment. It does not check that the java compiler
+                  version is sane or matches the java command version.
+                  In the context of toolchains this rule is useless.
                   See: https://github.com/paulmoloney/maven-enforcer-toolchain-rules
                   <requireJavaVersion> ... </requireJavaVersion>
                   -->
@@ -224,8 +230,11 @@ under the License.
             <docfilessubdirs>true</docfilessubdirs>
             <show>public</show>
             <doclint>all,-missing</doclint>
-            <additionalJOptions>
-              <additionalJOption>${jvm-arguments}</additionalJOption>
+           <additionalJOptions>
+              <additionalJOption>-J${jvm.mem}</additionalJOption>
+              <additionalJOption>-J${jvm.locale.language}</additionalJOption>
+              <additionalJOption>-J${jvm.locale.country}</additionalJOption>
+              <additionalJOption>-J${jvm.locale.encoding}</additionalJOption>
             </additionalJOptions>
           </configuration>
           <executions>
@@ -271,14 +280,18 @@ under the License.
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-failsafe-plugins.version}</version>
           <configuration>
-            <argLine>${jvm-arguments}</argLine>
+            <argLine>@{argLine} @{jvm.args}</argLine>
             <jdkToolchain>
               <version>${java.version}</version>
             </jdkToolchain>
             <trimStackTrace>false</trimStackTrace>
             <useManifestOnlyJar>false</useManifestOnlyJar>
             <redirectTestOutputToFile>false</redirectTestOutputToFile>
-            <reportsDirectory>${project.build.directory}/test-output/${maven.build.timestamp}</reportsDirectory>
+            <reportsDirectory>${project.build.directory}/test-output</reportsDirectory>
+            <suiteXmlFiles>
+              <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+            </suiteXmlFiles>
+            <perCoreThreadCount>false</perCoreThreadCount>
           </configuration>
         </plugin>
 
@@ -317,30 +330,26 @@ under the License.
           <configuration>
             <outputDirectory>${project.basedir}/rat</outputDirectory>
             <consoleOutput>true</consoleOutput>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <excludes>
+            <inputExcludes>
               <!-- rat uses .gitignore for excludes by default -->
-              <exclude>**/*.yaml</exclude>
-              <exclude>**/*.yml</exclude>
-              <exclude>**/.*</exclude>
-              <exclude>**/test/resources/**/*.txt</exclude>
-              <exclude>**/git.properties</exclude>
-              <exclude>LICENSE</exclude>
-              <exclude>NOTICE</exclude>
-              <exclude>**/*.code-workspace</exclude>
-            </excludes>
+              <inputExcludeStd>StandardCollection</inputExcludeStd>
+              <inputExclude>**/*.yaml</inputExclude>
+              <inputExclude>**/*.yml</inputExclude>
+              <inputExclude>**/.*</inputExclude>
+              <inputExclude>**/test/resources/**/*.txt</inputExclude>
+              <inputExclude>**/git.properties</inputExclude>
+              <inputExclude>**/doc/**</inputExclude>
+              <inputExclude>**/*.sk</inputExclude>
+              <inputExclude>LICENSE</inputExclude>
+              <inputExclude>NOTICE</inputExclude>
+              <inputExclude>**/*.code-workspace</inputExclude>
+            </inputExcludes>
           </configuration>
         </plugin>
 
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>versions-maven-plugin</artifactId>
-          <version>${versions-maven-plugin.version}</version>
-        </plugin>
-
         <plugin>
           <!-- Submit code coverage report to Coveralls.io. -->
-          <groupId>org.eluder.coveralls</groupId>
+          <groupId>com.github.hazendaz.maven</groupId>
           <artifactId>coveralls-maven-plugin</artifactId>
           <version>${coveralls-maven-plugin.version}</version>
           <configuration>
@@ -349,7 +358,13 @@ under the License.
         </plugin>
 
         <plugin>
-          <!-- Generates code coverage report from website. -->
+          <groupId>io.github.git-commit-id</groupId>
+          <artifactId>git-commit-id-maven-plugin</artifactId>
+          <version>${git-commit-id-maven-plugin.version}</version>
+        </plugin>
+
+        <plugin>
+          <!-- Generates code coverage report banner for website. -->
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <version>${jacoco-maven-plugin.version}</version>
@@ -362,6 +377,7 @@ under the License.
             </execution>
             <execution>
               <id>default-report</id>
+              <phase>test</phase>
               <goals>
                 <goal>report</goal>
               </goals>
@@ -369,75 +385,81 @@ under the License.
           </executions>
         </plugin>
 
-        <plugin>
-          <groupId>pl.project13.maven</groupId>
-          <artifactId>git-commit-id-plugin</artifactId>
-          <version>${git-commit-id-plugin.version}</version>
-        </plugin>
-
       </plugins>
     </pluginManagement>
+
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
       </plugin>
+
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>versions-maven-plugin</artifactId>
+        <groupId>com.github.hazendaz.maven</groupId>
+        <artifactId>coveralls-maven-plugin</artifactId>
       </plugin>
+
       <plugin>
-        <groupId>org.eluder.coveralls</groupId>
-        <artifactId>coveralls-maven-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-      </plugin>
+
     </plugins>
   </build>
 
@@ -458,11 +480,12 @@ under the License.
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>pl.project13.maven</groupId>
-              <artifactId>git-commit-id-plugin</artifactId>
-              <version>${git-commit-id-plugin.version}</version>
+              <groupId>io.github.git-commit-id</groupId>
+              <artifactId>git-commit-id-maven-plugin</artifactId>
+              <version>${git-commit-id-maven-plugin.version}</version>
               <executions>
                 <execution>
+                  <id>get-the-git-infos</id>
                   <goals>
                     <goal>revision</goal>
                   </goals>
@@ -523,14 +546,13 @@ under the License.
                   <manifest>
                     <addDefaultEntries>false</addDefaultEntries>
                     <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-                    <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                    <addBuildEnvironmentEntries>true</addBuildEnvironmentEntries>
                   </manifest>
                   <manifestEntries>
-                    <Build-Jdk>${java.version} (${java.vendor} ${java.vm.version})</Build-Jdk>
-                    <Build-OS>${os.name} ${os.arch} ${os.version}</Build-OS>
                     <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                     <GroupId-ArtifactId>${project.groupId}:${project.artifactId}</GroupId-ArtifactId>
-                    <!-- these properties are generated by the git-commit-id-plugin during initialize -->
+                    <!-- these properties are generated by the git-commit-id-maven-plugin during initialize -->
                     <!--suppress UnresolvedMavenProperty -->
                     <git-branch>${git.branch}</git-branch>
                     <!--suppress UnresolvedMavenProperty -->
@@ -573,8 +595,8 @@ under the License.
 
         <plugins>
           <plugin>
-            <groupId>pl.project13.maven</groupId>
-            <artifactId>git-commit-id-plugin</artifactId>
+            <groupId>io.github.git-commit-id</groupId>
+            <artifactId>git-commit-id-maven-plugin</artifactId>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java b/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java
index af16ccc3..28ecbd02 100644
--- a/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java
+++ b/src/test/java/org/apache/datasketches/memory/internal/A_BeforeSuite.java
@@ -23,7 +23,7 @@
 
 public class A_BeforeSuite {
 
-  @BeforeSuite
+  @BeforeSuite(alwaysRun = true)
   public void printTestEnvironment() {
     System.out.println("====================================================");
     System.out.println("TEST JDK: " + System.getProperty("java.version"));
diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml
new file mode 100644
index 00000000..363c8e0e
--- /dev/null
+++ b/src/test/resources/testng.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<suite name="MemorySuite">
+    <test name="AllMemoryTests">
+        <packages>
+            <package name="org.apache.datasketches.memory.*" />
+        </packages>
+    </test>
+</suite>
diff --git a/tools/MemoryCheckstyle.xml b/tools/MemoryCheckstyle.xml
index aeff51cd..6dcdd51d 100644
--- a/tools/MemoryCheckstyle.xml
+++ b/tools/MemoryCheckstyle.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
-    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
@@ -52,13 +49,13 @@ under the License.
   <module name="FileTabCharacter">
     <property name="eachLine" value="true"/>
   </module>
-  
+
   <module name="JavadocPackage"/>
-  
+
   <module name="NewlineAtEndOfFile">
     <property name="lineSeparator" value="lf"/>
   </module>
-  
+
   <!-- Size Violations -->
   <module name="LineLength">
     <property name="severity" value="warning"/>
@@ -66,21 +63,21 @@ under the License.
     <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     <!-- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> -->
   </module>
-  
+
   <module name="SuppressWithPlainTextCommentFilter">
     <property name="offCommentFormat" value="//CHECKSTYLE.OFF\: ([\w\|]+)"/>
     <property name="onCommentFormat" value="//CHECKSTYLE.ON\: ([\w\|]+)"/>
     <property name="checkFormat" value="$1"/>
   </module>
-  
+
   <!-- ******************************************************** -->
-  
+
   <module name="TreeWalker">
 
     <!-- Be able to ignore violations with @SuppressWarnings -->
     <!-- See https://checkstyle.org/filters/suppresswarningsfilter.html -->
     <module name="SuppressWarningsHolder"/>
-  
+
     <!--
       <module name="SuppressionFilter">
       <property name="file" value="basedir/tools/suppressions.xml"/>
@@ -92,7 +89,7 @@ under the License.
     <module name="AnnotationLocation">
       <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
     </module>
-    
+
     <module name="AnnotationLocation">
       <property name="tokens" value="VARIABLE_DEF"/>
       <property name="allowSamelineMultipleAnnotations" value="true"/>
@@ -105,44 +102,44 @@ under the License.
       <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="EmptyCatchBlock">
       <property name="severity" value="ignore"/>
       <property name="exceptionVariableName" value="expected"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="LeftCurly">
       <!-- doesn't allow for if (n == 0) { return 0.0; }, which is readable and not corruptable -->
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="NeedBraces">
       <property name="allowSingleLineStatement" value="false"/> <!-- default = false -->
       <property name="allowEmptyLoopBody" value="false"/>       <!-- default = false -->
     </module>
-    
-    <module name="RightCurly"> 
+
+    <module name="RightCurly">
       <!-- requires right curly start a new line; alone: on a line alone -->
       <property name="severity" value="ignore"/>
       <property name="option" value="alone"/>
       <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <!-- Coding -->
     <module name="FallThrough">
       <property name="severity" value="warning"/>
       <property name="reliefPattern" value="fallthru|falls? ?through|FALL[- ]?THROUGH"/>
       <!-- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> -->
     </module>
-    
+
     <module name="FinalLocalVariable">
       <property name="severity" value="warning"/>
       <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
     </module>
-    
+
     <module name="IllegalTokenText">
       <property name="severity" value="warning"/>
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -150,51 +147,51 @@ under the License.
       <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="MissingSwitchDefault">
       <!-- Too many false positives -->
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="MultipleVariableDeclarations">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="NoFinalizer">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="OneStatementPerLine">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="OverloadMethodsDeclarationOrder">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="VariableDeclarationUsageDistance">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL"/>
       <property name="format" value="\\n"/>
     </module>
-    
+
     <!-- Class Design -->
     <module name="OneTopLevelClass"/>
-    
+
     <module name="FinalClass"/>
-    
+
     <!-- Imports -->
     <module name="AvoidStarImport"/>
-    
+
     <module name="CustomImportOrder">
       <property name="specialImportsRegExp" value="org"/>
       <property name="sortImportsInGroupAlphabetically" value="false"/>
@@ -202,11 +199,11 @@ under the License.
       <!-- Google: "STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE" -->
       <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
     </module>
-    
+
     <module name="RedundantImport"/>
-    
+
     <module name="UnusedImports"/>
-    
+
     <!-- Filters -->
     <!-- Enable suppression using comments: //CHECKSTYLE.OFF: "RULE" and //CHECKSTYLE.ON: "RULE"
      You must specify the specific rule, as in: //CHECKSTYLE.OFF: LineLength -->
@@ -215,40 +212,40 @@ under the License.
       <property name="onCommentFormat" value="//CHECKSTYLE.ON\: ([\w\|]+)"/>
       <property name="checkFormat" value="$1"/>
     </module>
-    
+
     <!-- Javadoc Comments -->
     <!-- JavadocPackage under Checker -->
     <module name="AtclauseOrder">
       <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
       <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
     </module>
-    
+
     <module name="JavadocMethod">
       <property name="accessModifiers" value="public"/>
       <property name="allowMissingParamTags" value="false"/> <!-- default -->
       <property name="allowMissingReturnTag" value="false"/> <!-- default -->
       <property name="allowedAnnotations" value="Override, Test"/>
     </module>
-    
+
     <module name="JavadocParagraph"/>
 
     <module name="JavadocTagContinuationIndentation">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-        
+
     <module name="NonEmptyAtclauseDescription"/>
-    
+
     <module name="SingleLineJavadoc">
       <property name="ignoreInlineTags" value="false"/>
     </module>
-    
+
     <module name="SummaryJavadocCheck">
       <property name="severity" value="ignore"/>
       <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <!-- Miscellaneous -->
     <module name="ArrayTypeStyle">
       <property name="severity" value="ignore"/>
@@ -262,12 +259,12 @@ under the License.
       <property name="allowNonPrintableEscapes" value="true"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="CommentsIndentation">
       <property name="severity" value="ignore"/>
       <!-- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> -->
     </module>
-    
+
     <module name="Indentation">
       <property name="severity" value="ignore"/>
       <property name="basicOffset" value="2"/>
@@ -278,27 +275,27 @@ under the License.
       <property name="arrayInitIndent" value="2"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="OuterTypeFilename">
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <module name="TodoComment">
       <property name="severity" value="ignore"/>
       <property name="format" value="(//TODO)|(//FIXME)"/>
     </module>
-    
+
     <module name="UpperEll">
       <property name="severity" value="warning"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <!-- Modifiers -->
     <module name="ModifierOrder">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    
+
     <!-- Naming Conventions -->
     <module name="AbbreviationAsWordInName">
       <property name="severity" value="ignore"/>
@@ -372,13 +369,13 @@ under the License.
       <property name="message" value="Trailing whitespace"/>
       <property name="ignoreComments" value="true"/>
     </module>
-    
+
     <!-- Whitespace -->
     <module name="EmptyLineSeparator">
       <property name="allowNoEmptyLineBetweenFields" value="true"/>
       <property name="allowMultipleEmptyLines" value="false"/>
     </module>
-    
+
     <module name="GenericWhitespace">
       <message key="ws.followed"
           value="GenericWhitespace ''{0}'' is followed by whitespace."/>
@@ -389,26 +386,26 @@ under the License.
       <message key="ws.notPreceded"
           value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
     </module>
-    
+
     <module name="NoLineWrap"/> <!-- Only for import and package statements -->
-    
+
     <module name="MethodParamPad"/>
-    
+
     <module name="OperatorWrap">
       <property name="option" value="NL"/>
       <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
     </module>
-    
+
     <module name="SeparatorWrap">
       <property name="tokens" value="DOT"/>
       <property name="option" value="nl"/>
     </module>
-    
+
     <module name="SeparatorWrap">
       <property name="tokens" value="COMMA"/>
       <property name="option" value="EOL"/>
     </module>
-    
+
     <module name="WhitespaceAround">
       <property name="allowEmptyConstructors" value="true"/>
       <property name="allowEmptyMethods" value="true"/>
@@ -420,4 +417,4 @@ under the License.
 
   </module> <!-- End of TreeWalker -->
 
-</module>
\ No newline at end of file
+</module>
diff --git a/tools/suppressions.xml b/tools/suppressions.xml
index 58cdce75..b79c1c2f 100644
--- a/tools/suppressions.xml
+++ b/tools/suppressions.xml
@@ -1,8 +1,4 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-  "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-  "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 Licensed to the Apache Software Foundation (ASF) under one