diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e1532edd..1a6d3a143 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# SDK 1.10.3 Release Notes + +This release brings the following corrections in the validation rules, making them more permissive: + +* Remove rule checking that "Notice Framework Approximate Value" (BT-1118-NoticeResult) is the sum of the values for each lot. +* Remove rules forbidding "Framework Re-estimated Value" (BT-660-LotResult) and "Framework Re-calculated Maximum Value" (BT-709-LotResult) in VEAT notices (subtypes 25, 26 and 27). + +A comprehensive list of changes between SDK 1.10.2 and SDK 1.10.3 can be seen at + +You can explore the changes between those versions at + # SDK 1.10.2 Release Notes This release brings the following corrections in the validation rules, making them more permissive: diff --git a/examples/reports/INVALID_can_24_stage-1.svrl b/examples/reports/INVALID_can_24_stage-1.svrl index 678e0678d..d2ed7aa22 100644 --- a/examples/reports/INVALID_can_24_stage-1.svrl +++ b/examples/reports/INVALID_can_24_stage-1.svrl @@ -738,7 +738,6 @@ - - - diff --git a/examples/reports/can-desg_25.svrl b/examples/reports/can-desg_25.svrl index c5c1549b6..7ebf87d04 100644 --- a/examples/reports/can-desg_25.svrl +++ b/examples/reports/can-desg_25.svrl @@ -280,7 +280,6 @@ - diff --git a/examples/reports/can-modif_23.svrl b/examples/reports/can-modif_23.svrl index 2b26c60ac..9948773c3 100644 --- a/examples/reports/can-modif_23.svrl +++ b/examples/reports/can-modif_23.svrl @@ -203,7 +203,6 @@ - diff --git a/examples/reports/can-modif_24_duration.svrl b/examples/reports/can-modif_24_duration.svrl index 1c44ef3e9..745ae4188 100644 --- a/examples/reports/can-modif_24_duration.svrl +++ b/examples/reports/can-modif_24_duration.svrl @@ -334,7 +334,6 @@ - diff --git a/examples/reports/can-modif_24_value.svrl b/examples/reports/can-modif_24_value.svrl index da7f19841..8a30b73d7 100644 --- a/examples/reports/can-modif_24_value.svrl +++ b/examples/reports/can-modif_24_value.svrl @@ -290,7 +290,6 @@ - diff --git a/examples/reports/can-modif_25.svrl b/examples/reports/can-modif_25.svrl index e3c0ff0f2..550a8f931 100644 --- a/examples/reports/can-modif_25.svrl +++ b/examples/reports/can-modif_25.svrl @@ -204,7 +204,6 @@ - diff --git a/examples/reports/can-social_23.svrl b/examples/reports/can-social_23.svrl index 7aeefd852..829ed1983 100644 --- a/examples/reports/can-social_23.svrl +++ b/examples/reports/can-social_23.svrl @@ -298,7 +298,6 @@ - diff --git a/examples/reports/can-social_24.svrl b/examples/reports/can-social_24.svrl index 64e277902..04adc60d1 100644 --- a/examples/reports/can-social_24.svrl +++ b/examples/reports/can-social_24.svrl @@ -291,7 +291,6 @@ - diff --git a/examples/reports/can-social_25.svrl b/examples/reports/can-social_25.svrl index e0640d9e1..cde87fa3f 100644 --- a/examples/reports/can-social_25.svrl +++ b/examples/reports/can-social_25.svrl @@ -334,7 +334,6 @@ - diff --git a/examples/reports/can_23_contracts.svrl b/examples/reports/can_23_contracts.svrl index 1d6363262..ac57bf076 100644 --- a/examples/reports/can_23_contracts.svrl +++ b/examples/reports/can_23_contracts.svrl @@ -421,7 +421,6 @@ - diff --git a/examples/reports/can_24_FRA_comments.svrl b/examples/reports/can_24_FRA_comments.svrl index 05ec5ec68..1c2057838 100644 --- a/examples/reports/can_24_FRA_comments.svrl +++ b/examples/reports/can_24_FRA_comments.svrl @@ -606,7 +606,6 @@ - diff --git a/examples/reports/can_24_LSBU.svrl b/examples/reports/can_24_LSBU.svrl index a164ee45c..6770c47bd 100644 --- a/examples/reports/can_24_LSBU.svrl +++ b/examples/reports/can_24_LSBU.svrl @@ -375,7 +375,6 @@ - diff --git a/examples/reports/can_24_UKRI.svrl b/examples/reports/can_24_UKRI.svrl index 7e4af61ef..0dd8daf81 100644 --- a/examples/reports/can_24_UKRI.svrl +++ b/examples/reports/can_24_UKRI.svrl @@ -504,7 +504,6 @@ - diff --git a/examples/reports/can_24_maximal.svrl b/examples/reports/can_24_maximal.svrl index f86530a32..4d6b93fa3 100644 --- a/examples/reports/can_24_maximal.svrl +++ b/examples/reports/can_24_maximal.svrl @@ -1169,7 +1169,6 @@ - diff --git a/examples/reports/can_24_minimal.svrl b/examples/reports/can_24_minimal.svrl index 4ed47d0e3..e88dac758 100644 --- a/examples/reports/can_24_minimal.svrl +++ b/examples/reports/can_24_minimal.svrl @@ -271,7 +271,6 @@ - diff --git a/examples/reports/can_24_no_tenders.svrl b/examples/reports/can_24_no_tenders.svrl index 4f058345e..f827baa03 100644 --- a/examples/reports/can_24_no_tenders.svrl +++ b/examples/reports/can_24_no_tenders.svrl @@ -193,7 +193,6 @@ - diff --git a/examples/reports/can_25_ENG.svrl b/examples/reports/can_25_ENG.svrl index f610b6af9..e570d4b3d 100644 --- a/examples/reports/can_25_ENG.svrl +++ b/examples/reports/can_25_ENG.svrl @@ -365,7 +365,6 @@ - diff --git a/examples/reports/can_25_ENG_Buyers.svrl b/examples/reports/can_25_ENG_Buyers.svrl index 8a3b15374..d460ef7ed 100644 --- a/examples/reports/can_25_ENG_Buyers.svrl +++ b/examples/reports/can_25_ENG_Buyers.svrl @@ -378,7 +378,6 @@ - diff --git a/examples/reports/can_25_ENG_buyers_countries.svrl b/examples/reports/can_25_ENG_buyers_countries.svrl index 35d7f3a98..5685708df 100644 --- a/examples/reports/can_25_ENG_buyers_countries.svrl +++ b/examples/reports/can_25_ENG_buyers_countries.svrl @@ -385,7 +385,6 @@ - diff --git a/examples/reports/can_25_ITA.svrl b/examples/reports/can_25_ITA.svrl index 1c5f746e1..d962e4839 100644 --- a/examples/reports/can_25_ITA.svrl +++ b/examples/reports/can_25_ITA.svrl @@ -364,7 +364,6 @@ - diff --git a/examples/reports/can_25_withheld.svrl b/examples/reports/can_25_withheld.svrl index 22631b823..1dae1cf91 100644 --- a/examples/reports/can_25_withheld.svrl +++ b/examples/reports/can_25_withheld.svrl @@ -569,7 +569,6 @@ - diff --git a/examples/reports/can_25_withheld_lots.svrl b/examples/reports/can_25_withheld_lots.svrl index e52a11d9c..a97460413 100644 --- a/examples/reports/can_25_withheld_lots.svrl +++ b/examples/reports/can_25_withheld_lots.svrl @@ -720,7 +720,6 @@ - diff --git a/examples/reports/can_81_FRA.svrl b/examples/reports/can_81_FRA.svrl index b03a318cf..a4f8873de 100644 --- a/examples/reports/can_81_FRA.svrl +++ b/examples/reports/can_81_FRA.svrl @@ -418,7 +418,6 @@ - diff --git a/examples/reports/t02_ESP.svrl b/examples/reports/t02_ESP.svrl index 915251a91..b86982223 100644 --- a/examples/reports/t02_ESP.svrl +++ b/examples/reports/t02_ESP.svrl @@ -374,7 +374,6 @@ - diff --git a/examples/reports/veat_23.svrl b/examples/reports/veat_23.svrl index 5e725c57e..6a6e8719d 100644 --- a/examples/reports/veat_23.svrl +++ b/examples/reports/veat_23.svrl @@ -252,7 +252,6 @@ - diff --git a/examples/reports/veat_24.svrl b/examples/reports/veat_24.svrl index 82a6e6e6b..1d3f09431 100644 --- a/examples/reports/veat_24.svrl +++ b/examples/reports/veat_24.svrl @@ -370,7 +370,6 @@ - diff --git a/examples/reports/veat_25.svrl b/examples/reports/veat_25.svrl index 4ea550e7b..153533073 100644 --- a/examples/reports/veat_25.svrl +++ b/examples/reports/veat_25.svrl @@ -309,7 +309,6 @@ - diff --git a/examples/reports/veat_81.svrl b/examples/reports/veat_81.svrl index 2f924fccb..75f03853d 100644 --- a/examples/reports/veat_81.svrl +++ b/examples/reports/veat_81.svrl @@ -282,7 +282,6 @@ - diff --git a/fields/fields.json b/fields/fields.json index 61de954e5..ac4c64f54 100644 --- a/fields/fields.json +++ b/fields/fields.json @@ -1,6 +1,6 @@ { "ublVersion" : "2.3", - "sdkVersion" : "eforms-sdk-1.10.2", + "sdkVersion" : "eforms-sdk-1.10.3", "metadataDatabase" : { "version" : "1.10.1", "createdOn" : "2023-11-16T17:47:51" @@ -3042,16 +3042,6 @@ "value" : true, "severity" : "ERROR" } ] - }, - "assert" : { - "value" : "{ND-Root} ${TRUE}", - "severity" : "ERROR", - "constraints" : [ { - "condition" : "{ND-NoticeResult} ${BT-1118-NoticeResult is present}", - "value" : "{ND-NoticeResult} ${(not(BT-1561-NoticeResult is present) and ((every text:$faEstCurr in (BT-660-LotResult/@currencyID) satisfies $faEstCurr == BT-1118-NoticeResult/@currencyID) and (BT-1118-NoticeResult == sum(BT-660-LotResult)))) or (BT-1561-NoticeResult is present) or not(every text:$faEst in (BT-660-LotResult/@currencyID) satisfies $faEst == BT-1118-NoticeResult/@currencyID)}", - "severity" : "ERROR", - "message" : "rule|text|BR-BT-01118-0100" - } ] } }, { "id" : "BT-1118-NoticeResult-Currency", @@ -27741,7 +27731,7 @@ "value" : true, "severity" : "ERROR" }, { - "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34" ], + "noticeTypes" : [ "29", "30", "31", "33", "34" ], "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')]) or not(BT-142-LotResult == 'selec-w')}", "value" : true, "severity" : "ERROR" @@ -28320,7 +28310,7 @@ "value" : true, "severity" : "ERROR" }, { - "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34" ], + "noticeTypes" : [ "29", "30", "31", "33", "34" ], "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')]) or not(BT-142-LotResult == 'selec-w')}", "value" : true, "severity" : "ERROR" diff --git a/pom.xml b/pom.xml index 23a199317..ea881a8ae 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ eu.europa.ted.eforms eforms-sdk - 1.10.2 + 1.10.3 jar eForms SDK @@ -48,7 +48,7 @@ UTF-8 - 2024-04-25T13:44:43Z + 2024-06-18T09:22:23Z s01.oss.sonatype.org diff --git a/schematrons/dynamic/validation-stage-4-25.sch b/schematrons/dynamic/validation-stage-4-25.sch index b5123391b..98bade26a 100644 --- a/schematrons/dynamic/validation-stage-4-25.sch +++ b/schematrons/dynamic/validation-stage-4-25.sch @@ -392,10 +392,6 @@ rule|text|BR-OPT-00315-0062 rule|text|BR-OPT-00320-0032 - - rule|text|BR-BT-00660-0032 - rule|text|BR-BT-00709-0032 - rule|text|BR-BT-00195-0388 rule|text|BR-BT-00196-3401 diff --git a/schematrons/dynamic/validation-stage-4-26.sch b/schematrons/dynamic/validation-stage-4-26.sch index 9d95f0799..07f3806b0 100644 --- a/schematrons/dynamic/validation-stage-4-26.sch +++ b/schematrons/dynamic/validation-stage-4-26.sch @@ -393,10 +393,6 @@ rule|text|BR-OPT-00315-0063 rule|text|BR-OPT-00320-0033 - - rule|text|BR-BT-00660-0033 - rule|text|BR-BT-00709-0033 - rule|text|BR-BT-00195-0389 rule|text|BR-BT-00196-3402 diff --git a/schematrons/dynamic/validation-stage-4-27.sch b/schematrons/dynamic/validation-stage-4-27.sch index ac8fb17a2..2ef532574 100644 --- a/schematrons/dynamic/validation-stage-4-27.sch +++ b/schematrons/dynamic/validation-stage-4-27.sch @@ -393,10 +393,6 @@ rule|text|BR-OPT-00315-0064 rule|text|BR-OPT-00320-0034 - - rule|text|BR-BT-00660-0034 - rule|text|BR-BT-00709-0034 - rule|text|BR-BT-00195-0390 rule|text|BR-BT-00196-3403 diff --git a/schematrons/dynamic/validation-stage-5.sch b/schematrons/dynamic/validation-stage-5.sch index 2e36ae595..84d2a06ff 100644 --- a/schematrons/dynamic/validation-stage-5.sch +++ b/schematrons/dynamic/validation-stage-5.sch @@ -350,9 +350,6 @@ rule|text|BR-BT-01501-0106 rule|text|BR-BT-01501-0107 - - rule|text|BR-BT-01118-0100 - rule|text|BR-BT-00198-4292 diff --git a/schematrons/static/validation-stage-4-25.sch b/schematrons/static/validation-stage-4-25.sch index b5123391b..98bade26a 100644 --- a/schematrons/static/validation-stage-4-25.sch +++ b/schematrons/static/validation-stage-4-25.sch @@ -392,10 +392,6 @@ rule|text|BR-OPT-00315-0062 rule|text|BR-OPT-00320-0032 - - rule|text|BR-BT-00660-0032 - rule|text|BR-BT-00709-0032 - rule|text|BR-BT-00195-0388 rule|text|BR-BT-00196-3401 diff --git a/schematrons/static/validation-stage-4-26.sch b/schematrons/static/validation-stage-4-26.sch index 9d95f0799..07f3806b0 100644 --- a/schematrons/static/validation-stage-4-26.sch +++ b/schematrons/static/validation-stage-4-26.sch @@ -393,10 +393,6 @@ rule|text|BR-OPT-00315-0063 rule|text|BR-OPT-00320-0033 - - rule|text|BR-BT-00660-0033 - rule|text|BR-BT-00709-0033 - rule|text|BR-BT-00195-0389 rule|text|BR-BT-00196-3402 diff --git a/schematrons/static/validation-stage-4-27.sch b/schematrons/static/validation-stage-4-27.sch index ac8fb17a2..2ef532574 100644 --- a/schematrons/static/validation-stage-4-27.sch +++ b/schematrons/static/validation-stage-4-27.sch @@ -393,10 +393,6 @@ rule|text|BR-OPT-00315-0064 rule|text|BR-OPT-00320-0034 - - rule|text|BR-BT-00660-0034 - rule|text|BR-BT-00709-0034 - rule|text|BR-BT-00195-0390 rule|text|BR-BT-00196-3403 diff --git a/schematrons/static/validation-stage-5.sch b/schematrons/static/validation-stage-5.sch index 2e36ae595..84d2a06ff 100644 --- a/schematrons/static/validation-stage-5.sch +++ b/schematrons/static/validation-stage-5.sch @@ -350,9 +350,6 @@ rule|text|BR-BT-01501-0106 rule|text|BR-BT-01501-0107 - - rule|text|BR-BT-01118-0100 - rule|text|BR-BT-00198-4292