From e9e2546d96f360dc6674b3a3dd4e6ca341fa7a1e Mon Sep 17 00:00:00 2001 From: Carsten Lenz Date: Fri, 7 Jun 2024 10:35:09 +0200 Subject: [PATCH] chore: change license and legal documentation Adopt changes to license and legal documentation (TRG-7), resolves #913. --- CONTRIBUTING.md | 17 ++++++++++++++ LICENSES/CC-BY-4.0.txt => LICENSE_non-code | 2 +- NOTICE.md | 26 +++++++++++++++++----- 3 files changed, 39 insertions(+), 6 deletions(-) rename LICENSES/CC-BY-4.0.txt => LICENSE_non-code (99%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7163eaf9ba9..de4043c2c93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,19 @@ Catena-X alliance focusing on parts traceability. * +## Project licenses + +The Tractus-X project uses the following licenses: + +* Apache-2.0 for code +* CC-BY-4.0 for non-code + +## Terms of Use + +This repository is subject to the Terms of Use of the Eclipse Foundation + +* https://www.eclipse.org/legal/termsofuse.php + ## Developer resources Information regarding source code management, builds, coding standards, and @@ -23,6 +36,10 @@ more. * +Getting started: + +* https://eclipse-tractusx.github.io/docs/developer + The project maintains the source code repositories in the following GitHub organization: * diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSE_non-code similarity index 99% rename from LICENSES/CC-BY-4.0.txt rename to LICENSE_non-code index 4ea99c213c5..8e4d8772cf7 100644 --- a/LICENSES/CC-BY-4.0.txt +++ b/LICENSE_non-code @@ -1,4 +1,4 @@ -Attribution 4.0 International +Creative Commons Attribution 4.0 International ======================================================================= diff --git a/NOTICE.md b/NOTICE.md index 6a15f4e5ffe..3e0cfa889f4 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -8,7 +8,8 @@ See the AUTHORS file(s) distributed with this work for additional information re ## Trademarks -Eclipse Tractus-X is a trademark of the Eclipse Foundation. Eclipse, and the Eclipse Logo are registered trademarks of the Eclipse Foundation. +Eclipse Tractus-X is a trademark of the Eclipse Foundation. Eclipse, and the Eclipse Logo are registered trademarks of +the Eclipse Foundation. ## Copyright @@ -18,12 +19,25 @@ source code repository logs. ## Declared Project Licenses -This program and the accompanying materials are made available under the terms -of the Apache License, Version 2.0 which is available at -. +The Tractus-X project uses the following licenses: + +- Apache-2.0 for code +- CC-BY-4.0 for non-code + +### Apache-2.0: + +This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 which +is available at https://www.apache.org/licenses/LICENSE-2.0. SPDX-License-Identifier: Apache-2.0 +### CC-BY-4.0: + +The materials in this repository are made available under the terms of the Creative Commons Attribution 4.0 +International License, which is available at https://spdx.org/licenses/CC-BY-4.0.html. + +SPDX-License-Identifier: CC-BY-4.0 + ## Source Code The project maintains the following source code repositories @@ -37,7 +51,9 @@ This project leverages the following third party content. See DEPENDENCIES file. -In addtion, we use 'Manrope' as font. Copyright (c) Mikhail Sharanda (), with Reserved Font Name 'Manrope' under the SIL Open Font License 1.1 (OFL-1.1) see +In addtion, we use 'Manrope' as font. Copyright (c) Mikhail Sharanda (), with +Reserved Font Name 'Manrope' under the SIL Open Font License 1.1 (OFL-1.1) +see Icons from svgrepo: