Skip to content
This repository was archived by the owner on Apr 24, 2026. It is now read-only.

Commit 877b329

Browse files
un-cefact-github-app[bot]github-actions[bot]
authored and
ashleythedeveloper
committed
chore: add explicit ConformityAssessment.conformance after removing from base class. (#476)
Add explicit `ConformityAssessment.conformance` boolean after [removing the property from the `Declaration` base class](#475). See #415 As this is the first PR for this domain post 0.6.1, it includes: - Switching to working versions of core and ConformityCredential - Removal of the [encryptionMethod property from working core](#473) The actual addition of `conformance` looks like a move since it was being defined by the base class. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 75c3187 commit 877b329

6 files changed

Lines changed: 57 additions & 115 deletions

File tree

‎data-models/untp-dcc/artefacts/ConformityAttestation-instance.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,14 @@
8787
"linkName": "GBA rule book conformity certificate",
8888
"linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
8989
"hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
90-
"hashMethod": "SHA-256",
91-
"encryptionMethod": "AES"
90+
"hashMethod": "SHA-256"
9291
},
9392
"auditableEvidence": {
9493
"linkURL": "https://files.example-certifier.com/1234567.json",
9594
"linkName": "GBA rule book conformity certificate",
9695
"linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
9796
"hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
98-
"hashMethod": "SHA-256",
99-
"encryptionMethod": "AES"
97+
"hashMethod": "SHA-256"
10098
},
10199
"scope": {
102100
"type": [
@@ -292,8 +290,8 @@
292290
"accuracy": 0.05
293291
}
294292
],
295-
"conformance": true,
296293
"conformityTopic": "environment.emissions",
294+
"conformance": true,
297295
"assessedProduct": [
298296
{
299297
"product": {
@@ -555,8 +553,8 @@
555553
"accuracy": 0.05
556554
}
557555
],
558-
"conformance": true,
559556
"conformityTopic": "environment.emissions",
557+
"conformance": true,
560558
"assessedProduct": [
561559
{
562560
"product": {

‎data-models/untp-dcc/artefacts/ConformityAttestation-schema.json‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,6 @@
366366
],
367367
"example": "SHA-256",
368368
"description": "The hashing algorithm used to create the target hash. SHA-265 is the recommended standard"
369-
},
370-
"encryptionMethod": {
371-
"type": "string",
372-
"enum": [
373-
"none",
374-
"AES"
375-
],
376-
"example": "none",
377-
"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."
378369
}
379370
},
380371
"description": "A binary file that is hashed ()for tamper evidence) and optionally encrypted (for confidentiality)."
@@ -542,11 +533,6 @@
542533
},
543534
"description": "The list of specific values measured as part of this assessment (eg tensile strength)"
544535
},
545-
"conformance": {
546-
"example": true,
547-
"type": "boolean",
548-
"description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria."
549-
},
550536
"conformityTopic": {
551537
"type": "string",
552538
"enum": [
@@ -569,6 +555,11 @@
569555
"example": "environment.energy",
570556
"description": "The conformity topic category for this assessment (eg vocabulary.uncefact.org/sustainability/emissions)"
571557
},
558+
"conformance": {
559+
"example": true,
560+
"type": "boolean",
561+
"description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria."
562+
},
572563
"assessedProduct": {
573564
"type": "array",
574565
"items": {
@@ -649,8 +640,8 @@
649640
"description": "A specific assessment about the product or facility against a specific specification. Eg the carbon intensity of a given product or batch.",
650641
"required": [
651642
"id",
652-
"conformance",
653-
"conformityTopic"
643+
"conformityTopic",
644+
"conformance"
654645
]
655646
},
656647
"Standard": {

‎data-models/untp-dcc/artefacts/context.jsonld‎

Lines changed: 20 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"@context": {
3-
"untp-dcc": "https://test.uncefact.org/vocabulary/untp/dcc/0/",
3+
"untp-dcc": "https://test.uncefact.org/vocabulary/untp/dcc/working/",
44
"schemaorg": "https://schema.org/",
5-
"untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/",
5+
"untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/",
66
"geojson": "https://purl.org/geojson/vocab#",
77
"renderMethodPrefix": "https://w3id.org/vc/render-method#",
88
"xsd": "http://www.w3.org/2001/XMLSchema#",
@@ -347,15 +347,15 @@
347347
"@type": "@vocab",
348348
"@context": {
349349
"@protected": true,
350-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
350+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
351351
}
352352
},
353353
"status": {
354354
"@id": "untp-core:status",
355355
"@type": "@vocab",
356356
"@context": {
357357
"@protected": true,
358-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/statusCode#"
358+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/statusCode#"
359359
}
360360
},
361361
"subCriterion": {
@@ -862,18 +862,18 @@
862862
}
863863
}
864864
},
865-
"conformance": {
866-
"@id": "untp-core:conformance",
867-
"@type": "xsd:boolean"
868-
},
869865
"conformityTopic": {
870866
"@id": "untp-core:conformityTopic",
871867
"@type": "@vocab",
872868
"@context": {
873869
"@protected": true,
874-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
870+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
875871
}
876872
},
873+
"conformance": {
874+
"@id": "untp-dcc:conformance",
875+
"@type": "xsd:boolean"
876+
},
877877
"assessedProduct": {
878878
"@protected": true,
879879
"@id": "untp-dcc:assessedProduct",
@@ -997,23 +997,23 @@
997997
"@type": "@vocab",
998998
"@context": {
999999
"@protected": true,
1000-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/assessorLevelCode#"
1000+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/assessorLevelCode#"
10011001
}
10021002
},
10031003
"assessmentLevel": {
10041004
"@id": "untp-core:assessmentLevel",
10051005
"@type": "@vocab",
10061006
"@context": {
10071007
"@protected": true,
1008-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/assessmentLevelCode#"
1008+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/assessmentLevelCode#"
10091009
}
10101010
},
10111011
"attestationType": {
10121012
"@id": "untp-core:attestationType",
10131013
"@type": "@vocab",
10141014
"@context": {
10151015
"@protected": true,
1016-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/attestationTypeCode#"
1016+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/attestationTypeCode#"
10171017
}
10181018
},
10191019
"description": {
@@ -1070,15 +1070,7 @@
10701070
"@type": "@vocab",
10711071
"@context": {
10721072
"@protected": true,
1073-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#"
1074-
}
1075-
},
1076-
"encryptionMethod": {
1077-
"@id": "untp-core:encryptionMethod",
1078-
"@type": "@vocab",
1079-
"@context": {
1080-
"@protected": true,
1081-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#"
1073+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#"
10821074
}
10831075
}
10841076
}
@@ -1109,15 +1101,7 @@
11091101
"@type": "@vocab",
11101102
"@context": {
11111103
"@protected": true,
1112-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#"
1113-
}
1114-
},
1115-
"encryptionMethod": {
1116-
"@id": "untp-core:encryptionMethod",
1117-
"@type": "@vocab",
1118-
"@context": {
1119-
"@protected": true,
1120-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#"
1104+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#"
11211105
}
11221106
}
11231107
}
@@ -1145,23 +1129,23 @@
11451129
"@type": "@vocab",
11461130
"@context": {
11471131
"@protected": true,
1148-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/assessorLevelCode#"
1132+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/assessorLevelCode#"
11491133
}
11501134
},
11511135
"assessmentLevel": {
11521136
"@id": "untp-core:assessmentLevel",
11531137
"@type": "@vocab",
11541138
"@context": {
11551139
"@protected": true,
1156-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/assessmentLevelCode#"
1140+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/assessmentLevelCode#"
11571141
}
11581142
},
11591143
"attestationType": {
11601144
"@id": "untp-core:attestationType",
11611145
"@type": "@vocab",
11621146
"@context": {
11631147
"@protected": true,
1164-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/attestationTypeCode#"
1148+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/attestationTypeCode#"
11651149
}
11661150
},
11671151
"description": {
@@ -1218,15 +1202,7 @@
12181202
"@type": "@vocab",
12191203
"@context": {
12201204
"@protected": true,
1221-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#"
1222-
}
1223-
},
1224-
"encryptionMethod": {
1225-
"@id": "untp-core:encryptionMethod",
1226-
"@type": "@vocab",
1227-
"@context": {
1228-
"@protected": true,
1229-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#"
1205+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#"
12301206
}
12311207
}
12321208
}
@@ -1257,15 +1233,7 @@
12571233
"@type": "@vocab",
12581234
"@context": {
12591235
"@protected": true,
1260-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#"
1261-
}
1262-
},
1263-
"encryptionMethod": {
1264-
"@id": "untp-core:encryptionMethod",
1265-
"@type": "@vocab",
1266-
"@context": {
1267-
"@protected": true,
1268-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#"
1236+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#"
12691237
}
12701238
}
12711239
}
@@ -1334,16 +1302,12 @@
13341302
}
13351303
}
13361304
},
1337-
"conformance": {
1338-
"@id": "untp-core:conformance",
1339-
"@type": "xsd:boolean"
1340-
},
13411305
"conformityTopic": {
13421306
"@id": "untp-core:conformityTopic",
13431307
"@type": "@vocab",
13441308
"@context": {
13451309
"@protected": true,
1346-
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
1310+
"@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
13471311
}
13481312
}
13491313
}

‎data-models/untp-dcc/artefacts/untp-dcc-instance.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
],
66
"@context": [
77
"https://www.w3.org/ns/credentials/v2",
8-
"https://test.uncefact.org/vocabulary/untp/dcc/0.6.1/"
8+
"https://test.uncefact.org/vocabulary/untp/dcc/working/"
99
],
1010
"id": "https://example-company.com/credentials/2a423366-a0d6-4855-ba65-2e0c926d09b0",
1111
"issuer": {
@@ -132,16 +132,14 @@
132132
"linkName": "GBA rule book conformity certificate",
133133
"linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
134134
"hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
135-
"hashMethod": "SHA-256",
136-
"encryptionMethod": "AES"
135+
"hashMethod": "SHA-256"
137136
},
138137
"auditableEvidence": {
139138
"linkURL": "https://files.example-certifier.com/1234567.json",
140139
"linkName": "GBA rule book conformity certificate",
141140
"linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
142141
"hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
143-
"hashMethod": "SHA-256",
144-
"encryptionMethod": "AES"
142+
"hashMethod": "SHA-256"
145143
},
146144
"scope": {
147145
"type": [
@@ -337,8 +335,8 @@
337335
"accuracy": 0.05
338336
}
339337
],
340-
"conformance": true,
341338
"conformityTopic": "environment.emissions",
339+
"conformance": true,
342340
"assessedProduct": [
343341
{
344342
"product": {
@@ -600,8 +598,8 @@
600598
"accuracy": 0.05
601599
}
602600
],
603-
"conformance": true,
604601
"conformityTopic": "environment.emissions",
602+
"conformance": true,
605603
"assessedProduct": [
606604
{
607605
"product": {

0 commit comments

Comments
 (0)