Merge remote-tracking branch 'upstream/2.1' into improveRateLimitingMonitor

Author: DomGarguilo

.github/workflows/maven-full-its.yaml

@@ -53,14 +53,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Build with Maven (Fast Build)
@@ -97,14 +90,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Override DNS to fix IP address for hostname
       run: |
         ip -br addr

.github/workflows/maven-on-demand.yaml

@@ -70,14 +70,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Override DNS to fix IP address for hostname

.github/workflows/maven.yaml

@@ -43,14 +43,7 @@ jobs:
       with:
         distribution: adopt
         java-version: 17
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Check for unapproved characters
@@ -81,14 +74,7 @@ jobs:
       with:
         distribution: adopt
         java-version: ${{ matrix.profile.javaver }}
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/accumulo
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Override DNS to fix IP address for hostname
       run: |
         ip -br addr