Skip to content

Commit

Permalink
Merge pull request eclipse-tractusx#920 from eclipse-tractusx/chore/c…
Browse files Browse the repository at this point in the history
…hange-license-and-legal-doc

chore: change license and legal documentation
  • Loading branch information
carslen authored Jun 7, 2024
2 parents e80980f + e9e2546 commit ba7883b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 6 deletions.
17 changes: 17 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,30 @@ Catena-X alliance focusing on parts traceability.

* <https://projects.eclipse.org/projects/automotive.tractusx>

## 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
more.

* <https://projects.eclipse.org/projects/automotive.tractusx/developer>

Getting started:

* https://eclipse-tractusx.github.io/docs/developer

The project maintains the source code repositories in the following GitHub organization:

* <https://github.com/eclipse-tractusx/>
Expand Down
2 changes: 1 addition & 1 deletion LICENSES/CC-BY-4.0.txt → LICENSE_non-code
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Attribution 4.0 International
Creative Commons Attribution 4.0 International

=======================================================================

Expand Down
26 changes: 21 additions & 5 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
<https://www.apache.org/licenses/LICENSE-2.0>.
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
Expand All @@ -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 (<https://github.com/sharanda/manrope>), with Reserved Font Name 'Manrope' under the SIL Open Font License 1.1 (OFL-1.1) see <https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL>
In addtion, we use 'Manrope' as font. Copyright (c) Mikhail Sharanda (<https://github.com/sharanda/manrope>), with
Reserved Font Name 'Manrope' under the SIL Open Font License 1.1 (OFL-1.1)
see <https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL>

Icons from svgrepo:

Expand Down

0 comments on commit ba7883b

Please sign in to comment.