From 56daad43c5a03929e3b5d6c25b932008ab656e1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 01:23:02 +0000 Subject: [PATCH] chore: sync DigitalProductPassport data model with Jargon snapshot 1 --- .../artefacts/ProductPassport-instance.json | 20 ++-- .../artefacts/ProductPassport-schema.json | 15 --- data-models/untp-dpp/artefacts/context.jsonld | 98 +++++++------------ .../untp-dpp/artefacts/untp-dpp-instance.json | 22 ++--- .../untp-dpp/artefacts/untp-dpp-schema.json | 21 +--- data-models/untp-dpp/vocabulary.jsonld | 8 +- 6 files changed, 57 insertions(+), 127 deletions(-) diff --git a/data-models/untp-dpp/artefacts/ProductPassport-instance.json b/data-models/untp-dpp/artefacts/ProductPassport-instance.json index e78e1f81..d0ba968e 100644 --- a/data-models/untp-dpp/artefacts/ProductPassport-instance.json +++ b/data-models/untp-dpp/artefacts/ProductPassport-instance.json @@ -275,15 +275,13 @@ "accuracy": 0.05 } ], - "conformance": true, "conformityTopic": "environment.emissions", "conformityEvidence": { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } }, { @@ -451,15 +449,13 @@ "accuracy": 0.05 } ], - "conformance": true, "conformityTopic": "environment.emissions", "conformityEvidence": { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } } ], @@ -499,16 +495,14 @@ "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" }, { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } ] }, @@ -521,16 +515,14 @@ "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" }, { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } ] } diff --git a/data-models/untp-dpp/artefacts/ProductPassport-schema.json b/data-models/untp-dpp/artefacts/ProductPassport-schema.json index 13519d37..6a8df569 100644 --- a/data-models/untp-dpp/artefacts/ProductPassport-schema.json +++ b/data-models/untp-dpp/artefacts/ProductPassport-schema.json @@ -540,11 +540,6 @@ }, "description": "The list of specific values measured as part of this assessment (eg tensile strength)" }, - "conformance": { - "example": true, - "type": "boolean", - "description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria." - }, "conformityTopic": { "type": "string", "enum": [ @@ -575,7 +570,6 @@ "description": "A declaration of conformance with one or more criteria from a specific standard or regulation. ", "required": [ "id", - "conformance", "conformityTopic" ] }, @@ -942,15 +936,6 @@ ], "example": "SHA-256", "description": "The hashing algorithm used to create the target hash. SHA-265 is the recommended standard" - }, - "encryptionMethod": { - "type": "string", - "enum": [ - "none", - "AES" - ], - "example": "none", - "description": "The symmetric encryption algorithm used to encrypt the link target. AES is the recommended standard. Decryption keys are expected to be passed out of bounds." } }, "description": "A binary file that is hashed ()for tamper evidence) and optionally encrypted (for confidentiality)." diff --git a/data-models/untp-dpp/artefacts/context.jsonld b/data-models/untp-dpp/artefacts/context.jsonld index c311c343..05da9cf2 100644 --- a/data-models/untp-dpp/artefacts/context.jsonld +++ b/data-models/untp-dpp/artefacts/context.jsonld @@ -1,8 +1,8 @@ { "@context": { - "untp-dpp": "https://test.uncefact.org/vocabulary/untp/dpp/0/", - "schemaorg": "https://schema.org/", - "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/", + "untp-dpp": "https://test.uncefact.org/vocabulary/untp/dpp/working/", + "schema": "https://schema.org/", + "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/", "geojson": "https://purl.org/geojson/vocab#", "renderMethodPrefix": "https://w3id.org/vc/render-method#", "xsd": "http://www.w3.org/2001/XMLSchema#", @@ -18,7 +18,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" } } }, @@ -32,7 +32,7 @@ "@type": "xsd:string" }, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "schemeID": { "@id": "untp-core:schemeID", @@ -50,7 +50,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -61,7 +61,7 @@ "@type": "@id" }, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "registrationCountry": { "@id": "untp-core:registrationCountry", @@ -85,7 +85,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -105,7 +105,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "issuerAlsoKnownAs": { "@id": "untp-core:Party", @@ -113,7 +113,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -133,7 +133,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -144,7 +144,7 @@ "@type": "@id" }, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "countryOfOperation": { "@id": "untp-core:countryOfOperation", @@ -164,7 +164,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -182,7 +182,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -295,7 +295,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -329,7 +329,7 @@ } }, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "productCategory": { "@id": "untp-core:productCategory", @@ -360,7 +360,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -378,7 +378,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -516,7 +516,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "issuingParty": { "@id": "untp-core:Party", @@ -524,7 +524,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -548,7 +548,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "jurisdictionCountry": { "@id": "untp-core:jurisdictionCountry", @@ -564,7 +564,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "registeredId": { "@id": "untp-core:registeredId", @@ -588,17 +588,17 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "conformityTopic": { "@id": "untp-core:conformityTopic", "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#" } }, "status": { @@ -606,7 +606,7 @@ "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/statusCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/statusCode#" } }, "subCriterion": { @@ -671,7 +671,7 @@ "@context": { "@protected": true, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "referenceStandard": { "@id": "untp-core:referenceStandard", @@ -727,16 +727,12 @@ } } }, - "conformance": { - "@id": "untp-core:conformance", - "@type": "xsd:boolean" - }, "conformityTopic": { "@id": "untp-core:conformityTopic", "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#" } }, "conformityEvidence": { @@ -765,15 +761,7 @@ "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#" - } - }, - "encryptionMethod": { - "@id": "untp-core:encryptionMethod", - "@type": "@vocab", - "@context": { - "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#" } } } @@ -794,7 +782,7 @@ "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/dpp/0/granularityCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/dpp/working/granularityCode#" } }, "conformityClaim": { @@ -823,7 +811,7 @@ "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/operationalScopeCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/operationalScopeCode#" } }, "primarySourcedRatio": { @@ -875,15 +863,7 @@ "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#" - } - }, - "encryptionMethod": { - "@id": "untp-core:encryptionMethod", - "@type": "@vocab", - "@context": { - "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#" } } } @@ -976,7 +956,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "originCountry": { "@id": "untp-core:originCountry", @@ -1054,7 +1034,7 @@ "@context": { "@protected": true, "description": { - "@id": "schemaorg:description" + "@id": "schema:description" }, "referenceStandard": { "@id": "untp-core:referenceStandard", @@ -1110,16 +1090,12 @@ } } }, - "conformance": { - "@id": "untp-core:conformance", - "@type": "xsd:boolean" - }, "conformityTopic": { "@id": "untp-core:conformityTopic", "@type": "@vocab", "@context": { "@protected": true, - "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#" + "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#" } } } @@ -1130,7 +1106,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "mediaQuery": { "@id": "untp-core:mediaQuery", @@ -1152,7 +1128,7 @@ "@context": { "@protected": true, "name": { - "@id": "schemaorg:name" + "@id": "schema:name" }, "template": { "@id": "renderMethodPrefix:template", diff --git a/data-models/untp-dpp/artefacts/untp-dpp-instance.json b/data-models/untp-dpp/artefacts/untp-dpp-instance.json index 0e1ebdd6..4e149826 100644 --- a/data-models/untp-dpp/artefacts/untp-dpp-instance.json +++ b/data-models/untp-dpp/artefacts/untp-dpp-instance.json @@ -5,7 +5,7 @@ ], "@context": [ "https://www.w3.org/ns/credentials/v2", - "https://test.uncefact.org/vocabulary/untp/dpp/0.6.1/" + "https://test.uncefact.org/vocabulary/untp/dpp/working/" ], "id": "https://example-company.com/credentials/2a423366-a0d6-4855-ba65-2e0c926d09b0", "issuer": { @@ -320,15 +320,13 @@ "accuracy": 0.05 } ], - "conformance": true, "conformityTopic": "environment.emissions", "conformityEvidence": { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } }, { @@ -496,15 +494,13 @@ "accuracy": 0.05 } ], - "conformance": true, "conformityTopic": "environment.emissions", "conformityEvidence": { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } } ], @@ -544,16 +540,14 @@ "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" }, { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } ] }, @@ -566,16 +560,14 @@ "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" }, { "linkURL": "https://files.example-certifier.com/1234567.json", "linkName": "GBA rule book conformity certificate", "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc", "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2", - "hashMethod": "SHA-256", - "encryptionMethod": "AES" + "hashMethod": "SHA-256" } ] } diff --git a/data-models/untp-dpp/artefacts/untp-dpp-schema.json b/data-models/untp-dpp/artefacts/untp-dpp-schema.json index 6d3a1faa..cf3d6e27 100644 --- a/data-models/untp-dpp/artefacts/untp-dpp-schema.json +++ b/data-models/untp-dpp/artefacts/untp-dpp-schema.json @@ -31,7 +31,7 @@ "@context": { "example": [ "https://www.w3.org/ns/credentials/v2", - "https://test.uncefact.org/vocabulary/untp/dpp/0.6.1/" + "https://test.uncefact.org/vocabulary/untp/dpp/working/" ], "type": "array", "items": { @@ -45,13 +45,13 @@ "type": "string" }, { - "const": "https://test.uncefact.org/vocabulary/untp/dpp/0.6.1/", + "const": "https://test.uncefact.org/vocabulary/untp/dpp/working/", "type": "string" } ], "default": [ "https://www.w3.org/ns/credentials/v2", - "https://test.uncefact.org/vocabulary/untp/dpp/0.6.1/" + "https://test.uncefact.org/vocabulary/untp/dpp/working/" ], "minItems": 2, "uniqueItems": true @@ -702,11 +702,6 @@ }, "description": "The list of specific values measured as part of this assessment (eg tensile strength)" }, - "conformance": { - "example": true, - "type": "boolean", - "description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria." - }, "conformityTopic": { "type": "string", "enum": [ @@ -737,7 +732,6 @@ "description": "A declaration of conformance with one or more criteria from a specific standard or regulation. ", "required": [ "id", - "conformance", "conformityTopic" ] }, @@ -1104,15 +1098,6 @@ ], "example": "SHA-256", "description": "The hashing algorithm used to create the target hash. SHA-265 is the recommended standard" - }, - "encryptionMethod": { - "type": "string", - "enum": [ - "none", - "AES" - ], - "example": "none", - "description": "The symmetric encryption algorithm used to encrypt the link target. AES is the recommended standard. Decryption keys are expected to be passed out of bounds." } }, "description": "A binary file that is hashed ()for tamper evidence) and optionally encrypted (for confidentiality)." diff --git a/data-models/untp-dpp/vocabulary.jsonld b/data-models/untp-dpp/vocabulary.jsonld index 5ec1cb8a..6523365c 100644 --- a/data-models/untp-dpp/vocabulary.jsonld +++ b/data-models/untp-dpp/vocabulary.jsonld @@ -1,12 +1,12 @@ { "@context": { - "untp-dpp": "https://test.uncefact.org/vocabulary/untp/dpp/0/", + "untp-dpp": "https://test.uncefact.org/vocabulary/untp/dpp/working/", "xsd": "http://www.w3.org/2001/XMLSchema#", "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "owl": "http://www.w3.org/2002/07/owl#", "rdfs": "http://www.w3.org/2000/01/rdf-schema#", "schema": "https://schema.org/", - "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/" + "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/" }, "@graph": [ { @@ -273,11 +273,11 @@ { "@id": "untp-dpp:name", "schema:rangeIncludes": { - "@id": "xsd:string" + "@id": "schema:name" }, "@type": [ "rdf:Property", - "owl:DatatypeProperty" + "owl:ObjectProperty" ], "schema:domainIncludes": [ {