This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch ozone-2.0
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 22d2507ef1cdf1f0cb8c05d96ece94cc1dfcb2d3
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Wed Mar 26 01:57:27 2025 -0700

    HDDS-12684. Update NOTICE and LICENSE file (#8160)
    
    (cherry picked from commit bab26a43fa7a222ddd3f919ea99cfcf8984286a7)
---
 NOTICE.txt                                         |  2 +-
 hadoop-ozone/dist/src/main/license/bin/LICENSE.txt |  6 ++--
 hadoop-ozone/dist/src/main/license/bin/NOTICE.txt  |  9 +++++-
 .../license/bin/licenses/LICENSE-org.jline.txt     | 35 ++++++++++++++++++++++
 .../main/license/bin/licenses/NOTICE-hadoop.txt    |  9 +++---
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index cc4e3c58b3..6a2e7e0ab9 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Ozone
-Copyright 2024 The Apache Software Foundation
+Copyright 2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt 
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index b291afc568..8121513331 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -324,6 +324,7 @@ Apache License 2.0
    io.grpc:grpc-protobuf
    io.grpc:grpc-protobuf-lite
    io.grpc:grpc-stub
+   io.grpc:grpc-util
    io.jaegertracing:jaeger-client
    io.jaegertracing:jaeger-core
    io.jaegertracing:jaeger-thrift
@@ -374,7 +375,7 @@ Apache License 2.0
    org.apache.hadoop:hadoop-hdfs
    org.apache.hadoop:hadoop-hdfs-client
    org.apache.hadoop:hadoop-shaded-guava
-   org.apache.hadoop:hadoop-shaded-protobuf
+   org.apache.hadoop:hadoop-shaded-protobuf_3_25
    org.apache.httpcomponents:httpasyncclient
    org.apache.httpcomponents:httpcore
    org.apache.httpcomponents:httpcore-nio
@@ -405,7 +406,8 @@ Apache License 2.0
    org.apache.ratis:ratis-client
    org.apache.ratis:ratis-common
    org.apache.ratis:ratis-grpc
-   org.apache.ratis:ratis-metrics
+   org.apache.ratis:ratis-metrics-api
+   org.apache.ratis:ratis-metrics-dropwizard3
    org.apache.ratis:ratis-proto
    org.apache.ratis:ratis-server
    org.apache.ratis:ratis-server-api
diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt 
b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
index 44492fd26f..1d4fd7e82b 100644
--- a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Ozone
-Copyright 2022 The Apache Software Foundation
+Copyright 2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -508,3 +508,10 @@ The Apache Software Foundation (http://www.apache.org/).
 ====================
 ratis-thirdparty-misc is a shaded dependency which includes additional 3rd 
party dependencies in shaded form.
 For the detailed list of the dependencies and the associated NOTICE file see 
licenses/NOTICE-ratis-thirdparty-misc.txt.
+
+====================
+Apache Hadoop Third-party Libs
+Copyright 2020 and onwards The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git 
a/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.jline.txt 
b/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.jline.txt
new file mode 100644
index 0000000000..b62fe45716
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.jline.txt
@@ -0,0 +1,35 @@
+Copyright (c) 2002-2023, the original author or authors.
+All rights reserved.
+
+https://opensource.org/licenses/BSD-3-Clause
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
+
diff --git a/NOTICE.txt 
b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt
similarity index 86%
copy from NOTICE.txt
copy to hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt
index cc4e3c58b3..f6715f7beb 100644
--- a/NOTICE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt
@@ -1,5 +1,5 @@
-Apache Ozone
-Copyright 2024 The Apache Software Foundation
+Apache Hadoop
+Copyright 2006 and onwards The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -29,5 +29,6 @@ code and source code.
 The following provides more details on the included cryptographic software:
 
 This software uses the SSL libraries from the Jetty project written
-by mortbay.org abd BouncyCastle Java cryptography APIs written by the
- Legion of the Bouncy Castle Inc.
+by mortbay.org.
+Hadoop Yarn Server Web Proxy uses the BouncyCastle Java
+cryptography APIs written by the Legion of the Bouncy Castle Inc.


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to