This is an automated email from the ASF dual-hosted git repository.
captainzmc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new fe86f3bb49 HDDS-7567. Invalid entries in LICENSE (#4020)
fe86f3bb49 is described below
commit fe86f3bb49186d7566a879629cf7bc1aa19d0a98
Author: Kaijie Chen <[email protected]>
AuthorDate: Fri Dec 2 17:03:39 2022 +0800
HDDS-7567. Invalid entries in LICENSE (#4020)
* HDDS-7567. Invalid entries in LICENSE
---
LICENSE.txt | 10 +++++-----
.../src/main/license/src/licenses/LICENSE-angular.txt | 2 +-
.../{LICENSE-angular.txt => LICENSE-bootstrap.txt} | 4 ++--
.../dist/src/main/license/src/licenses/LICENSE-d3.txt | 4 ++--
.../{LICENSE-angular.txt => LICENSE-glyphicons.txt} | 4 ++--
.../src/main/license/src/licenses/LICENSE-guava.txt | 13 +++++++++++++
.../src/main/license/src/licenses/LICENSE-jquery.txt | 2 +-
.../dist/src/main/license/src/licenses/LICENSE-nvd3.txt | 17 ++++++++++-------
8 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 76e979f283..021266844b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -207,8 +207,8 @@ licenses. This section summarizes those components and
their licenses.
See licenses/ for text of these licenses.
-Apache Software Foundation License 2.0
---------------------------------------
+Apache License 2.0
+------------------
hadoop-hdds/framework/src/main/resources/webapps/static/nvd3-1.8.5.min.js.map
hadoop-hdds/framework/src/main/resources/webapps/static/nvd3-1.8.5.min.css.map
@@ -221,15 +221,15 @@ BSD 3-Clause
------------
hadoop-hdds/framework/src/main/resources/webapps/static/d3-3.5.17.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
-hadoop-hdds/docs/themes/ozonedoc/static/fonts/glyphicons-*
-hadoop-hdds/docs/themes/ozonedoc/static/js/bootstrap.min.js
+
MIT License
-----------
hadoop-hdds/framework/src/main/resources/webapps/static/bootstrap-3.4.1
hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap-*
+hadoop-hdds/docs/themes/ozonedoc/static/js/bootstrap.min.js
+hadoop-hdds/docs/themes/ozonedoc/static/fonts/glyphicons-*
hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.8.0.min.js
hadoop-hdds/framework/src/main/resources/webapps/static/angular-nvd3-1.0.9.min.js
diff --git
a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
index 6f3880f4c2..4cb2ee959e 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2020 Google, Inc. http://angularjs.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git
a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-bootstrap.txt
similarity index 93%
copy from hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
copy to hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-bootstrap.txt
index 6f3880f4c2..e2640928b3 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-bootstrap.txt
@@ -1,6 +1,6 @@
-The MIT License
+The MIT License (MIT)
-Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+Copyright (c) 2011-2019 Twitter, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-d3.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-d3.txt
index c71e3f254c..ff3f2e5419 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-d3.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-d3.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015, Michael Bostock
+Copyright (c) 2010-2016, Michael Bostock
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -23,4 +23,4 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git
a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-glyphicons.txt
similarity index 93%
copy from hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
copy to hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-glyphicons.txt
index 6f3880f4c2..aba0312db8 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-glyphicons.txt
@@ -1,6 +1,6 @@
-The MIT License
+The MIT License (MIT)
-Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+Copyright (c) 2011-2019 GLYPHICONS.com.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-guava.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-guava.txt
new file mode 100644
index 0000000000..a6886f3cc6
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-guava.txt
@@ -0,0 +1,13 @@
+Copyright (C) 2007 The Guava Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-jquery.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-jquery.txt
index 4593054220..e3dbacb999 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-jquery.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-jquery.txt
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-nvd3.txt
b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-nvd3.txt
index 0955544cdf..ec98d9434d 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-nvd3.txt
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-nvd3.txt
@@ -1,10 +1,13 @@
Copyright (c) 2011-2014 Novus Partners, Inc.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this
-file except in compliance with the License. You may obtain a copy of the
License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either
- express or implied. See the License for the specific language governing
permissions and
- limitations under the License.
\ No newline at end of file
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
