feat: resolved conflics with previous branches

.github/workflows/helm-test.yaml

@@ -122,10 +122,10 @@ jobs:
 
       - name: Run chart-testing (install)
         run: |
-          cp deployment/helm/local/storage/pv-data.yaml charts/digital-product-pass/templates/pv-data.yaml
+          cp deployment/local/storage/pv-data.yaml charts/digital-product-pass/templates/pv-data.yaml
           rm charts/digital-product-pass/templates/pvc-data.yaml
-          cp deployment/helm/local/storage/pvc-data.yaml charts/digital-product-pass/templates/pvc-data.yaml
+          cp deployment/local/storage/pvc-data.yaml charts/digital-product-pass/templates/pvc-data.yaml
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
           ct install --charts charts/digital-product-pass --helm-extra-set-args "--set=frontend.image.tag=${{ env.TAG }} --set=frontend.image.repository=${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE}} --set=backend.image.tag=${{ env.TAG }} --set=backend.image.repository=${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE}}"
-        if: steps.list-changed.outputs.changed == 'true'
+        if: steps.list-changed.outputs.changed == 'true'

CHANGELOG.md

@@ -25,6 +25,91 @@
 
 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.0.3] - 02-02-2024
+## Added
+- Added Frameagreement conditions to the provider configuration
+- Added Unit Tests for Managers and for Services
+- Added changes from version `v1.0.0` to version `v2.0.0` for every component involved
+- Added iconMapping for all components involved in DPP `v2.0.0`
+- Added multi-language feature that supports currently `EN` and `DE`
+- Added back button in the welcome page
+- Added `timeToLive` attribute to discovery service model in the dpp-backed
+- Added `readOnlyRootFilesystem` to the container security context in helm charts
+- Added Serial Part aspect in the drill down components
+- Added `notice.md` to include **Notice for docker images** section to be only part of DockerHub description
+
+## Updated
+- Cleaned up necessary scripts
+-Refactored the DPP and IRS postman collections
+- Updated the deployment and testing directory structure and their references in relevant documentation
+- Updated license header and deployment directory references in the following readme files:
+    - Admin guide
+    - Arc42
+    - Getting-Started guide
+- Updated test directory stricture in dpp-backend
+- Updated the app url from [https://materialpass.int.demo.catena-x.net](https://materialpass.int.demo.catena-x.net) to [https://dpp.int.demo.catena-x.net](https://dpp.int.demo.catena-x.net)
+- Updated the payloads of asset, policies, contract definition, digital twin and its aspects to align with the DPPTriangle document v1.1.0
+- Updated the following frontend content:
+    - Condition for "commercial.warranty" in General Cards
+    - Mocked passports
+    - Loading page translation
+    - Translation files
+    - Characteristics component
+    - Identification component
+    - Sustainability component
+    - Typology component
+- Updated helm template to provide security context values from helm vaules file
+- Updated kics workflow
+- Updated user manual, deployment guide
+- Updated year 2024 to the license headers
+- Updated diagrams to an editable version in `.svg` in business statement readme
+- Updated `README.md` and `UNIT_TESTS.md` for the dpp-backend
+- Updated versions in docker workflows and setup-java action
+- Refactor docker workflows
+- Updated **Notice for docker images** section in a main `README.md`
+
+
+## [released]
+## [v2.0.2] - 02-02-2024
+## Added
+- Added Frameagreement conditions to the provider configuration
+- Added Unit Tests for Managers and for Services
+- Added changes from version `v1.0.0` to version `v2.0.0` for every component involved
+- Added iconMapping for all components involved in DPP `v2.0.0`
+- Added multi-language feature that supports currently `EN` and `DE`
+- Added back button in the welcome page
+- Added `timeToLive` attribute to discovery service model in the dpp-backed
+- Added `readOnlyRootFilesystem` to the container security context in helm charts
+
+
+## Updated
+- Cleaned up necessary scripts
+-Refactored the DPP and IRS postman collections
+- Updated the deployment and testing directory structure and their references in relevant documentation
+- Updated license header and deployment directory references in the following readme files:
+    - Admin guide
+    - Arc42
+    - Getting-Started guide
+- Updated test directory stricture in dpp-backend
+- Updated the app url from [https://materialpass.int.demo.catena-x.net](https://materialpass.int.demo.catena-x.net) to [https://dpp.int.demo.catena-x.net](https://dpp.int.demo.catena-x.net)
+- Updated the payloads of asset, policies, contract definition, digital twin and its aspects to align with the DPPTriangle document `v1.1.0`
+- Updated the following frontend content:
+    - Condition for "commercial.warranty" in General Cards
+    - Mocked passports
+    - Loading page translation
+    - Translation files
+    - Characteristics component
+    - Identification component
+    - Sustainability component
+    - Typology component
+- Updated helm template to provide security context values from helm vaules file
+
+
+## Deleted
+- Filtered out unnecessary nnecessary/unused files
+
+
 ## [released]
 ## [v2.0.1] - 03-01-2024
 ## Added

README.md

@@ -36,7 +36,7 @@ In particular, the appliction is used to access the battery passport data provid
 
 ### Software Version
 #### Helm Chart Version
-<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-2.0.1">2.0.1</a></pre>
+<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-2.1.0">2.1.0</a></pre>
 #### Application Version
 <pre id="app-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/v2.1.0">v2.1.0</a></pre>
 

deployment/README.md

@@ -50,7 +50,7 @@ Fill out the following required fields.
 - **Project:** project-material-pass
 - **Source:** Git repository where the application artifacts are stored (https://github.com/eclipse-tractusx/digital-product-pass)
 - **Revision:** select branch or a tag
-- **Path:** The path to the deployment (possible values: deployment/helm/edc-consumer, deployment/helm/edc-provider, charts/digital-product-pass)
+- **Path:** The path to the deployment (possible values: deployment/infrastructure/edc-consumer, deployment/infrastructure/edc-provider, charts/digital-product-pass)
 - **Cluster URL:** https://kubernetes.default.svc
 - **Namespace:** product-material-pass
 - **Plugin:** argocd-vault-plugin-helm-args