From daef7b04dd2e9c5b92bd1e5dbf2bc50a74fd032e Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Mon, 19 Feb 2024 18:22:43 +0100 Subject: [PATCH] chore(docs, versions): updated chart versions, updated changelogs and docs for release v2.1.3 --- CHANGELOG.md | 6 ++++++ LICENSE | 2 +- README.md | 4 ++-- charts/digital-product-pass/Chart.yaml | 4 ++-- charts/digital-product-pass/LICENSE | 2 +- charts/digital-product-pass/README.md | 2 +- docs/GETTING-STARTED.md | 2 +- docs/IaC.md | 2 +- docs/README.md | 4 ++-- docs/RELEASE.md | 2 +- docs/RELEASE_USER.md | 16 +++++++++++++++- docs/SECRETS_MANAGEMENT.md | 2 +- docs/admin guide/Admin_Guide.md | 2 +- docs/arc42/Arc42.md | 4 ++-- docs/cypress/CYPRESS.md | 2 +- docs/data retrieval guide/DataRetrievalGuide.md | 2 +- .../User Manual Product Viewer App.md | 2 +- .../digital-product-pass-backend/Chart.yaml | 4 ++-- .../charts/digital-product-pass-backend/LICENSE | 2 +- .../digital-product-pass-backend/README.md | 2 +- dpp-backend/digitalproductpass/README.md | 2 +- dpp-backend/digitalproductpass/mvnw.cmd | 2 +- dpp-backend/digitalproductpass/pom.xml | 2 +- .../models/auth/Credential.java | 2 +- .../digitalproductpass/models/auth/JwtToken.java | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 27 files changed, 52 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a981c5eb..7944263d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,12 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [released] +## [v2.1.3] - 19-02-2024 + +## Updated +- Renamed "Catena-X" to "Tractus-X" in header license prefix +- Removed BASF from the header license and license. ## [released] ## [v2.1.2] - 16-02-2024 diff --git a/LICENSE b/LICENSE index 3948337de..44126a419 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022, 2023 BMW AG, Henkel AG & Co. KGaA + Copyright 2022, 2024 BMW AG, Henkel AG & Co. KGaA Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 573aed2cf..33b66d7ba 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,9 @@ In particular, the appliction is used to access the battery passport data provid ### Software Version #### Helm Chart Version -
2.1.2
+
2.1.3
#### Application Version -
v2.1.2
+
v2.1.3
diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index 49319bde4..4f827ee8c 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -41,10 +41,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.1.2 +version: 2.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "2.1.2" +appVersion: "2.1.3" diff --git a/charts/digital-product-pass/LICENSE b/charts/digital-product-pass/LICENSE index 3948337de..44126a419 100644 --- a/charts/digital-product-pass/LICENSE +++ b/charts/digital-product-pass/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022, 2023 BMW AG, Henkel AG & Co. KGaA + Copyright 2022, 2024 BMW AG, Henkel AG & Co. KGaA Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charts/digital-product-pass/README.md b/charts/digital-product-pass/README.md index 00af49a49..135901379 100644 --- a/charts/digital-product-pass/README.md +++ b/charts/digital-product-pass/README.md @@ -23,7 +23,7 @@ # digital-product-pass -![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) +![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.3](https://img.shields.io/badge/AppVersion-2.1.3-informational?style=flat-square) A Helm chart for Tractus-X Digital Product Pass Kubernetes diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md index a01a36196..4d348e651 100644 --- a/docs/GETTING-STARTED.md +++ b/docs/GETTING-STARTED.md @@ -271,6 +271,6 @@ _integration_ (`https://dpp.int.demo.catena-x.net/`) environments. 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023, 2024 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/IaC.md b/docs/IaC.md index 5eccf3d62..91aaaecf3 100644 --- a/docs/IaC.md +++ b/docs/IaC.md @@ -73,6 +73,6 @@ Please see more details about Veracode tool integration [here](https://catenax-n 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/README.md b/docs/README.md index f8b2fd51d..b14ec3b3c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -46,7 +46,7 @@ Welcome to the documentation section, below you will find all the necesary docs - [API Documentation](#api-documentation) - [Postman Collection](#postman-collection) - [Swagger Documetation](#swagger-documetation) -- [NOTICE](#notice) + - [NOTICE](#notice) @@ -207,6 +207,6 @@ You can also deploy the application using the [deployment guidelines](./GETTING- 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023, 2024 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 9c8c9cedd..4bfc9a457 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -52,6 +52,6 @@ Navigate to the [Deploymment Guide](/deployment/README.md) and follow the steps. 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/RELEASE_USER.md b/docs/RELEASE_USER.md index 9b34cd337..dfcb22feb 100644 --- a/docs/RELEASE_USER.md +++ b/docs/RELEASE_USER.md @@ -24,6 +24,20 @@ # Release Notes Digital Product Pass Application User friendly relase notes without especific technical details. +**February 19 2024 (Version 2.1.3)** +*19.02.2024* + +### Updated + +#### Removed BASF from header licences and license +There was a request from the company BASF to remove their company name from the copyright notice and license information. + +#### Updated copyright header to Tractus-X instead of Catena-X +In the copyright headers the Digital Product Pass still had the name "Catena-X". It was removed to comply with the TRGs for legal licenses. + + + + **February 16 2024 (Version 2.1.2)** *16.02.2024* @@ -500,6 +514,6 @@ A deep dive on the application's operation and functionalities can be found in t 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/SECRETS_MANAGEMENT.md b/docs/SECRETS_MANAGEMENT.md index f08825ae5..fe30b0fed 100644 --- a/docs/SECRETS_MANAGEMENT.md +++ b/docs/SECRETS_MANAGEMENT.md @@ -122,6 +122,6 @@ Setting up Git Guradian for the project [gitguardian-shield](https://docs.gitgua 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/admin guide/Admin_Guide.md b/docs/admin guide/Admin_Guide.md index ca7734adc..8b012ab0d 100644 --- a/docs/admin guide/Admin_Guide.md +++ b/docs/admin guide/Admin_Guide.md @@ -589,7 +589,7 @@ The rest of the assets can be configured in the same way as the normal assets. 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023, 2024 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/arc42/Arc42.md b/docs/arc42/Arc42.md index a772becd8..f6192fcf9 100644 --- a/docs/arc42/Arc42.md +++ b/docs/arc42/Arc42.md @@ -445,7 +445,7 @@ The Job parameters (*jobId, globalAssetId, jobStatus*) will be stored in the `me The backend will also create a single node tree for the Digital Twin that is already available. Creating a `treeDataModel.json` file at the process directory. ##### Search API Sequence with IRS -![IRS Search Sequence](./media/irs/searchWithIRS.drawio.svg) +![IRS Search Sequence](./media/irs/searchWithIrs.drawio.svg) ##### Search API Flow with IRS ![IRS Search Flow](media/irs/irsSearchFlow.drawio.svg) @@ -811,6 +811,6 @@ An user needs to be able to understand easily the application interface, in orde 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023, 2024 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/cypress/CYPRESS.md b/docs/cypress/CYPRESS.md index 740d6b23d..4a26c3878 100644 --- a/docs/cypress/CYPRESS.md +++ b/docs/cypress/CYPRESS.md @@ -55,6 +55,6 @@ This is the documentation for Battery Passport App E2E Cypress test. 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/data retrieval guide/DataRetrievalGuide.md b/docs/data retrieval guide/DataRetrievalGuide.md index b91cbd169..3b699a58f 100644 --- a/docs/data retrieval guide/DataRetrievalGuide.md +++ b/docs/data retrieval guide/DataRetrievalGuide.md @@ -423,7 +423,7 @@ Here are the main authors and reviewers of this documentation: 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: 2022, 2023 BMW AG, Henkel AG & Co. KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co. KGaA - SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/docs/user manual/User Manual Product Viewer App.md b/docs/user manual/User Manual Product Viewer App.md index f53a55584..3c29a9137 100644 --- a/docs/user manual/User Manual Product Viewer App.md +++ b/docs/user manual/User Manual Product Viewer App.md @@ -223,6 +223,6 @@ In the below figure, the product battery contains one child component (13) named 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: 2022, 2023 BMW AG, Henkel AG & Co KGaA +- SPDX-FileCopyrightText: 2022, 2024 BMW AG, Henkel AG & Co KGaA - SPDX-FileCopyrightText: 2023, 2024 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/digital-product-pass diff --git a/dpp-backend/charts/digital-product-pass-backend/Chart.yaml b/dpp-backend/charts/digital-product-pass-backend/Chart.yaml index 63122b011..7401644c9 100644 --- a/dpp-backend/charts/digital-product-pass-backend/Chart.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/Chart.yaml @@ -41,10 +41,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.1.2 +version: 2.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "2.1.2" +appVersion: "2.1.3" diff --git a/dpp-backend/charts/digital-product-pass-backend/LICENSE b/dpp-backend/charts/digital-product-pass-backend/LICENSE index 3948337de..44126a419 100644 --- a/dpp-backend/charts/digital-product-pass-backend/LICENSE +++ b/dpp-backend/charts/digital-product-pass-backend/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022, 2023 BMW AG, Henkel AG & Co. KGaA + Copyright 2022, 2024 BMW AG, Henkel AG & Co. KGaA Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/dpp-backend/charts/digital-product-pass-backend/README.md b/dpp-backend/charts/digital-product-pass-backend/README.md index b7ed7468a..72704b8f7 100644 --- a/dpp-backend/charts/digital-product-pass-backend/README.md +++ b/dpp-backend/charts/digital-product-pass-backend/README.md @@ -23,7 +23,7 @@ # digital-product-pass-backend -![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) +![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.3](https://img.shields.io/badge/AppVersion-2.1.3-informational?style=flat-square) A Helm chart for Tractus-X Digital Product Pass Backend Kubernetes diff --git a/dpp-backend/digitalproductpass/README.md b/dpp-backend/digitalproductpass/README.md index 59d992350..742ccbe18 100644 --- a/dpp-backend/digitalproductpass/README.md +++ b/dpp-backend/digitalproductpass/README.md @@ -24,7 +24,7 @@

  Digital Product Pass Backend

-

Version: v2.1.2

+

Version: v2.1.3


diff --git a/dpp-backend/digitalproductpass/mvnw.cmd b/dpp-backend/digitalproductpass/mvnw.cmd index d647d4543..d1dc07b09 100644 --- a/dpp-backend/digitalproductpass/mvnw.cmd +++ b/dpp-backend/digitalproductpass/mvnw.cmd @@ -1,4 +1,4 @@ -rem Copyright (c) 2022, 2023 BMW AG, Henkel AG & Co. KGaA +rem Copyright (c) 2022, 2024 BMW AG, Henkel AG & Co. KGaA rem Copyright (c) 2022, 2023 Contributors to the CatenaX (ng) GitHub Organisation. rem Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/dpp-backend/digitalproductpass/pom.xml b/dpp-backend/digitalproductpass/pom.xml index 64652b7f7..a0bcb8797 100644 --- a/dpp-backend/digitalproductpass/pom.xml +++ b/dpp-backend/digitalproductpass/pom.xml @@ -34,7 +34,7 @@ org.eclipse.tractusx digitalproductpass - 2.1.2 + 2.1.3 jar Catena-X Digital Product Passport Backend Digital Product Passport Consumer Backend Reference Implementation System for Product Passport Consumer Frontend Application diff --git a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java index 757f58b01..e875dee36 100644 --- a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java @@ -27,7 +27,7 @@ * * Tractus-X - Product Passport Consumer Backend * - * Copyright (c) 2022, 2023 BMW AG, Henkel AG & Co. KGaA + * Copyright (c) 2022, 2024 BMW AG, Henkel AG & Co. KGaA * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java index b3a849909..371477e9e 100644 --- a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java @@ -27,7 +27,7 @@ * * Tractus-X - Product Passport Consumer Backend * - * Copyright (c) 2022, 2023 BMW AG, Henkel AG & Co. KGaA + * Copyright (c) 2022, 2024 BMW AG, Henkel AG & Co. KGaA * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/package-lock.json b/package-lock.json index ace835d0d..e4ff7ad24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "digital-product-pass-frontend", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "digital-product-pass-frontend", - "version": "2.1.2", + "version": "2.1.3", "dependencies": { "@mdi/font": "5.9.55", "@popperjs/core": "^2.11.2", diff --git a/package.json b/package.json index c9ea42bfd..158c00077 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "digital-product-pass-frontend", - "version": "2.1.2", + "version": "2.1.3", "private": true, "scripts": { "serve": "vite --host localhost",