Skip to content
This repository has been archived by the owner on Oct 17, 2024. It is now read-only.

Commit

Permalink
correction of copyrights / correction of templates
Browse files Browse the repository at this point in the history
  • Loading branch information
jSchuetz88 committed Aug 6, 2024
1 parent b16fa5f commit ea408aa
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 92 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
name: Bug report
about: Create a report to help us improve
Expand Down
19 changes: 0 additions & 19 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
<!--
* Copyright (c) 2022,2023 Contributors to the Catena-X Association
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* 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.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
-->

## WHAT

_Briefly describe what your PR changes, which features it adds/modifies._
Expand Down
27 changes: 13 additions & 14 deletions .github/actions/setup-java/action.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
#
# #############################################################################
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# 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
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# 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
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#

# SPDX-License-Identifier: Apache-2.0
# #############################################################################
---
name: "Setup JDK 17"
description: "Setup JDK 17"
Expand Down
7 changes: 5 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
###############################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2022,2023 ZF Friedrichshafen AG
# Copyright (c) 2022,2023 Mercedes-Benz AG
# Copyright (c) 2022,2023 Contributors to the Catena-X Association
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -19,6 +19,9 @@
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
###############################################################
---

version: 2
updates:
# Maven
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/kics.yml_disabled
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# #############################################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2022,2023 ZF Friedrichshafen AG
# Copyright (c) 2022,2023 Mercedes-Benz AG
# Copyright (c) 2022,2023 Contributors to the Catena-X Association
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -19,6 +19,9 @@
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
# #############################################################################
---

name: "KICS"

on:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/trivy.yml_disabled
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# #############################################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2022,2023 ZF Friedrichshafen AG
# Copyright (c) 2022,2023 Mercedes-Benz AG
# Copyright (c) 2022,2023 Contributors to the Catena-X Association
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -19,6 +19,9 @@
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
# #############################################################################
---

name: "Trivy"

on:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/veracode.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
###############################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2022,2023 ZF Friedrichshafen AG
# Copyright (c) 2022,2023 Mercedes-Benz AG
# Copyright (c) 2022,2023 Contributors to the Catena-X Association
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -19,6 +19,9 @@
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
###############################################################
---

name: "Veracode"

on:
Expand Down
21 changes: 0 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2022,2023 ZF Friedrichshafen AG
# Copyright (c) 2022,2023 Mercedes-Benz AG
# Copyright (c) 2022,2023 Contributors to the Catena-X Association
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# 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.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

node_modules/
dist/
reports/
Expand Down
19 changes: 0 additions & 19 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
<!--
* Copyright (c) 2022,2023 Contributors to the Catena-X Association
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* 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.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
-->

# Changelog

All notable changes to this product will be documented in this file.
Expand Down
3 changes: 2 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This Code applies within all Project, Working Group, and Interest Group spaces a

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via [email protected]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via <[email protected]>. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.

Staff, Committers and Project Leads have the right to report, remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code, or to block temporarily or permanently any Contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. Any such actions will be reported to the Conduct Committee for transparency and record keeping.

Expand All @@ -68,6 +68,7 @@ Reports should be directed to <[email protected]>. It is the Conduc
The Eclipse Foundation takes all reports of potential Code violations seriously and is committed to confidentiality and a full investigation of all allegations. The identity of the reporter will be omitted from the details of the report supplied to the accused. Contributors who are being investigated for a potential Code violation will have an opportunity to be heard prior to any final determination. Those found to have violated the Code can seek reconsideration of the violation and disciplinary action decisions. Every effort will be made to have all matters disposed of within 60 days of the receipt of the complaint.

## Actions

Contributors who do not follow this Code in good faith may face temporary or permanent repercussions as determined by the Conduct Committee.

This Code does not address all conduct. It works in conjunction with our [Communication Channel Guidelines](https://www.eclipse.org/org/documents/communication-channel-guidelines/), [Social Media Guidelines](https://www.eclipse.org/org/documents/social_media_guidelines.php), [Bylaws](https://www.eclipse.org/org/documents/eclipse-foundation-be-bylaws-en.pdf), and [Internal Rules](https://www.eclipse.org/org/documents/ef-be-internal-rules.pdf) which set out additional protections for, and obligations of, all contributors. The Foundation has additional policies that provide further guidance on other matters.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Getting started:

The project maintains the following source code repositories

* https://github.com/eclipse-tractusx/testdata-provider/
* https://github.com/eclipse-tractusx/sldt-ontology-model

## Eclipse Development Process

Expand Down
21 changes: 13 additions & 8 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This content is produced and maintained by the Eclipse Tractus-X project.

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

See the AUTHORS file(s) distributed with this work for additional information regarding authorship.

Expand All @@ -23,21 +23,26 @@ 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.
### 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
### 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
in the GitHub organization https://github.com/eclipse-tractusx:
in the GitHub organization <https://github.com/eclipse-tractusx>:

* https://github.com/eclipse-tractusx/testdata-provider
* <https://github.com/eclipse-tractusx/sldt-ontology-model>

## Third-party Content

Expand Down

0 comments on commit ea408aa

Please sign in to comment.