diff --git a/README.md b/README.md index 5901b2f2f..417ec7459 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Disclaimer -The information provided by the Publications Office on this GitHub repository is for general informational purposes only. All information is provided in good faith, however we make no representation or warranty of any kind, express or implied, regarding the accuracy, adequacy, validity, reliability, availability or completeness of this information. - -This project is currently under development, so everything is still subject to change. +This project is currently under development. We may update the current version and replace it with a new version at any time. In this case, we recommend you retrieve the latest version in order to ensure technical compliance. The Publications Office cannot guarantee the accuracy, adequacy, validity, reliability, availability or completeness of this information and accepts no responsibility for any use you may make of this project’s component parts. # Summary +This project is managed by the Publications Office of the European Union to enable implementation of the European legislation for publication of notices for public procurement on the [TED website](https://ted.europa.eu/TED/). For more information, see the [DG GROW eForms](https://ec.europa.eu/growth/single-market/public-procurement/digital/eforms_en) page. + This project aims to provide the necessary tools for being able to build valid eForms notices. It is composed of the following: - `schemas`: This folder contains a provisional release of the schemas. There are currently based on an interim version of Pre-Award UBL 2.3 document types and is therefore not yet ready for use. @@ -11,3 +11,7 @@ The adopted approach is to keep the whole set of UBL elements but only support t - `docs`: This folder contains documentation in English which provides explanations and snippets in addition to the schema. - `schematrons`: This folder contains Schematron rules which are used to check the validity of notices as per the eForms regulation. Any kind of rule or constraint is implemented in Schematron. - `examples`: This folder contains some notice examples together with their validation report in SVRL. + +# Versioning + +Provisional releases of the eForms schema and documentation that were provided during 2020 via SIMAP had a different versioning scheme and are being replaced with this SDK that combines them into one bundle with one version number. diff --git a/docs/eForms_Schemas_Usage.docx b/docs/eForms_Schemas_Usage.docx index bbacf2a7c..1a1e1f298 100644 Binary files a/docs/eForms_Schemas_Usage.docx and b/docs/eForms_Schemas_Usage.docx differ diff --git a/examples/notices/INVALID_can_24_stage-2.xml b/examples/notices/INVALID_can_24_stage-2.xml index 2b2fe2036..a42f6fea2 100644 --- a/examples/notices/INVALID_can_24_stage-2.xml +++ b/examples/notices/INVALID_can_24_stage-2.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 123465 99999900 2020-01-23+01:00 diff --git a/examples/notices/INVALID_cn_24_stage-2.xml b/examples/notices/INVALID_cn_24_stage-2.xml index 1a7281668..f735dbb0a 100644 --- a/examples/notices/INVALID_cn_24_stage-2.xml +++ b/examples/notices/INVALID_cn_24_stage-2.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2000-01-01 diff --git a/examples/notices/can-modif_24_duration.xml b/examples/notices/can-modif_24_duration.xml index 906c77bec..8d8f45137 100644 --- a/examples/notices/can-modif_24_duration.xml +++ b/examples/notices/can-modif_24_duration.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 073-175479 2010-10-07+01:00 diff --git a/examples/notices/can-modif_24_value.xml b/examples/notices/can-modif_24_value.xml index dd7ff6605..c52f3023d 100644 --- a/examples/notices/can-modif_24_value.xml +++ b/examples/notices/can-modif_24_value.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2018/S 149-342558 2018-08-02+01:00 diff --git a/examples/notices/can_23_lots.xml b/examples/notices/can_23_lots.xml index 5edf3c2b0..7dd22d691 100644 --- a/examples/notices/can_23_lots.xml +++ b/examples/notices/can_23_lots.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 052-125030 2020-03-10+01:00 diff --git a/examples/notices/can_24_FRA_comments.xml b/examples/notices/can_24_FRA_comments.xml index 07a80a469..c741b4911 100644 --- a/examples/notices/can_24_FRA_comments.xml +++ b/examples/notices/can_24_FRA_comments.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 224 diff --git a/examples/notices/can_24_LSBU.xml b/examples/notices/can_24_LSBU.xml index ab96a5406..157be9b58 100644 --- a/examples/notices/can_24_LSBU.xml +++ b/examples/notices/can_24_LSBU.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2018/S 149-342558 2018-08-02+01:00 diff --git a/examples/notices/can_24_UKRI.xml b/examples/notices/can_24_UKRI.xml index 9527dc370..163c7c6ee 100644 --- a/examples/notices/can_24_UKRI.xml +++ b/examples/notices/can_24_UKRI.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 074-177511 2020-04-14+01:00 diff --git a/examples/notices/can_24_maximal.xml b/examples/notices/can_24_maximal.xml index 4d01aef6c..b73b87bee 100644 --- a/examples/notices/can_24_maximal.xml +++ b/examples/notices/can_24_maximal.xml @@ -4,7 +4,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 33333333 diff --git a/examples/notices/can_24_minimal.xml b/examples/notices/can_24_minimal.xml index 9294b3c1a..e943c74cd 100644 --- a/examples/notices/can_24_minimal.xml +++ b/examples/notices/can_24_minimal.xml @@ -4,7 +4,7 @@ But with the minimal amount of information while still valid --> 2.3 - eforms-1.0 + eforms-sdk-0.1 123465 99999900 2020-01-23+01:00 diff --git a/examples/notices/can_25_ENG.xml b/examples/notices/can_25_ENG.xml index 25da5464f..f31543598 100644 --- a/examples/notices/can_25_ENG.xml +++ b/examples/notices/can_25_ENG.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 081-192534 2020-04-23+01:00 diff --git a/examples/notices/can_25_ITA.xml b/examples/notices/can_25_ITA.xml index 4b393fafa..fb7c6bfbc 100644 --- a/examples/notices/can_25_ITA.xml +++ b/examples/notices/can_25_ITA.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 075-178880 2020-04-15+01:00 diff --git a/examples/notices/change-cn_24_dates.xml b/examples/notices/change-cn_24_dates.xml index 7d5a42307..db279a046 100644 --- a/examples/notices/change-cn_24_dates.xml +++ b/examples/notices/change-cn_24_dates.xml @@ -30,7 +30,7 @@ 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 078-185568 2020-04-17+01:00 diff --git a/examples/notices/change-cn_24_suppliers.xml b/examples/notices/change-cn_24_suppliers.xml index 0b7f86dd2..fed34004b 100644 --- a/examples/notices/change-cn_24_suppliers.xml +++ b/examples/notices/change-cn_24_suppliers.xml @@ -32,7 +32,7 @@ 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 073-175545 2020-04-09+01:00 diff --git a/examples/notices/cn-desg_24.xml b/examples/notices/cn-desg_24.xml index 6c9484a98..389eb93c1 100644 --- a/examples/notices/cn-desg_24.xml +++ b/examples/notices/cn-desg_24.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 Design contest notice 2020-04-11+01:00 diff --git a/examples/notices/cn-social_24.xml b/examples/notices/cn-social_24.xml index caac208a3..df950a24a 100644 --- a/examples/notices/cn-social_24.xml +++ b/examples/notices/cn-social_24.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2019/S 230-565004 2019-11-25+01:00 diff --git a/examples/notices/cn_23.xml b/examples/notices/cn_23.xml index 428a50907..d55c6f731 100644 --- a/examples/notices/cn_23.xml +++ b/examples/notices/cn_23.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 074-177391 2020-04-14+01:00 diff --git a/examples/notices/cn_24_FRA_comments.xml b/examples/notices/cn_24_FRA_comments.xml index 21ab0d537..f226d0477 100644 --- a/examples/notices/cn_24_FRA_comments.xml +++ b/examples/notices/cn_24_FRA_comments.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 121212 diff --git a/examples/notices/cn_24_maximal.xml b/examples/notices/cn_24_maximal.xml index 5b9750b18..8eee361f9 100644 --- a/examples/notices/cn_24_maximal.xml +++ b/examples/notices/cn_24_maximal.xml @@ -4,7 +4,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 22222222 diff --git a/examples/notices/cn_24_minimal.xml b/examples/notices/cn_24_minimal.xml index c420a6bcf..2b3708b71 100644 --- a/examples/notices/cn_24_minimal.xml +++ b/examples/notices/cn_24_minimal.xml @@ -4,7 +4,7 @@ But with the minimal amount of information while still valid --> 2.3 - eforms-1.0 + eforms-sdk-0.1 123456 789123 2019-11-21+01:00 diff --git a/examples/notices/cn_24_multilingual.xml b/examples/notices/cn_24_multilingual.xml index d8fc8d1bc..49f1f3ee2 100644 --- a/examples/notices/cn_24_multilingual.xml +++ b/examples/notices/cn_24_multilingual.xml @@ -13,7 +13,7 @@ For brevity, texts are not in 24 languages, but only in EN and FR. 2.3 - eforms-1.0 + eforms-sdk-0.1 2424 46c9ce89-5986-40d9-992f-e1a2469a48f8 2019-11-21+01:00 diff --git a/examples/notices/cn_24_nego_accel.xml b/examples/notices/cn_24_nego_accel.xml index c8480451c..d3f9e7088 100644 --- a/examples/notices/cn_24_nego_accel.xml +++ b/examples/notices/cn_24_nego_accel.xml @@ -12,7 +12,7 @@ 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 067-160609 2020-03-30+01:00 diff --git a/examples/notices/cn_24_open.xml b/examples/notices/cn_24_open.xml index 178633a3d..fce9272e6 100644 --- a/examples/notices/cn_24_open.xml +++ b/examples/notices/cn_24_open.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 045-107628 2020-02-28+01:00 diff --git a/examples/notices/cn_24_open_accel.xml b/examples/notices/cn_24_open_accel.xml index 34ee6a78c..714721eaa 100644 --- a/examples/notices/cn_24_open_accel.xml +++ b/examples/notices/cn_24_open_accel.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 081-190482 2020-04-23+01:00 diff --git a/examples/notices/cn_25.xml b/examples/notices/cn_25.xml index a906757c2..e7aa1af04 100644 --- a/examples/notices/cn_25.xml +++ b/examples/notices/cn_25.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 076-181161 2020-04-15+01:00 diff --git a/examples/notices/cn_81.xml b/examples/notices/cn_81.xml index 6d4bd6ef8..60da69080 100644 --- a/examples/notices/cn_81.xml +++ b/examples/notices/cn_81.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 072-173695 2020-04-08+01:00 diff --git a/examples/notices/pin-buyer_24.xml b/examples/notices/pin-buyer_24.xml index 261eb2bec..cb211dc7a 100644 --- a/examples/notices/pin-buyer_24.xml +++ b/examples/notices/pin-buyer_24.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 071-168752 2020-04-08+01:00 03:57:07+01:00 diff --git a/examples/notices/pin-buyer_24_minimal.xml b/examples/notices/pin-buyer_24_minimal.xml index 98aa015f6..2ca96c277 100644 --- a/examples/notices/pin-buyer_24_minimal.xml +++ b/examples/notices/pin-buyer_24_minimal.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 071-168752 2020-04-08+01:00 03:57:07+01:00 diff --git a/examples/notices/pin-cfc_25.xml b/examples/notices/pin-cfc_25.xml index 4bb705b78..ae6a65e75 100644 --- a/examples/notices/pin-cfc_25.xml +++ b/examples/notices/pin-cfc_25.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 072-173144 ProcedureID1234 2020-04-08+01:00 diff --git a/examples/notices/pin-only_24.xml b/examples/notices/pin-only_24.xml index 0b77956b4..db7da76a4 100644 --- a/examples/notices/pin-only_24.xml +++ b/examples/notices/pin-only_24.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 ID1234 2020-05-05+01:00 12:00:00+01:00 diff --git a/examples/notices/pin-only_24_lots.xml b/examples/notices/pin-only_24_lots.xml index 130ac7576..06192435a 100644 --- a/examples/notices/pin-only_24_lots.xml +++ b/examples/notices/pin-only_24_lots.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 068-162872 2020-04-02+01:00 12:30:00+01:00 diff --git a/examples/notices/pin-only_24_maximal.xml b/examples/notices/pin-only_24_maximal.xml index 7fd6cf853..c1af6b22a 100644 --- a/examples/notices/pin-only_24_maximal.xml +++ b/examples/notices/pin-only_24_maximal.xml @@ -4,7 +4,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 11111111 diff --git a/examples/notices/pin-only_81.xml b/examples/notices/pin-only_81.xml index 3e6434370..735789c48 100644 --- a/examples/notices/pin-only_81.xml +++ b/examples/notices/pin-only_81.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 077-183244 2020-04-16+01:00 12:35:04+01:00 diff --git a/examples/notices/qu-sy_25.xml b/examples/notices/qu-sy_25.xml index e7d3ff73b..4c477c581 100644 --- a/examples/notices/qu-sy_25.xml +++ b/examples/notices/qu-sy_25.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 069-165297 ProcedureID1234 2020-04-03+01:00 diff --git a/examples/notices/veat_24.xml b/examples/notices/veat_24.xml index 98d582453..1ecb17e27 100644 --- a/examples/notices/veat_24.xml +++ b/examples/notices/veat_24.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 081-192449 2020-04-23+01:00 diff --git a/examples/notices/veat_25.xml b/examples/notices/veat_25.xml index 9983a311d..f8eb92b45 100644 --- a/examples/notices/veat_25.xml +++ b/examples/notices/veat_25.xml @@ -3,7 +3,7 @@ --> 2.3 - eforms-1.0 + eforms-sdk-0.1 2020/S 066-158374 2020-03-30+01:00 diff --git a/schemas/common/UBL-CommonAggregateComponents-2.3.xsd b/schemas/common/UBL-CommonAggregateComponents-2.3.xsd index 504658677..34099e0c5 100644 --- a/schemas/common/UBL-CommonAggregateComponents-2.3.xsd +++ b/schemas/common/UBL-CommonAggregateComponents-2.3.xsd @@ -1,7 +1,7 @@ - - - - - - + + + + + + @@ -129,7 +129,7 @@ - + diff --git a/schemas/common/UBL-CommonSignatureComponents-2.3.xsd b/schemas/common/UBL-CommonSignatureComponents-2.3.xsd index 43ed49214..d7629f20e 100644 --- a/schemas/common/UBL-CommonSignatureComponents-2.3.xsd +++ b/schemas/common/UBL-CommonSignatureComponents-2.3.xsd @@ -1,7 +1,7 @@