Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDDS-7567. Invalid entries in LICENSE #4020

Merged
merged 6 commits into from
Dec 2, 2022
Merged

HDDS-7567. Invalid entries in LICENSE #4020

merged 6 commits into from
Dec 2, 2022

Conversation

kaijchen
Copy link
Contributor

@kaijchen kaijchen commented Dec 1, 2022 •
edited
Loading

What changes were proposed in this pull request?

  1. hadoop-hdds/docs/themes/ozonedoc/static/js/bootstrap.min.js
    is under "BSD 3-Clause" but it actually is "MIT License".
  2. hadoop-hdds/docs/themes/ozonedoc/static/fonts/glyphicons-*
    should be under the same license as bootstrap, which is "MIT License".
    According to https://glyphicons.com/old/license.html#old-halfings-bootstrap.
  3. hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
    is not found.
  4. "Apache Software Foundation License 2.0" should be "Apache License 2.0".
  5. Licenses referenced by LICENSE.txt are included in hadoop-ozone/dist/src/main/license/src/licenses.

Note: hadoop-hdds/framework/src/main/resources/webapps/static/d3-3.5.17.min.js
d3 3.5.17 was released in "BSD 3-Clause", but later versions has changed to
"ISC License", according to https://github.com/d3/d3/blob/main/LICENSE.

What is the link to the Apache JIRA

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

How was this patch tested?

No need.

@kerneltime
Copy link
Contributor

Thank you @kaijchen
cc @aswinshakil can you cross-check if the license changes are consistent?

@captainzmc
Copy link
Member

Hi @szetszwo , Can you help confirm the fix of these LICENSE?

szetszwo
szetszwo approved these changes Dec 1, 2022
View reviewed changes
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

Hi @kaijchen, I see @szetszwo mentioned in https://issues.apache.org/jira/browse/HDDS-7567 we need to be update the hadoop-ozone/dist/SRC/main/license/bin/NOTICE.txt. So can we change that in this PR, it should only be one line.

@kaijchen
Copy link
Contributor Author

kaijchen commented Dec 2, 2022

Hi @kaijchen, I see @szetszwo mentioned in https://issues.apache.org/jira/browse/HDDS-7567 we need to be update the hadoop-ozone/dist/SRC/main/license/bin/NOTICE.txt. So can we change that in this PR, it should only be one line.

I don't think it's a good idea to include it here. The LICENSE for binary package needs another look, we can change the NOTICE there or we can file another PR to bump it.

@kaijchen kaijchen changed the title HDDS-7567. HDDS-7567. Invalid entries in LICENSE HDDS-7567. Invalid entries in LICENSE Dec 2, 2022
@captainzmc
Copy link
Member

The LICENSE for binary package needs another look, we can change the NOTICE there or we can file another PR to bump it.

Ok, let's merge this PR first and solve these problems in another one. Thanks @kaijchen for the patch, and thanks @szetszwo for the review.

@captainzmc captainzmc merged commit fe86f3b into apache:master Dec 2, 2022
captainzmc pushed a commit that referenced this pull request Dec 2, 2022
@kaijchen @captainzmc
HDDS-7567. Invalid entries in LICENSE (#4020)
fad364e 
* HDDS-7567. Invalid entries in LICENSE
@kaijchen
Copy link
Contributor Author

kaijchen commented Dec 2, 2022

Thanks @szetszwo for the review, @captainzmc for the merge.
We need another Jira to check NOTICE and LICENSE under hadoop-ozone/dist/src/main/license/bin/.

@kaijchen kaijchen deleted the HDDS-7567 branch December 2, 2022 09:05
@captainzmc
Copy link
Member

captainzmc commented Dec 4, 2022 •
edited
Loading

Thanks @szetszwo for the review, @captainzmc for the merge. We need another Jira to check NOTICE and LICENSE under hadoop-ozone/dist/src/main/license/bin/.

In #4039 just had update the NOTICE and LICENSE under hadoop-ozone/dist/src/main/license/bin/. cc @szetszwo

Galsza pushed a commit to Galsza/ozone that referenced this pull request Dec 7, 2022
@kaijchen @Galsza
HDDS-7567. Invalid entries in LICENSE (apache#4020)
d6d6ddb 
* HDDS-7567. Invalid entries in LICENSE
errose28 added a commit to errose28/ozone that referenced this pull request Dec 12, 2022
@errose28
Merge branch 'master' into HDDS-6447
4b35b5e 
* master: (110 commits)
  HDDS-7472. EC: Fix NSSummaryEndpoint#getDiskUsage for EC keys (apache#3987)
  HDDS-5704. Ozone URI syntax description in help content needs to mention about ozone service id (apache#3862)
  HDDS-7555. Upgrade Ratis to 2.4.2-8b8bdda-SNAPSHOT. (apache#4028)
  HDDS-7541. FSO recursive delete directory with hierarchy takes much time for cleanup (apache#4008)
  HDDS-7581. Fix update-jar-report for snapshot (apache#4034)
  HDDS-7253. Fix exception when '/' in key name (apache#4038)
  HDDS-7579. Use Netty 4.1.77 for consistency (apache#4031)
  HDDS-7562. Suppress warning about long filenames in tar (apache#4017)
  HDDS-7563. Add a handler for under replicated Ratis containers in RM (apache#4025)
  HDDS-7497. Fix mkdir does not update bucket's usedNamespace (apache#3969)
  HDDS-7567. Invalid entries in LICENSE (apache#4020)
  HDDS-7575. Correct showing of RATIS-THREE icon in Recon UI (apache#4026)
  HDDS-7540. Let reusable workflow inherit secrets (apache#4012)
  HDDS-7568. Bump copyright year in NOTICE (apache#4018)
  HDDS-7394. OM RPC FairCallQueue decay decision metrics list caller username in the metric (apache#3878)
  HDDS-7510. Recon: Return number of open containers in `/clusterState` endpoint (apache#3989)
  HDDS-7561. Improve setquota, clrquota CLI usage (apache#4016)
  HDDS-6615. EC: Improve write performance by pipelining encode and flush (apache#3994)
  HDDS-7554. Recon UI should show DORMANT in pipeline status filter (apache#4010)
  HDDS-7540. Separate scheduled CI from push/PR workflows (apache#4004)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@szetszwo szetszwo szetszwo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaijchen @kerneltime @captainzmc @szetszwo