Skip to content

Conversation

@captainzmc
Copy link
Member

@captainzmc captainzmc commented Dec 4, 2022

What changes were proposed in this pull request?

We had fix NOTICE and LICENSE in HDDS-7567 and HDDS-7568 in src. We should also update the NOTICE and LICENSES in license/bin/.

In this patch, we mainly update the LICENSE and NOTICE that need to be modified, and delete the not needed (Some are no longer used in the project, and some need to change the format from html to txt).

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-7587

How was this patch tested?

No need.

@captainzmc
Copy link
Member Author

hi, @szetszwo, could you help review this PR? After this is done we will start Ozone RC2.

@kaijchen kaijchen changed the title HDDS-7587. update NOTICE and LICENSE in license/bin/ HDDS-7587. Update NOTICE and LICENSE in license/bin/ Dec 5, 2022
@szetszwo
Copy link
Contributor

szetszwo commented Dec 5, 2022

@captainzmc , I am traveling so that I may not be able to review this for a few days.

@kaijchen, would you be able to review this?

@kaijchen
Copy link
Member

kaijchen commented Dec 7, 2022

The current change looks good. @szetszwo do we need to check licenses for indirect dependencies also?

@szetszwo
Copy link
Contributor

szetszwo commented Dec 7, 2022

Dependencies of dependencies (including so-called "transitive dependencies") are no different from first-order dependencies for the purposes of assembling LICENSE and NOTICE: LICENSE and NOTICE need only be modified to accommodate them only if their bits are bundled.

@kaijchen , the above is quoted from https://infra.apache.org/licensing-howto.html

@szetszwo
Copy link
Contributor

szetszwo commented Dec 8, 2022

@captainzmc , I am checking the license and notice.

  • The ratis notice somehow is missing.
  • How about updating the ratis and ratis-thirdparty version to 2.4.1 and 1.0.3?

Copy link
Contributor

@szetszwo szetszwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@captainzmc , thanks a lot for working on this! Tried the following:

  1. Generate the release tarball and untar it.
  2. Get the jar list: ls share/ozone/lib/ > jar.txt
  3. Check the license for each jar.

The jar list has 267 lines. I checked 144 lines so far. Got the following changes: https://issues.apache.org/jira/secure/attachment/13053665/4039_review.patch

@captainzmc
Copy link
Member Author

Thanks @szetszwo for the patch provided. I will continue to check all jars and update the LICENSE.
About upgrading ratis to 2.4.1, I recommend not upgrading for in Ozone 1.3.0. Mainly for stability.
We have tested Ozone-1.3.0 use ratis 2.4.0 and found no problem. Upgrade 2.4.1 I'm afraid we don't have time to run the stability test. In addition, I have verified 2.4.1 before, and it seems that Ozone CI has some OOM problems.

@szetszwo
Copy link
Contributor

szetszwo commented Dec 8, 2022

@captainzmc , sure, we can upgrade Ratis later.

Will continue checking the license tomorrow.

@szetszwo
Copy link
Contributor

szetszwo commented Dec 9, 2022

@captainzmc , just have check all the remaining licenses; see https://issues.apache.org/jira/secure/attachment/13053715/4039_review2.patch

@captainzmc
Copy link
Member Author

Thanks @szetszwo! I had updated LICENSE.txt.

@szetszwo
Copy link
Contributor

szetszwo commented Dec 9, 2022

The ratis notice somehow is missing.

We already have NOTICE-ratis-thirtparty-misc.txt so that it is okay. We should update it as below. BTW, there is a TYPO in the file name of NOTICE-ratis-thirtparty-misc.txt -- "thirtparty" was misspelled.

diff --git a/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirtparty-misc.txt b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirdparty-misc.txt
similarity index 94%
rename from hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirtparty-misc.txt
rename to hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirdparty-misc.txt
index a4915c6ae..c47cb75fe 100644
--- a/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirtparty-misc.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/licenses/NOTICE-ratis-thirdparty-misc.txt
@@ -1,5 +1,5 @@
 Apache Ratis
-Copyright 2021 The Apache Software Foundation
+Copyright 2017-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -316,25 +316,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -----------------------------------------------------------------------
-This product uses the dropwizard-hadoop-metrics2.
-
-Copyright 2016 Josh Elser
-
-Licensed under the Apache License v2.0
-
------------------------------------------------------------------------
-This product uses https://github.com/mbocek/docker-ganglia/
-
-Contributed by Michal Bocek
-
-Licensed under the Apache License v2.0
-https://github.com/mbocek/docker-ganglia/blob/master/LICENSE
-
------------------------------------------------------------------------
-This product uses https://github.com/graphite-project/docker-graphite-statsd
-
-Copyright (c) 2013-2016 Nathan Hopkins
-
-Licensed under the MIT License

@captainzmc
Copy link
Member Author

Thanks @szetszwo for the advice, Just had updated the ratis-thirdparty NOTICE.

Copy link
Contributor

@szetszwo szetszwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 the change looks good.

@captainzmc
Copy link
Member Author

Thanks @szetszwo @kaijchen for the review. Let's merge this. I will start 1.3.0 RC2.

@captainzmc captainzmc merged commit a9bb088 into apache:master Dec 10, 2022
@kaijchen
Copy link
Member

Thanks @captainzmc and @szetszwo for checking all the dependencies.

captainzmc added a commit that referenced this pull request Dec 10, 2022
* update NOTICE and LICENSE in license/bin/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants