From 8cbc91c0b867a909544d92a6dbc9a2c200755ea9 Mon Sep 17 00:00:00 2001 From: kss682 Date: Mon, 4 Nov 2024 14:11:00 +0100 Subject: [PATCH 1/5] Uprade EDC to 0.7.3 --- charts/tx-data-provider/Chart.yaml | 4 ++-- charts/umbrella/Chart.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/tx-data-provider/Chart.yaml b/charts/tx-data-provider/Chart.yaml index 5c2ebede..47f188c5 100644 --- a/charts/tx-data-provider/Chart.yaml +++ b/charts/tx-data-provider/Chart.yaml @@ -23,7 +23,7 @@ name: tx-data-provider description: A Helm chart for Kubernetes type: application -version: 0.1.1 +version: 0.1.2 appVersion: 0.0.1 dependencies: @@ -37,7 +37,7 @@ dependencies: condition: simple-data-backend.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/charts/dev - version: 0.7.1 + version: 0.7.3 condition: tractusx-connector.enabled - name: vault version: 0.20.0 diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 0809bc09..824eda38 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -80,18 +80,18 @@ dependencies: # TX Data Consumer 1 - name: tx-data-provider alias: dataconsumerOne - version: 0.1.1 + version: 0.1.2 repository: file://../tx-data-provider condition: dataconsumerOne.enabled # TX Data Providers - name: tx-data-provider - version: 0.1.1 + version: 0.1.2 repository: file://../tx-data-provider condition: tx-data-provider.enabled # TX Data Consumer 2 - name: tx-data-provider alias: dataconsumerTwo - version: 0.1.1 + version: 0.1.2 repository: file://../tx-data-provider condition: dataconsumerTwo.enabled # pgadmin4 as helper tool for easy database access From c9b24ed13c21ab4ca4989193b576a948ee8ceb42 Mon Sep 17 00:00:00 2001 From: kss682 Date: Wed, 13 Nov 2024 14:55:34 +0100 Subject: [PATCH 2/5] fix policy definition json --- .../resources/Testdata_AsBuilt-combustion.json | 4 +++- charts/umbrella/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tx-data-provider/resources/Testdata_AsBuilt-combustion.json b/charts/tx-data-provider/resources/Testdata_AsBuilt-combustion.json index f997afa7..88fb4b44 100644 --- a/charts/tx-data-provider/resources/Testdata_AsBuilt-combustion.json +++ b/charts/tx-data-provider/resources/Testdata_AsBuilt-combustion.json @@ -17,7 +17,9 @@ "odrl:or": [ { "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": { + "@id": "cx-policy:UsagePurpose" + }, "odrl:operator": { "@id": "odrl:eq" }, diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 824eda38..00e532d4 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.4 +version: 2.0.5 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: From b5737ecd2c8d388c7db9232c4a38d9d7eb414e42 Mon Sep 17 00:00:00 2001 From: kss682 Date: Wed, 13 Nov 2024 15:34:20 +0100 Subject: [PATCH 3/5] Bump edc to 0.7.7 --- charts/tx-data-provider/Chart.yaml | 4 ++-- charts/umbrella/Chart.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/tx-data-provider/Chart.yaml b/charts/tx-data-provider/Chart.yaml index 47f188c5..4c91d17c 100644 --- a/charts/tx-data-provider/Chart.yaml +++ b/charts/tx-data-provider/Chart.yaml @@ -23,7 +23,7 @@ name: tx-data-provider description: A Helm chart for Kubernetes type: application -version: 0.1.2 +version: 0.1.3 appVersion: 0.0.1 dependencies: @@ -37,7 +37,7 @@ dependencies: condition: simple-data-backend.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/charts/dev - version: 0.7.3 + version: 0.7.7 condition: tractusx-connector.enabled - name: vault version: 0.20.0 diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 00e532d4..212aa810 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eclipse-tractusx/tractus-x-umbrella type: application -version: 2.0.5 +version: 2.0.6 # when adding or updating versions of dependencies, also update list under README.md#Install dependencies: @@ -80,18 +80,18 @@ dependencies: # TX Data Consumer 1 - name: tx-data-provider alias: dataconsumerOne - version: 0.1.2 + version: 0.1.3 repository: file://../tx-data-provider condition: dataconsumerOne.enabled # TX Data Providers - name: tx-data-provider - version: 0.1.2 + version: 0.1.3 repository: file://../tx-data-provider condition: tx-data-provider.enabled # TX Data Consumer 2 - name: tx-data-provider alias: dataconsumerTwo - version: 0.1.2 + version: 0.1.3 repository: file://../tx-data-provider condition: dataconsumerTwo.enabled # pgadmin4 as helper tool for easy database access From 5aec1b273dfea0d42d153f267ca5aa74c7cd1f53 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 18 Nov 2024 08:53:08 +0100 Subject: [PATCH 4/5] chore: change tx-data-provider version --- charts/tx-data-provider/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tx-data-provider/Chart.yaml b/charts/tx-data-provider/Chart.yaml index 4c91d17c..93a1c026 100644 --- a/charts/tx-data-provider/Chart.yaml +++ b/charts/tx-data-provider/Chart.yaml @@ -23,7 +23,7 @@ name: tx-data-provider description: A Helm chart for Kubernetes type: application -version: 0.1.3 +version: 0.1.2 appVersion: 0.0.1 dependencies: From fd4ba75e387940444432b7ee036b8dad84bbf411 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 18 Nov 2024 08:54:09 +0100 Subject: [PATCH 5/5] chore: change tx-data-provider version --- charts/umbrella/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 7ccf2963..330ea67c 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -80,18 +80,18 @@ dependencies: # TX Data Consumer 1 - name: tx-data-provider alias: dataconsumerOne - version: 0.1.3 + version: 0.1.2 repository: file://../tx-data-provider condition: dataconsumerOne.enabled # TX Data Providers - name: tx-data-provider - version: 0.1.3 + version: 0.1.2 repository: file://../tx-data-provider condition: tx-data-provider.enabled # TX Data Consumer 2 - name: tx-data-provider alias: dataconsumerTwo - version: 0.1.3 + version: 0.1.2 repository: file://../tx-data-provider condition: dataconsumerTwo.enabled # pgadmin4 as helper tool for easy database access