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.

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

Doc: update the NOTICE and LICENSE files #812

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

tuhaihe
Copy link
Member

@tuhaihe tuhaihe commented Dec 24, 2024

Fixes #ISSUE_Number

What does this PR do?

Before donating Cloudberry to the Apache Incubator, we made some adjustments to LICENSE and NOTICE files, as reflected in the git blame history. However, those changes introduced unnecessary entries that didn't fully align with Apache guidelines. This commit refines these files to better comply with Apache standards and reflects the latest changes in the project source code.

The COPYRIGHT file, inherited from the PostgreSQL upstream, served a similar purpose as the NOTICE file. As it is redundant, it has been removed from this commit.

Type of Change

  • Bug fix (non-breaking change)
  • New feature (non-breaking change)
  • Breaking change (fix or feature with breaking changes)
  • Documentation update

Breaking Changes

Test Plan

  • Unit tests added/updated
  • Integration tests added/updated
  • Passed make installcheck
  • Passed make -C src/test installcheck-cbdb-parallel

Impact

Performance:

User-facing changes:

Dependencies:

Checklist

Additional Context

CI Skip Instructions


Before donating Cloudberry to the Apache Incubator, we made some
adjustments to LICENSE and NOTICE files, as reflected in the git blame
history. However, those changes introduced unnecessary entries that
didn't fully align with Apache guidelines. This commit refines these
files to better comply with Apache standards and reflects the latest
changes in the project source code.

The COPYRIGHT file, inherited from the PostgreSQL upstream, served a
similar purpose as the NOTICE file. As it is redundant, it has been
removed from this commit.
Comment on lines -3 to -4
Copyright (c) 2016-2023 HashData Technology Limited. or its affiliates. All
Rights Reserved.
Copy link
Member Author

Choose a reason for hiding this comment

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

As Cloudberry has been donated to ASF and the SGA has been signed, delete the HashData copyright notice directly here.

@tuhaihe
Copy link
Member Author

tuhaihe commented Dec 24, 2024

Notes for your information:

  • the COPYRIGHT file, inherited from PostgreSQL, served a similar purpose as the NOTICE file. So delete it directly.
  • For the old NOTICE, like libuv, Zstandard software and Xerces-C descriptions, they were added incorrectly before joining the ASF last year. Cloudberry does not include their codes, so delete these lines directly.

@avamingli
Copy link
Contributor

  • like libuv, Zstandard software and Xerces-C descriptions, they were added incorrectly before joining the ASF last year. Cloudberry does not include their codes, so delete these lines directly.

libuv is used in ic_proxy since Greenplum:

Align the copyright description with the LICENSE and NOTICE.
@avamingli
Copy link
Contributor

  • Zstandard, Xerces

They are used in codes too.

Comment on lines -697 to 710
"Greenplum Database version of PostgreSQL Database Management System\n"
"Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group\n\n"
"Portions Copyright (c) 2014-Present VMware, Inc. or its affiliates.\n\n"
"Portions Copyright (c) 2011-2014 EMC\n\n"
"Apache Cloudberry (Incubating)\n"
"Copyright 2024 The Apache Software Foundation\n\n"
"This product includes software developed at\n"
"The Apache Software Foundation (http://www.apache.org/).\n\n"
"This product contains significant parts that were originally based on software\n"
"from VMware, Inc. or its affiliates. (Greenplum Database<https://www.greenplum.org/>).\n"
"Copyright (c) 2004-2020 VMware, Inc. or its affiliates.\n"
"License under the Apache License 2.0.\n\n"
"This product contains significant parts that were orginally based on software\n
"from PostgreSQL Global Development Group (PostgreSQL 14.4 <https://www.postgresql.org/>).\n"
"Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group\n"
"Portions Copyright (c) 1994, The Regents of the University of California\n"
"License under the PostgreSQL License.\n\n"
"This software is based on Postgres95, formerly known as Postgres, which\n"
"contains the following notice:\n\n"
"Portions Copyright (c) 1994, The Regents of the University of California\n\n"
"Permission to use, copy, modify, and distribute this software and its\n"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why modify the history?

@avamingli
Copy link
Contributor

If you make any modifications to the C code, it's important to note that you typically cannot use the "skip CI" flag. Even small changes, like adjustments to the output text, may result in regression differences.

@tuhaihe
Copy link
Member Author

tuhaihe commented Dec 24, 2024

  • Zstandard, Xerces

They are used in codes too.

Ok. I want to confirm that if these three project codes are included in the repo, or just link them dynamically?

@tuhaihe
Copy link
Member Author

tuhaihe commented Dec 24, 2024

If you make any modifications to the C code, it's important to note that you typically cannot use the "skip CI" flag. Even small changes, like adjustments to the output text, may result in regression differences.

yes, correct. Will remove the tag to trigger the CI again.

@tuhaihe tuhaihe changed the title [skip ci] Doc: update the NOTICE and LICENSE files Doc: update the NOTICE and LICENSE files Dec 24, 2024
@tuhaihe tuhaihe marked this pull request as draft December 24, 2024 09:37
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.

2 participants