This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d618018611a6f291c4a3d47900242f27aa4c6791 Merge: 4f2f2f3019 00a0d21564 Author: Dom Garguilo <[email protected]> AuthorDate: Tue Mar 3 12:06:28 2026 -0500 Merge branch '2.1' into main LICENSE | 14 +- assemble/src/main/resources/LICENSE | 14 +- .../src/main/appended-resources/META-INF/LICENSE | 14 +- .../external/bootstrap/css/bootstrap-icons.css | 36 ++- .../resources/external/bootstrap/css/bootstrap.css | 262 ++++++++++----------- .../bootstrap/css/fonts/bootstrap-icons.woff | Bin 0 -> 180288 bytes .../bootstrap/css/fonts/bootstrap-icons.woff2 | Bin 0 -> 134044 bytes .../external/bootstrap/fonts/bootstrap-icons.woff | Bin 176200 -> 0 bytes .../external/bootstrap/fonts/bootstrap-icons.woff2 | Bin 130608 -> 0 bytes .../external/bootstrap/js/bootstrap.bundle.js | 46 ++-- .../datatables/css/dataTables.bootstrap5.css | 16 +- .../datatables/js/dataTables.bootstrap5.js | 2 +- .../external/datatables/js/jquery.dataTables.js | 84 ++++--- 13 files changed, 261 insertions(+), 227 deletions(-) diff --cc LICENSE index 87c6bceee9,a50a4ff7e5..64624a7ad7 --- a/LICENSE +++ b/LICENSE @@@ -284,7 -284,38 +284,7 @@@ Files (in server/monitor/src/main/resou FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ## Bootstrap v5.3.2 (https://getbootstrap.com/) -## Flot 4.2.6 (https://github.com/flot/flot) - -Files (in 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 above and https://github.com/flot/flot/blob/master/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/ - - distributed under the MIT license (see above) - + ## Bootstrap v5.3.8 (https://getbootstrap.com/) Files (in server/monitor/src/main/resources/): * org/apache/accumulo/monitor/resources/external/bootstrap/**/* diff --cc assemble/src/main/resources/LICENSE index 9404d474cb,fbfb16beed..caf46e5357 --- a/assemble/src/main/resources/LICENSE +++ b/assemble/src/main/resources/LICENSE @@@ -284,7 -284,38 +284,7 @@@ Files (in lib/accumulo-monitor-*.jar) FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ## Bootstrap v5.3.2 (https://getbootstrap.com/) -## Flot 4.2.6 (https://github.com/flot/flot) - -Files (in lib/accumulo-monitor-*.jar): -* org/apache/accumulo/monitor/resources/external/flot/* - - Copyright (c) 2007-2014 IOLA and Ole Laursen - - Available under the MIT License (see above and https://github.com/flot/flot/blob/master/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/ - - distributed under the MIT license (see above) - + ## Bootstrap v5.3.8 (https://getbootstrap.com/) Files (in lib/accumulo-monitor-*.jar): * org/apache/accumulo/monitor/resources/external/bootstrap/**/* diff --cc server/monitor/src/main/appended-resources/META-INF/LICENSE index d7aa4c0974,8800fec7b7..39f0ba8551 --- a/server/monitor/src/main/appended-resources/META-INF/LICENSE +++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE @@@ -46,7 -46,38 +46,7 @@@ Files (in lib/accumulo-monitor-*.jar) FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ## Bootstrap v5.3.2 (https://getbootstrap.com/) -## Flot 4.2.6 (https://github.com/flot/flot) - -Files (in lib/accumulo-monitor-*.jar): -* org/apache/accumulo/monitor/resources/external/flot/* - - Copyright (c) 2007-2014 IOLA and Ole Laursen - - Available under the MIT License (see above and https://github.com/flot/flot/blob/master/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/ - - distributed under the MIT license (see above) - + ## Bootstrap v5.3.8 (https://getbootstrap.com/) Files (in lib/accumulo-monitor-*.jar): * org/apache/accumulo/monitor/resources/external/bootstrap/**/*
