Skip to content

Commit

Permalink
Merge pull request #742 from eclipse-tractusx/main
Browse files Browse the repository at this point in the history 
build(2.0.0-rc8): merge main into dev
  • Loading branch information
@evegufy
evegufy authored May 15, 2024
2 parents de90360 + 1b23544 commit e357f08
Show file tree
Hide file tree
Showing 1,736 changed files with 16,190 additions and 5,204 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ dotnet_diagnostic.RS2008.severity = none

# IDE0073: File header
dotnet_diagnostic.IDE0073.severity = warning
#file_header_template = /********************************************************************************\n * Copyright (c) 2021,2022 BMW Group AG\n * Copyright (c) 2021,2022 Contributors to the CatenaX (ng) GitHub Organisation.\n *\n * \nSee the NOTICE file(s) distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This program and the accompanying materials are made available under the\n * terms of the \nApache License, Version 2.0 which is available at\n * https://www.apache.org/licenses/LICENSE-2.0.\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License \nis distributed on an "AS IS" BASIS, WITHOUT\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n * License for the specific language governing permissions and limitations\n * under the \nLicense. *\n * SPDX-License-Identifier: Apache-2.0\n ********************************************************************************/\n
#file_header_template = /********************************************************************************\n * Copyright (c) 2021,2022 BMW Group AG\n * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation\n *\n * \nSee the NOTICE file(s) distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This program and the accompanying materials are made available under the\n * terms of the \nApache License, Version 2.0 which is available at\n * https://www.apache.org/licenses/LICENSE-2.0.\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License \nis distributed on an "AS IS" BASIS, WITHOUT\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n * License for the specific language governing permissions and limitations\n * under the \nLicense. *\n * SPDX-License-Identifier: Apache-2.0\n ********************************************************************************/\n

# IDE0035: Remove unreachable code
dotnet_diagnostic.IDE0035.severity = warning
Expand Down
11 changes: 11 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ updates:
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"

# Github Actions
-
Expand All @@ -44,6 +49,9 @@ updates:
- "github-actions"
schedule:
interval: "weekly"
groups:
dependencies:
dependency-type: "production"

# Docker
-
Expand All @@ -58,3 +66,6 @@ updates:
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
dependencies:
dependency-type: "production"
2 changes: 1 addition & 1 deletion .github/workflows/administration-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iam-seeding.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maintenance-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/marketplace-app-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notification-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-package-push.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/portal-migrations.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-checks.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/processes-worker.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/provisioning-migrations.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/registration-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_candidate.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_iam-seeding.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_release_candidate.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/services-service.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-automation.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-dev.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion .tractusx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
6 changes: 3 additions & 3 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"commentend<!->": "-->",
"commentprefix<!->": "-",
"cx_header_default":[
"* Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation",
"* 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 @@ -29,7 +29,7 @@
" * SPDX-License-Identifier: Apache-2.0"
],
"cx_header_with_#":[
"Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation",
"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 @@ -47,7 +47,7 @@
" SPDX-License-Identifier: Apache-2.0"
],
"cx_header_with_<!->":[
"Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation",
"Copyright (c) 2024 Contributors to the Eclipse Foundation",
"-",
"- See the NOTICE file(s) distributed with this work for additional",
"- information regarding copyright ownership.",
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal Backend.

## 2.0.0-RC8

### Changes
* upgraded Npgsql and EntityFrameworkCore packages
* reworked year in file header

### Bugfix
* **Administration Service**
* adjusted DIM service accounts
* removed enum for framework credentials: to create a framework credential string values are used now instead of enums to be more flexible

### Technical Support
* **Dependabot**
* introduced grouping of pull request for version updates

## 2.0.0-RC7

### Bugfix
Expand Down
4 changes: 2 additions & 2 deletions DEPENDENCIES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ nuget/nuget/-/NJsonSchema/10.9.0, MIT, approved, #9300
nuget/nuget/-/Namotion.Reflection/2.1.2, MIT, approved, #9320
nuget/nuget/-/Newtonsoft.Json/13.0.1, MIT AND BSD-3-Clause, approved, #3266
nuget/nuget/-/Newtonsoft.Json/13.0.3, MIT AND BSD-3-Clause, approved, #3266
nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/8.0.2, PostgreSQL AND MIT, approved, #13972
nuget/nuget/-/Npgsql/8.0.2, PostgreSQL, approved, #13963
nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/8.0.4, PostgreSQL AND MIT, approved, #13972
nuget/nuget/-/Npgsql/8.0.3, PostgreSQL, approved, #13963
nuget/nuget/-/PasswordGenerator/2.1.0, MIT, approved, #3192
nuget/nuget/-/ReportPortal.Client/3.4.0, Apache-2.0, approved, #9298
nuget/nuget/-/ReportPortal.Shared/3.6.0, Apache-2.0, approved, #10587
Expand Down
2 changes: 1 addition & 1 deletion FILEHEADER.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ Currently the following templates are available:
This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0).

- SPDX-License-Identifier: Apache-2.0
- SPDX-FileCopyrightText: 2021-2024 Contributors to the Eclipse Foundation
- SPDX-FileCopyrightText: 2022 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/portal-backend
Empty file removed PACKAGES
View file
Empty file.
2 changes: 1 addition & 1 deletion docker/Dockerfile-administration-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-iam-seeding
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-maintenance-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-marketplace-app-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-notification-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-portal-migrations
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-processes-worker
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-provisioning-migrations
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-registration-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-services-service
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-dependencies.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ In order to update the executable jar run the following command from the root di
This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0).

- SPDX-License-Identifier: Apache-2.0
- SPDX-FileCopyrightText: 2021-2024 Contributors to the Eclipse Foundation
- SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/portal-backend
2 changes: 1 addition & 1 deletion scripts/get_current_version.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion scripts/pack_and_push_packages.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion scripts/pack_and_push_packages_local.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
6 changes: 3 additions & 3 deletions src/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"commentend<!->": "-->",
"commentprefix<!->": "-",
"cx_header_default":[
"* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation",
"* 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 @@ -29,7 +29,7 @@
" * SPDX-License-Identifier: Apache-2.0"
],
"cx_header_with_#":[
"Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation",
"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 @@ -47,7 +47,7 @@
" SPDX-License-Identifier: Apache-2.0"
],
"cx_header_with_<!->":[
"Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation",
"Copyright (c) 2024 Contributors to the Eclipse Foundation",
"-",
"- See the NOTICE file(s) distributed with this work for additional",
"- information regarding copyright ownership.",
Expand Down
Loading

0 comments on commit e357f08

Please sign in to comment.