From e9b10af21a8b83d2bd44b9e5b43ae8590cd0d798 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 25 Mar 2025 13:39:56 -0700 Subject: [PATCH 1/4] HDDS-12684. Update NOTICE and LICENSE file. Change-Id: I3ca090f1dee5ad0a4a38f9494aae1051273301af Update Change-Id: I0bb47ebace132321210f0e009257fd8013c36282 Restore org.ow2.asm Change-Id: Ifb3d1b85bc93a379f7d4bd25823278d5048edc56 Add back asm Change-Id: I62dbd9c82bc4cd6539b20484a3f4686efafc2403 --- NOTICE.txt | 2 +- .../dist/src/main/license/bin/LICENSE.txt | 4 ++- .../dist/src/main/license/bin/NOTICE.txt | 2 +- .../bin/licenses/LICENSE-org.jline.txt | 35 +++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.jline.txt diff --git a/NOTICE.txt b/NOTICE.txt index cc4e3c58b39f..6a2e7e0ab97a 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 b291afc568a9..880650e92ebf 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 @@ -355,6 +356,7 @@ Apache License 2.0 io.prometheus:simpleclient_common io.prometheus:simpleclient_dropwizard joda-time:joda-time + jakarta.inject:jakarta.inject jakarta.inject:jakarta.inject-api jakarta.validation:jakarta.validation-api javax.enterprise:cdi-api @@ -374,7 +376,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 diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt index 44492fd26f09..2cf85198f9a0 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/). 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 000000000000..b62fe457163c --- /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. + From ff0be66f068ad164491689569f3091f44e2b1aa5 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 25 Mar 2025 14:30:26 -0700 Subject: [PATCH 2/4] Add Hadoop and hadoop-thirdparty NOTICE. Change-Id: I095b0f042eee485629d00ce3ab2638ffdeba3aca --- .../dist/src/main/license/bin/NOTICE.txt | 7 ++++ .../license/bin/licenses/NOTICE-hadoop.txt | 34 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt index 2cf85198f9a0..1d4fd7e82b7a 100644 --- a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt @@ -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/NOTICE-hadoop.txt b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt new file mode 100644 index 000000000000..f6715f7beb08 --- /dev/null +++ b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-hadoop.txt @@ -0,0 +1,34 @@ +Apache Hadoop +Copyright 2006 and onwards The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Export Control Notice +--------------------- + +This distribution includes cryptographic software. The country in +which you currently reside may have restrictions on the import, +possession, use, and/or re-export to another country, of +encryption software. BEFORE using any encryption software, please +check your country's laws, regulations and policies concerning the +import, possession, or use, and re-export of encryption software, to +see if this is permitted. See for more +information. + +The U.S. Government Department of Commerce, Bureau of Industry and +Security (BIS), has classified this software as Export Commodity +Control Number (ECCN) 5D002.C.1, which includes information security +software using or performing cryptographic functions with asymmetric +algorithms. The form and manner of this Apache Software Foundation +distribution makes it eligible for export under the License Exception +ENC Technology Software Unrestricted (TSU) exception (see the BIS +Export Administration Regulations, Section 740.13) for both object +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. +Hadoop Yarn Server Web Proxy uses the BouncyCastle Java +cryptography APIs written by the Legion of the Bouncy Castle Inc. From 79b161d7400b63867a1af81c6e1f5e6e2e671080 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 25 Mar 2025 14:45:43 -0700 Subject: [PATCH 3/4] Remove incorrect update. Change-Id: I2d4708925084cdc83c2e864e54e192b15b5d6277 --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 880650e92ebf..77824583df70 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -356,7 +356,6 @@ Apache License 2.0 io.prometheus:simpleclient_common io.prometheus:simpleclient_dropwizard joda-time:joda-time - jakarta.inject:jakarta.inject jakarta.inject:jakarta.inject-api jakarta.validation:jakarta.validation-api javax.enterprise:cdi-api From 43e16bf3c3df2b1a985d42fad74eaa79eab89d69 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 25 Mar 2025 14:47:45 -0700 Subject: [PATCH 4/4] Fix update for HDDS-9192 Change-Id: I7084bb6cee67f14250c38a5587e0783fd22d4873 --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 77824583df70..812151333114 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -406,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