This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a93b4ad2b7751ad666828e13ca9c247ae7ac10f2 Merge: a893ee5c53 03af8f2175 Author: Christopher Tubbs <[email protected]> AuthorDate: Fri Aug 15 18:41:45 2025 -0400 Merge branch '2.1' LICENSE | 28 ++++++++++---------- assemble/src/main/resources/LICENSE | 30 ++++++++++------------ core/src/main/appended-resources/META-INF/LICENSE | 4 +-- .../src/main/appended-resources/META-INF/LICENSE | 24 ++++++++--------- 4 files changed, 42 insertions(+), 44 deletions(-) diff --cc LICENSE index 6f4005c115,ea8480af62..87c6bceee9 --- a/LICENSE +++ b/LICENSE @@@ -284,10 -284,41 +284,10 @@@ 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. -## 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.2 (https://getbootstrap.com/) - Files: - * server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/**/* + Files (in server/monitor/src/main/resources/): + * org/apache/accumulo/monitor/resources/external/bootstrap/**/* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) Licensed under the MIT license (see above and https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --cc assemble/src/main/resources/LICENSE index 6c88e7262f,71d4958aec..2c557c3897 --- a/assemble/src/main/resources/LICENSE +++ b/assemble/src/main/resources/LICENSE @@@ -286,10 -284,41 +284,10 @@@ Files (in lib/accumulo-monitor-*.jar) 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 (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.2 (https://getbootstrap.com/) - Files: - * server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/**/* + Files (in lib/accumulo-monitor-*.jar): + * org/apache/accumulo/monitor/resources/external/bootstrap/**/* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) Licensed under the MIT license (see above and https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --cc server/monitor/src/main/appended-resources/META-INF/LICENSE index 147af84f86,7b5cfa4c72..d7aa4c0974 --- a/server/monitor/src/main/appended-resources/META-INF/LICENSE +++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE @@@ -46,10 -46,41 +46,10 @@@ Files (in lib/accumulo-monitor-*.jar) 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 (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.2 (https://getbootstrap.com/) - Files: - * server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/**/* + Files (in lib/accumulo-monitor-*.jar): + * org/apache/accumulo/monitor/resources/external/bootstrap/**/* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) Licensed under the MIT license (see above and https://github.com/twbs/bootstrap/blob/main/LICENSE)
