From 11864a49242ed30a1688ae8113b5fa2c743fed69 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 30 Aug 2023 12:32:42 +0100 Subject: [PATCH 1/4] New example file --- .../examples/json/request5-JSON-Delivery.json | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 103120/examples/json/request5-JSON-Delivery.json diff --git a/103120/examples/json/request5-JSON-Delivery.json b/103120/examples/json/request5-JSON-Delivery.json new file mode 100644 index 0000000..b0796ca --- /dev/null +++ b/103120/examples/json/request5-JSON-Delivery.json @@ -0,0 +1,65 @@ +{ + "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", + "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", + "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", + "@xmlns:delivery": "http://uri.etsi.org/03120/common/2019/10/Delivery", + "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", + "Header": { + "SenderIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR2" + }, + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR1" + }, + "TransactionIdentifier": "64cd73e1-a438-4d47-9cfb-cead9125a502", + "Timestamp": "2019-09-30T13:37:37.000000Z", + "Version": { + "ETSIVersion": "V1.14.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "RequestPayload": { + "ActionRequests": { + "ActionRequest": [ + { + "ActionIdentifier": 0, + "DELIVER": { + "Identifier": "11f49f11-39df-4596-aa58-1f7199b587df", + "HI1Object": { + "@xsi:type": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject", + "ObjectIdentifier": "11f49f11-39df-4596-aa58-1f7199b587df", + "AssociatedObjects": { + "AssociatedObject": [ + "2b36a78b-b628-416d-bd22-404e68a0cd36" + ] + }, + "delivery:Reference": { + "delivery:LDID": "XX-ACTOR01-1234" + }, + "delivery:SequenceNumber": 1, + "delivery:LastSequence": true, + "delivery:Manifest": { + "delivery:Specification": { + "common:Owner": "ETSI", + "common:Name": "ManifestSpecification", + "common:Value": "TS102657-XML" + } + }, + "delivery:Delivery": { + "delivery:JSONData": { + "field1" : "this is native JSON embedded data", + "field2" : 1234 + } + } + } + } + } + ] + } + } + } +} -- GitLab From a0cd5795313da955237e21749eae2b50e5e63ca0 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 30 Aug 2023 12:34:46 +0100 Subject: [PATCH 2/4] Manually changed schema file --- 103120/examples/json/request5-JSON-Delivery.json | 2 +- 103120/schema/json/ts_103120_Delivery.schema.json | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/103120/examples/json/request5-JSON-Delivery.json b/103120/examples/json/request5-JSON-Delivery.json index b0796ca..8608393 100644 --- a/103120/examples/json/request5-JSON-Delivery.json +++ b/103120/examples/json/request5-JSON-Delivery.json @@ -50,7 +50,7 @@ } }, "delivery:Delivery": { - "delivery:JSONData": { + "delivery:EmbeddedJSONData": { "field1" : "this is native JSON embedded data", "field2" : 1234 } diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json index 093d127..bca4310 100644 --- a/103120/schema/json/ts_103120_Delivery.schema.json +++ b/103120/schema/json/ts_103120_Delivery.schema.json @@ -180,6 +180,15 @@ "required": [ "delivery:XMLData" ] + }, + { + "type": "object", + "properties": { + "delivery:XMLData": { } + }, + "required": [ + "delivery:EmbeddedJSONData" + ] } ] }, @@ -206,4 +215,4 @@ }, "EmbeddedXMLData": {} } -} \ No newline at end of file +} -- GitLab From 0ca157f97dfd58fd38bdac117a8413c32c76d3a0 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 30 Aug 2023 13:01:21 +0100 Subject: [PATCH 3/4] Including extra extensions in ci yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8ec525..1f3c2c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l -x json -x xml -x xsd -x asn -x asn1 --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab From 54d522b084aba8c4172ddfd9fbe64153895f472d Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 30 Aug 2023 13:10:17 +0100 Subject: [PATCH 4/4] Backing out CI/CD change --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f3c2c4..a8ec525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l -x json -x xml -x xsd -x asn -x asn1 --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab