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.

Sign up for GitHub

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

Trg 7.02 license and copyright header issue #77 #80

Merged
merged 11 commits into from
Nov 24, 2023
Merged

Trg 7.02 license and copyright header issue #77 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62a7abd
Update trivy workflow
adkumar1 Nov 15, 2023
7972610
github piepline
adkumar1 Nov 15, 2023
b16a7b2
update base image
adkumar1 Nov 15, 2023
c324132
removed apk
adkumar1 Nov 15, 2023
127740f
Merge pull request #27 from catenax-ng/trivy-update
adkumar1 Nov 17, 2023
7de8c13
Merge branch 'eclipse-tractusx:main' into main
dvasunin Nov 21, 2023
40afd1c
update for copyright headers to be compliant with TRG 7.02 and to fix…
dvasunin Nov 21, 2023
9c19187
updated build
adkumar1 Nov 21, 2023
1acc112
update all files in project for copyright headers to be compliant wit…
dvasunin Nov 22, 2023
00ff735
Merge remote-tracking branch 'origin/TRG-7.02-License-and-copyright-h…
dvasunin Nov 22, 2023
89a997b
Merge branch 'main' into TRG-7.02-License-and-copyright-header-77
dvasunin Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sdfactorypipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ jobs:
# readme-filepath: path/to/dedicated/notice-for-docker-image.md
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ jobs:
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "trivy-results.sarif"
sarif_file: "trivy-results.sarif"
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SDFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/org/eclipse/tractusx/selfdescriptionfactory/SelfDescriptionFactoryApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/ExceptionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/OpenApiConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2022 T-Systems International GmbH
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/SecurityRoles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...g/eclipse/tractusx/selfdescriptionfactory/service/converter/TermsAndConditionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...actusx/selfdescriptionfactory/service/converter/fcformat/LegalParticipantSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...ractusx/selfdescriptionfactory/service/converter/fcformat/ServiceOfferingSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions .../tractusx/selfdescriptionfactory/service/converter/gaiax/LegalParticipantSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...e/tractusx/selfdescriptionfactory/service/converter/gaiax/ServiceOfferingSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions .../tractusx/selfdescriptionfactory/service/converter/vrel3/LegalParticipantSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...e/tractusx/selfdescriptionfactory/service/converter/vrel3/ServiceOfferingSDConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/eclipse/tractusx/selfdescriptionfactory/service/wallet/CustodianWallet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#################################################################################
# Copyright (c) 2021,2022 T-Systems International GmbH
# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/static/SDFactoryApi-v22.10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
#################################################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,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.
#
# 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
################################################################################

openapi: 3.0.0
info:
version: "22.10"
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/static/SDFactoryApi-vRel3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
#################################################################################
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,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.
#
# 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
################################################################################

openapi: 3.0.0
info:
version: Release3
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/eclipse/tractusx/selfdescriptionfactory/SelfDescriptionFactoryApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/********************************************************************************
* Copyright (c) 2021,2022 T-Systems International GmbH
* Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2023 T-Systems International GmbH
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#################################################################################
# Copyright (c) 2021,2022 T-Systems International GmbH
# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
# Copyright (c) 2022,2023 T-Systems International GmbH
# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down