Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release of SDK 1.9.1 #734

Merged
merged 4 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# SDK 1.9.1 Release Notes

This release removes 3 incorrect rules (BR-BT-00262-0211, BR-BT-00262-0212, and BR-BT-00262-0213) to allow any contract nature (works, services, and supplies) for subsidized contracts.
bertrand-lorentz marked this conversation as resolved.
Show resolved Hide resolved

A comprehensive list of changes between SDK 1.9.0 and SDK 1.9.1 can be seen at <https://github.com/OP-TED/eForms-SDK/compare/1.9.0...1.9.1>

# SDK 1.9.0 Release Notes

This release of the SDK does not contain any backwards incompatible changes: software that was able to use version 1.8.0 should also be able to use this version.
Expand Down
17 changes: 1 addition & 16 deletions fields/fields.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "eforms-sdk-1.9.0",
"sdkVersion" : "eforms-sdk-1.9.1",
"metadataDatabase" : {
"version" : "1.9.5",
"createdOn" : "2023-10-05T15:56:54"
Expand Down Expand Up @@ -20284,11 +20284,6 @@
"value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0209"
}, {
"condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Lot is present)}",
"value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45') or starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0212"
} ]
}
}, {
Expand Down Expand Up @@ -20354,11 +20349,6 @@
"value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0210"
}, {
"condition" : "{ND-PartProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Part is present)}",
"value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45') or starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0213"
} ]
}
}, {
Expand Down Expand Up @@ -20434,11 +20424,6 @@
"value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0208"
}, {
"condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Procedure is present)}",
"value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45') or starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00262-0211"
} ]
}
}, {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>eu.europa.ted.eforms</groupId>
<artifactId>eforms-sdk</artifactId>
<version>1.9.0</version>
<version>1.9.1</version>
<packaging>jar</packaging>

<name>eForms SDK</name>
Expand Down Expand Up @@ -48,7 +48,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2023-10-09T11:27:03Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2023-10-23T08:32:18Z</project.build.outputTimestamp>

<sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>

Expand Down
3 changes: 0 additions & 3 deletions schematrons/dynamic/validation-stage-5.sch
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<assert id="BR-BT-00262-0202" role="ERROR" diagnostics="ND-ProcedureProcurementScope_BT-262-Procedure" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '0') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '1') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '2') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '3') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '40') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '41') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '42') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '43') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '44') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '48')) or not((cbc:ProcurementTypeCode/normalize-space(text()) = 'supplies') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0202</assert>
<assert id="BR-BT-00262-0205" role="ERROR" diagnostics="ND-ProcedureProcurementScope_BT-262-Procedure" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45')) or not((cbc:ProcurementTypeCode/normalize-space(text()) = 'works') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0205</assert>
<assert id="BR-BT-00262-0208" role="ERROR" diagnostics="ND-ProcedureProcurementScope_BT-262-Procedure" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((cbc:ProcurementTypeCode/normalize-space(text()) = 'services') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0208</assert>
<assert id="BR-BT-00262-0211" role="ERROR" diagnostics="ND-ProcedureProcurementScope_BT-262-Procedure" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (../cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']/normalize-space(text()) = ('org-sub','org-sub-cga','org-sub-ra','org-sub-la')) and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0211</assert>
</rule>
<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']">
<assert id="BR-BT-00137-0201" role="ERROR" diagnostics="BT-137-Lot" test="count(for $x in cbc:ID, $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0201</assert>
Expand All @@ -51,7 +50,6 @@
<assert id="BR-BT-00262-0203" role="ERROR" diagnostics="ND-LotProcurementScope_BT-262-Lot" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '0') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '1') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '2') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '3') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '40') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '41') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '42') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '43') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '44') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '48')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'supplies') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0203</assert>
<assert id="BR-BT-00262-0206" role="ERROR" diagnostics="ND-LotProcurementScope_BT-262-Lot" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'works') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0206</assert>
<assert id="BR-BT-00262-0209" role="ERROR" diagnostics="ND-LotProcurementScope_BT-262-Lot" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'services') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0209</assert>
<assert id="BR-BT-00262-0212" role="ERROR" diagnostics="ND-LotProcurementScope_BT-262-Lot" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((../../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (../../cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']/normalize-space(text()) = ('org-sub','org-sub-cga','org-sub-ra','org-sub-la')) and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0212</assert>
</rule>
<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod">
<assert id="BR-BT-00036-0150" role="ERROR" diagnostics="BT-36-Lot" test="((boolean(for $T in (current-date()) return ($T + (for $F in cbc:DurationMeasure return (if ($F/@unitCode='WEEK') then xs:dayTimeDuration(concat('P', $F/number() * 7, 'D')) else if ($F/@unitCode='DAY') then xs:dayTimeDuration(concat('P', $F/number(), 'D')) else if ($F/@unitCode='YEAR') then xs:yearMonthDuration(concat('P', $F/number(), 'Y')) else if ($F/@unitCode='MONTH') then xs:yearMonthDuration(concat('P', $F/number(), 'M')) else ())) > $T + xs:dayTimeDuration('P0D')))) and (boolean(for $T in (current-date()) return ($T + (for $F in cbc:DurationMeasure return (if ($F/@unitCode='WEEK') then xs:dayTimeDuration(concat('P', $F/number() * 7, 'D')) else if ($F/@unitCode='DAY') then xs:dayTimeDuration(concat('P', $F/number(), 'D')) else if ($F/@unitCode='YEAR') then xs:yearMonthDuration(concat('P', $F/number(), 'Y')) else if ($F/@unitCode='MONTH') then xs:yearMonthDuration(concat('P', $F/number(), 'M')) else ())) &lt;= $T + xs:yearMonthDuration('P3Y'))))) or not((../../cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode/normalize-space(text()) = 'res-pub-ser') and (cbc:DurationMeasure))">rule|text|BR-BT-00036-0150</assert>
Expand Down Expand Up @@ -226,7 +224,6 @@
<assert id="BR-BT-00262-0204" role="ERROR" diagnostics="ND-PartProcurementScope_BT-262-Part" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '0') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '1') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '2') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '3') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '40') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '41') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '42') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '43') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '44') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '48')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'supplies') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0204</assert>
<assert id="BR-BT-00262-0207" role="ERROR" diagnostics="ND-PartProcurementScope_BT-262-Part" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'works') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0207</assert>
<assert id="BR-BT-00262-0210" role="ERROR" diagnostics="ND-PartProcurementScope_BT-262-Part" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = 'services') and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0210</assert>
<assert id="BR-BT-00262-0213" role="ERROR" diagnostics="ND-PartProcurementScope_BT-262-Part" test="(starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '45') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '49') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '5') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '6') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '7') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '8') or starts-with(cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text()), '9')) or not((../../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (../../cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']/normalize-space(text()) = ('org-sub','org-sub-cga','org-sub-ra','org-sub-la')) and (cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0213</assert>
</rule>
<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod">
<assert id="BR-BT-00036-0151" role="ERROR" diagnostics="BT-36-Part" test="((boolean(for $T in (current-date()) return ($T + (for $F in cbc:DurationMeasure return (if ($F/@unitCode='WEEK') then xs:dayTimeDuration(concat('P', $F/number() * 7, 'D')) else if ($F/@unitCode='DAY') then xs:dayTimeDuration(concat('P', $F/number(), 'D')) else if ($F/@unitCode='YEAR') then xs:yearMonthDuration(concat('P', $F/number(), 'Y')) else if ($F/@unitCode='MONTH') then xs:yearMonthDuration(concat('P', $F/number(), 'M')) else ())) > $T + xs:dayTimeDuration('P0D')))) and (boolean(for $T in (current-date()) return ($T + (for $F in cbc:DurationMeasure return (if ($F/@unitCode='WEEK') then xs:dayTimeDuration(concat('P', $F/number() * 7, 'D')) else if ($F/@unitCode='DAY') then xs:dayTimeDuration(concat('P', $F/number(), 'D')) else if ($F/@unitCode='YEAR') then xs:yearMonthDuration(concat('P', $F/number(), 'Y')) else if ($F/@unitCode='MONTH') then xs:yearMonthDuration(concat('P', $F/number(), 'M')) else ())) &lt;= $T + xs:yearMonthDuration('P3Y'))))) or not((../../cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode/normalize-space(text()) = 'res-pub-ser') and (cbc:DurationMeasure))">rule|text|BR-BT-00036-0151</assert>
Expand Down
Loading