From e3a655284bf13a07ffa909aefcdff58da53066d0 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Fri, 10 Jan 2025 10:55:24 -0800 Subject: [PATCH 1/2] Refer to CNCF allowlist for 3rd-party licenses approved for inclusion in CNCF repos This came up in https://github.com/open-telemetry/opentelemetry-js/pull/5305 Refs: https://github.com/open-telemetry/community/issues/2504 --- guides/contributor/processes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/contributor/processes.md b/guides/contributor/processes.md index 5f191cbca..3a1e653d7 100644 --- a/guides/contributor/processes.md +++ b/guides/contributor/processes.md @@ -207,8 +207,8 @@ you will need to [retain the original copyright notice](https://github.com/cncf/ Any contributed third-party code must originally be Apache 2.0-Licensed or must carry a permissive software license that is compatible when combining with -Apache 2.0 License. At this moment, BSD and MIT are the only -[OSI-approved licenses](https://opensource.org/licenses/alphabetical) known to be compatible. +Apache 2.0 License. The CNCF maintains a list of licenses approved for inclusion +in a CNCF codebase [here](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#approved-licenses-for-allowlist). If you make substantial changes to the third-party code, _prepend_ the contributed third party file with OpenTelemetry's copyright notice. From 41b543afe34f9767b171a8d5ecca7126049a4fc2 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Tue, 14 Jan 2025 16:51:12 -0800 Subject: [PATCH 2/2] mention and refer to the CNCF conditions for including third-party code --- guides/contributor/processes.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guides/contributor/processes.md b/guides/contributor/processes.md index 3a1e653d7..92d30217c 100644 --- a/guides/contributor/processes.md +++ b/guides/contributor/processes.md @@ -207,8 +207,9 @@ you will need to [retain the original copyright notice](https://github.com/cncf/ Any contributed third-party code must originally be Apache 2.0-Licensed or must carry a permissive software license that is compatible when combining with -Apache 2.0 License. The CNCF maintains a list of licenses approved for inclusion -in a CNCF codebase [here](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#approved-licenses-for-allowlist). +Apache 2.0 License. The [CNCF Allowlist License Policy](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#cncf-allowlist-license-policy) +describes the requirements for including third-party code in CNCF codebases, +along with a list of approved compatible licenses. If you make substantial changes to the third-party code, _prepend_ the contributed third party file with OpenTelemetry's copyright notice.