This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 03af8f2175 Fix LICENSE files (#5806)
03af8f2175 is described below
commit 03af8f2175f641b5cbc6b666b9ccab332e4c3d8e
Author: Christopher Tubbs <[email protected]>
AuthorDate: Fri Aug 15 18:38:22 2025 -0400
Fix LICENSE files (#5806)
* Fix version numbers for bundled monitor dependencies
* Make it more clear where files can be found
* Add text present in one LICENSE files but not others, that the
dual-licensed library shipped with flot is being distributed by this
project under the MIT license
* Make the text of the various LICENSE files consistent, so it's easier
to use a diff tool to compare them
---
LICENSE | 34 +++++++++++----------
assemble/src/main/resources/LICENSE | 35 +++++++++++-----------
core/src/main/appended-resources/META-INF/LICENSE | 4 +--
.../src/main/appended-resources/META-INF/LICENSE | 30 ++++++++++---------
4 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/LICENSE b/LICENSE
index 1c80cd51f8..ea8480af62 100644
--- a/LICENSE
+++ b/LICENSE
@@ -211,8 +211,8 @@ to the terms and conditions of the following licenses.
## Software from the European Commission project OneLab
-Files:
-* core/src/main/java/org/apache/accumulo/core/bloomfilter/*
+Files (in core/src/main/java/):
+* org/apache/accumulo/core/bloomfilter/*
Copyright (c) 2005, European Commission project OneLab under contract
034819
(http://www.one-lab.org)
@@ -244,12 +244,12 @@ Files:
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-## JQuery 3.6.1 (https://jquery.com/)
+## JQuery 3.7.1 (https://jquery.com/)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/*
+Files (in server/monitor/src/main/resources/):
+* org/apache/accumulo/monitor/resources/external/jquery/*
- jQuery JavaScript Library v3.6.1
+ jQuery JavaScript Library v3.7.1
https://jquery.com/
Includes Sizzle.js
@@ -259,7 +259,7 @@ Files:
Released under the MIT license
https://jquery.org/license
- Date: 2022-08-26T17:52Z
+ Date: 2023-08-28T13:37Z
Text of the MIT License:
@@ -286,8 +286,8 @@ Files:
## Flot 4.2.6 (https://github.com/flot/flot)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/*
+Files (in server/monitor/src/main/resources/):
+* org/apache/accumulo/monitor/resources/external/flot/*
Copyright (c) 2007-2014 IOLA and Ole Laursen
@@ -313,27 +313,29 @@ Files:
* 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)
## Bootstrap Icons v1.11.1 (https://icons.getbootstrap.com/)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
+Files (in server/monitor/src/main/resources/):
+*
org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
+* org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
Copyright 2019-2023 The Bootstrap Authors
Licensed under MIT (https://github.com/twbs/icons/blob/main/LICENSE)
## DataTables 1.13.6 (https://datatables.net)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/**/*
+Files (in server/monitor/src/main/resources/):
+* org/apache/accumulo/monitor/resources/external/datatables/**/*
Copyright (c) 2008-2023 SpryMedia Ltd
Licensed under the MIT license (see above)
diff --git a/assemble/src/main/resources/LICENSE
b/assemble/src/main/resources/LICENSE
index e01f6ae5bb..71d4958aec 100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@ -211,10 +211,8 @@ to the terms and conditions of the following licenses.
## Software from the European Commission project OneLab
-Files:
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
+Files (in lib/accumulo-core-*.jar):
+* org/apache/accumulo/core/bloomfilter/*
Copyright (c) 2005, European Commission project OneLab under contract
034819
(http://www.one-lab.org)
@@ -246,12 +244,12 @@ Files:
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-## JQuery (https://jquery.com/)
+## JQuery 3.7.1 (https://jquery.com/)
-Files:
-* jquery-*.js
+Files (in lib/accumulo-monitor-*.jar):
+* org/apache/accumulo/monitor/resources/external/jquery/*
- jQuery JavaScript Library v3.6.1
+ jQuery JavaScript Library v3.7.1
https://jquery.com/
Includes Sizzle.js
@@ -261,7 +259,7 @@ Files:
Released under the MIT license
https://jquery.org/license
- Date: 2022-08-26T17:52Z
+ Date: 2023-08-28T13:37Z
Text of the MIT License:
@@ -286,7 +284,10 @@ Files:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-## Flot (https://github.com/flot/flot)
+## 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
@@ -316,25 +317,25 @@ Files:
## 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)
## Bootstrap Icons v1.11.1 (https://icons.getbootstrap.com/)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
+Files (in lib/accumulo-monitor-*.jar):
+*
org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
+* org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
Copyright 2019-2023 The Bootstrap Authors
Licensed under MIT (https://github.com/twbs/icons/blob/main/LICENSE)
## DataTables 1.13.6 (https://datatables.net)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/**/*
+Files (in lib/accumulo-monitor-*.jar):
+* org/apache/accumulo/monitor/resources/external/datatables/**/*
Copyright (c) 2008-2023 SpryMedia Ltd
Licensed under the MIT license (see above)
diff --git a/core/src/main/appended-resources/META-INF/LICENSE
b/core/src/main/appended-resources/META-INF/LICENSE
index 53d4bad379..621e3fd1dd 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -8,8 +8,8 @@ to the terms and conditions of the following licenses.
## Software from the European Commission project OneLab
-Files:
-* core/src/main/java/org/apache/accumulo/core/bloomfilter/*
+Files (in lib/accumulo-core-*.jar):
+* org/apache/accumulo/core/bloomfilter/*
Copyright (c) 2005, European Commission project OneLab under contract
034819
(http://www.one-lab.org)
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE
b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index e4628b6307..7b5cfa4c72 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -6,12 +6,12 @@ The Apache Accumulo project contains subcomponents with
separate
copyright notices and license terms. Your use of these is subject
to the terms and conditions of the following licenses.
-## JQuery 3.6.1 (https://jquery.com/)
+## JQuery 3.7.1 (https://jquery.com/)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/*
+Files (in lib/accumulo-monitor-*.jar):
+* org/apache/accumulo/monitor/resources/external/jquery/*
- jQuery JavaScript Library v3.6.1
+ jQuery JavaScript Library v3.7.1
https://jquery.com/
Includes Sizzle.js
@@ -21,7 +21,7 @@ Files:
Released under the MIT license
https://jquery.org/license
- Date: 2022-08-26T17:52Z
+ Date: 2023-08-28T13:37Z
Text of the MIT License:
@@ -48,8 +48,8 @@ Files:
## Flot 4.2.6 (https://github.com/flot/flot)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/*
+Files (in lib/accumulo-monitor-*.jar):
+* org/apache/accumulo/monitor/resources/external/flot/*
Copyright (c) 2007-2014 IOLA and Ole Laursen
@@ -75,27 +75,29 @@ Files:
* 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)
## Bootstrap Icons v1.11.1 (https://icons.getbootstrap.com/)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
+Files (in lib/accumulo-monitor-*.jar):
+*
org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap-icons.css
+* org/apache/accumulo/monitor/resources/external/bootstrap/fonts/*
Copyright 2019-2023 The Bootstrap Authors
Licensed under MIT (https://github.com/twbs/icons/blob/main/LICENSE)
## DataTables 1.13.6 (https://datatables.net)
-Files:
-*
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/**/*
+Files (in lib/accumulo-monitor-*.jar):
+* org/apache/accumulo/monitor/resources/external/datatables/**/*
Copyright (c) 2008-2023 SpryMedia Ltd
Licensed under the MIT license (see above)
