diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md index e53fddd02..7149c0b2d 100644 --- a/COMPATIBILITY_MATRIX.md +++ b/COMPATIBILITY_MATRIX.md @@ -4,37 +4,37 @@ Full changelog of IRS: [changelog](CHANGELOG.md) ## [Unreleased] -| Dependency | Version | Helm | Comments | -|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------|-----------------| -| EDC | 0.7.1 | 0.7.1 | | -| Semantics Hub | 0.3.1 | 0.2.1 | REST connection | -| DTR | 0.4.1 | 0.4.9 | REST connection | -| Discovery Finder | 0.2.5 | - | REST connection | -| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | | -| Helm | 3.9.3 | - | - | -| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - | -| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version | -| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version | -| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version | -| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version | -| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version | +| Dependency | Version | Helm | Comments | +|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|--------|-----------------| +| EDC | 0.7.3 | 0.7.3 | | +| Semantics Hub | 0.3.1 | 0.2.1 | REST connection | +| DTR | 0.4.3 | 0.4.11 | REST connection | +| Discovery Finder | 0.2.5 | - | REST connection | +| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | | +| Helm | 3.9.3 | - | - | +| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - | +| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version | +| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version | +| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version | +| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version | +| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version | ## [CATENA-X Release 24.08](https://eclipse-tractusx.github.io/CHANGELOG/) - [5.3.0](https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/5.3.0) - 2024-07-15 -| Dependency | Version | Helm | Comments | -|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------|-----------------| -| EDC | 0.7.1 | 0.7.1 | | -| Semantics Hub | 0.3.1 | 0.2.1 | REST connection | -| DTR | 0.4.1 | 0.4.9 | REST connection | -| Discovery Finder | 0.2.5 | - | REST connection | -| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | | -| Helm | 3.9.3 | - | - | -| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - | -| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version | -| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version | -| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version | -| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version | -| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version | +| Dependency | Version | Helm | Comments | +|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|--------|-----------------| +| EDC | 0.7.3 | 0.7.3 | | +| Semantics Hub | 0.3.1 | 0.2.1 | REST connection | +| DTR | 0.4.3 | 0.4.11 | REST connection | +| Discovery Finder | 0.2.5 | - | REST connection | +| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | | +| Helm | 3.9.3 | - | - | +| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - | +| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version | +| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version | +| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version | +| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version | +| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version | ## [5.2.0](https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/5.2.0) - 2024-07-05 diff --git a/charts/item-relationship-service/CHANGELOG.md b/charts/item-relationship-service/CHANGELOG.md index dff52eed8..860501bd7 100644 --- a/charts/item-relationship-service/CHANGELOG.md +++ b/charts/item-relationship-service/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.3.1] - 2024-07-16 + +### Changed + +- Change default policy to include full namespace `https://w3id.org/catenax/policy/` instead of `cx-policy:` + ## [7.3.0] - 2024-07-15 ### Changed diff --git a/charts/item-relationship-service/Chart.yaml b/charts/item-relationship-service/Chart.yaml index d82e7828d..f49028dd6 100644 --- a/charts/item-relationship-service/Chart.yaml +++ b/charts/item-relationship-service/Chart.yaml @@ -35,7 +35,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 7.3.0 +version: 7.3.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. diff --git a/charts/item-relationship-service/values.yaml b/charts/item-relationship-service/values.yaml index 4d828a867..3fd4b42f1 100644 --- a/charts/item-relationship-service/values.yaml +++ b/charts/item-relationship-service/values.yaml @@ -190,10 +190,10 @@ edc: # IRS will only negotiate contracts for offers with a policy as defined in the allowedNames list. # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed. acceptedPolicies: - - leftOperand: "cx-policy:FrameworkAgreement" + - leftOperand: "https://w3id.org/catenax/policy/FrameworkAgreement" operator: "eq" rightOperand: "traceability:1.0" - - leftOperand: "cx-policy:UsagePurpose" + - leftOperand: "https://w3id.org/catenax/policy/UsagePurpose" operator: "eq" rightOperand: "cx.core.industrycore:1" discoveryFinderClient: diff --git a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsBuilt.json b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsBuilt.json index 854f83289..8d3988f76 100644 --- a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsBuilt.json +++ b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsBuilt.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsPlanned.json b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsPlanned.json index 3d8c29e47..3ca5ffae9 100644 --- a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsPlanned.json +++ b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelBomAsPlanned.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsBuilt.json b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsBuilt.json index 502b8e425..e0ef13bc0 100644 --- a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsBuilt.json +++ b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsBuilt.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsPlanned.json b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsPlanned.json index 612199257..309872cda 100644 --- a/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsPlanned.json +++ b/local/testing/testdata/CX_Testdata_529_compatibility_SingleLevelUsageAsPlanned.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json index c3fe01b1f..239fb584b 100644 --- a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json +++ b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json index a789d15a9..a4232476a 100644 --- a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json +++ b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" }, diff --git a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json index 7fa5039d9..e98c0c80c 100644 --- a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json +++ b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json @@ -13,19 +13,16 @@ { "odrl:action": "use", "odrl:constraint": { - "@type": "AtomicConstraint", "odrl:and": [ { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement", "odrl:operator": { "@id": "odrl:eq" }, "odrl:rightOperand": "traceability:1.0" }, { - "@type": "Constraint", - "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose", "odrl:operator": { "@id": "odrl:eq" },