diff --git a/CHANGELOG.md b/CHANGELOG.md index 72497c9f6..beab4203c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,8 +24,16 @@ 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] +## [1.0.1] - 31-08-2023 +## Updated +- Fixed model parsing from payloads incoming from the `Digital Twin Registry` due to their latest hotfix. + - Ignored extra attributes not relevant for the Digital Product Pass application. + +- Added footer License notes in the all the documents inside `/docs` to comply with the TRGs. +- Updated the Trivy workflow to fix a bug related with the configuration ## [released] ## [1.0.0] - 16-08-2023 diff --git a/README.md b/README.md index e544cd98a..6337638db 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ In particular, the appliction is used to access the battery passport data provid ### Software Version #### Helm Chart Version -
1.0.0
+
1.0.1
#### Application Version -
v1.0.0
+
v1.0.1
## Application Preview diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index c63aabaa2..461fc888c 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -40,11 +40,11 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # 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: "1.0.0" +appVersion: "1.0.1" diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin3.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin3.java index 8d940c609..450463a36 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin3.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin3.java @@ -23,12 +23,14 @@ package org.eclipse.tractusx.productpass.models.dtregistry; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import java.util.ArrayList; +@JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_NULL) public class DigitalTwin3 { @JsonProperty("description") diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint3.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint3.java index b2c065f93..3d6c8056c 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint3.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint3.java @@ -23,6 +23,7 @@ package org.eclipse.tractusx.productpass.models.dtregistry; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Splitter; @@ -31,6 +32,7 @@ import java.util.List; import java.util.Map; +@JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_NULL) public class EndPoint3 { @JsonProperty("interface") diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel3.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel3.java index 76f566e4f..8fef2b01f 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel3.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel3.java @@ -23,11 +23,16 @@ package org.eclipse.tractusx.productpass.models.dtregistry; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import java.util.ArrayList; + +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonInclude(JsonInclude.Include.NON_NULL) public class SubModel3 { @JsonProperty("description") ArrayList description; diff --git a/docs/RELEASE_USER.md b/docs/RELEASE_USER.md index 56dba6e66..332afd466 100644 --- a/docs/RELEASE_USER.md +++ b/docs/RELEASE_USER.md @@ -23,6 +23,16 @@ # Release Notes Digital Product Pass Application User friendly relase notes without especific technical details. +**August 31 2023 (Version 1.0.1)** +*31.08.2023* + +### Updated + +#### Fixed the parsing of new attributes by ignoring any extra attributes incoming from the DTR. +Due to the latest hotfix released `v0.3.15-M1` of the `Digital Twin Registry`, was necesarry +to implement a hotfix that ignored all the extra attributes incoming from the DTR that were not relevant +to the Digital Product Pass Application core functionality. + **August 15 2023 (Version 1.0.0)** *15.08.2023* diff --git a/package-lock.json b/package-lock.json index 28767830c..fab229df3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "productpass-consumer-ui", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "productpass-consumer-ui", - "version": "1.0.0", + "version": "1.0.1", "dependencies": { "@mdi/font": "5.9.55", "@popperjs/core": "^2.11.2", diff --git a/package.json b/package.json index a8525cdde..dbf616a16 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "productpass-consumer-ui", - "version": "1.0.0", + "version": "1.0.1", "private": true, "scripts": { "serve": "vite --host localhost",