Merge remote-tracking branch 'upstream/3.1' into useNanoTimeMore

Author: DomGarguilo

.github/ISSUE_TEMPLATE/post_vote_checklist.md

@@ -7,7 +7,10 @@ assignees: ''
 
 ---
 
-- [ ] Label this issue with the [project](https://github.com/apache/accumulo/projects) that corresponds to this release version
+- [Milestone](https://github.com/apache/accumulo/milestones) tasks
+  - [ ] Label this issue with the corresponding release milestone
+  - [ ] Create a milestone for the next version (if necessary) and move any open issues not completed in this release (except this issue) to the new milestone
+  - [ ] Close the milestone for this issue (the only issue remaining open should be this one)
 - [Git](https://github.com/apache/accumulo) tasks
   - [ ] Create a signed `rel/<version>` tag (and push it)
   - [ ] Merge `<version>-rc<N>-next` branch into a maintenance branch (if maintenance is expected),
@@ -42,6 +45,4 @@ assignees: ''
   - [ ] Send to announce@apache.org and user@accumulo.apache.org (use plain text mode only; html email will be rejected)
 - GitHub wrap-up
   - [ ] Close this issue
-  - [ ] Create a new "Automated Kanban" [project](https://github.com/apache/accumulo/projects) for the next version (if necessary) and move any open issues not completed in this release to that project
-  - [ ] Close the project that corresponds to this release
 

.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

LICENSE

@@ -284,36 +284,6 @@ Files:
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
-## Flot 4.2.6 (https://github.com/flot/flot)
-
-Files:
-* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/*
-
-    Copyright (c) 2007-2014 IOLA and Ole Laursen
-
-    Available under the MIT License
-    (see server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/LICENSE.txt)
-
-    Flot bundles additional works:
-
-    jquery.flot.pie.js
-        Flot plugin for rendering pie charts.
-
-        Copyright (c) 2007-2014 IOLA and Ole Laursen.
-        Licensed under the MIT license.
-
-        * Created by Brian Medendorp
-        * Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
 ## Bootstrap v5.3.2 (https://getbootstrap.com/)
 
 Files: