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/1.10.5 #1115

Open
wants to merge 9 commits into
base: release/1.10.5
Choose a base branch
from
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# SDK 1.10.5 Release Notes

This release includes updated translations and updated notice visualisation templates.

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

You can explore the changes between those versions at <https://docs.ted.europa.eu/eforms-sdk-explorer?base=1.10.4&version=1.10.5>

# SDK 1.10.4 Release Notes

This release brings the following corrections in the validation rules, making them more permissive:
Expand Down
19 changes: 1 addition & 18 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.10.4",
"sdkVersion" : "eforms-sdk-1.10.5",
"metadataDatabase" : {
"version" : "1.10.1",
"createdOn" : "2023-11-16T17:47:51"
Expand Down Expand Up @@ -22192,15 +22192,6 @@
"value" : true,
"severity" : "ERROR"
} ]
},
"assert" : {
"value" : "{ND-Root} ${TRUE}",
"severity" : "ERROR",
"constraints" : [ {
"value" : "{BT-501-Organization-Company} ${BT-501-Organization-Company is unique in /BT-501-Organization-Company}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00501-0259"
} ]
}
}, {
"id" : "BT-5010-Lot",
Expand Down Expand Up @@ -36703,10 +36694,6 @@
"value" : "{ND-Root} ${every text:$buyer in OPT-300-Procedure-Buyer satisfies ($buyer in /OPT-200-Organization-Company)}",
"severity" : "ERROR",
"message" : "rule|text|BR-OPT-00300-0250"
}, {
"value" : "{ND-Root} ${every text:$sps in OPT-300-Procedure-SProvider satisfies $sps not in OPT-300-Procedure-Buyer}",
"severity" : "ERROR",
"message" : "rule|text|BR-OPT-00300-0254"
}, {
"value" : "{ND-Root} ${(every text:$tenderer in OPT-300-Tenderer satisfies $tenderer not in OPT-300-Procedure-Buyer) and (every text:$subcont in OPT-301-Tenderer-SubCont satisfies $subcont not in OPT-300-Procedure-Buyer)}",
"severity" : "ERROR",
Expand Down Expand Up @@ -36827,10 +36814,6 @@
"value" : "{ND-TenderingParty} ${every text:$mediator in /OPT-301-Lot-Mediator satisfies $mediator not in OPT-300-Tenderer}",
"severity" : "ERROR",
"message" : "rule|text|BR-OPT-00300-0256"
}, {
"value" : "{ND-TenderingParty} ${every text:$psp in OPT-300-Procedure-SProvider satisfies $psp not in OPT-300-Tenderer}",
"severity" : "ERROR",
"message" : "rule|text|BR-OPT-00300-0257"
}, {
"value" : "{ND-TenderingParty} ${every text:$revOrg in /OPT-301-Lot-ReviewOrg satisfies $revOrg not in OPT-300-Tenderer}",
"severity" : "ERROR",
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.10.4</version>
<version>1.10.5</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>2024-08-12T10:00:45Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2025-01-22T15:53:30Z</project.build.outputTimestamp>

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

Expand Down
5 changes: 0 additions & 5 deletions schematrons/dynamic/validation-stage-5.sch
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<assert id="BR-BT-00702-0150" role="ERROR" diagnostics="BT-702_a_-notice" test="(not(cbc:NoticeLanguageCode/normalize-space(text()) = cac:AdditionalNoticeLanguage/cbc:ID/normalize-space(text()))) or not(cac:AdditionalNoticeLanguage/cbc:ID)">rule|text|BR-BT-00702-0150</assert>
<assert id="BR-BT-00738-0053" role="ERROR" diagnostics="BT-738-notice" test="((boolean(for $T in (current-date()) return ($T + xs:dayTimeDuration(cbc:RequestedPublicationDate/xs:date(text()) - cbc:IssueDate/xs:date(text())) &lt; $T + xs:dayTimeDuration('P60D')))) and (boolean(for $T in (current-date()) return ($T + xs:dayTimeDuration(cbc:RequestedPublicationDate/xs:date(text()) - cbc:IssueDate/xs:date(text())) >= $T + xs:dayTimeDuration('P0D'))))) or not(cbc:RequestedPublicationDate)">rule|text|BR-BT-00738-0053</assert>
<assert id="BR-OPT-00300-0250" role="ERROR" diagnostics="ND-Root_OPT-300-Procedure-Buyer" test="(every $buyer in cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies ($buyer = /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/normalize-space(text()))) or not(cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID)">rule|text|BR-OPT-00300-0250</assert>
<assert id="BR-OPT-00300-0254" role="ERROR" diagnostics="ND-Root_OPT-300-Procedure-Buyer" test="every $sps in cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($sps = cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0254</assert>
<assert id="BR-OPT-00300-0255" role="ERROR" diagnostics="ND-Root_OPT-300-Procedure-Buyer" test="(every $tenderer in ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer/cbc:ID/normalize-space(text()) satisfies not($tenderer = cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text()))) and (every $subcont in ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/cbc:ID/normalize-space(text()) satisfies not($subcont = cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text())))">rule|text|BR-OPT-00300-0255</assert>
</rule>
<rule context="/*/cac:AdditionalNoticeLanguage/cbc:ID">
Expand Down Expand Up @@ -483,7 +482,6 @@
<assert id="BR-OPT-00210-0102" role="ERROR" diagnostics="OPT-210-Tenderer" test="(cbc:ID/normalize-space(text()) = ../efac:LotTender/efac:TenderingParty/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00210-0102</assert>
<assert id="BR-OPT-00300-0253" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="(every $tenderer in efac:Tenderer/cbc:ID/normalize-space(text()) satisfies ($tenderer = /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/normalize-space(text()))) or not(efac:Tenderer/cbc:ID)">rule|text|BR-OPT-00300-0253</assert>
<assert id="BR-OPT-00300-0256" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="every $mediator in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($mediator = efac:Tenderer/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0256</assert>
<assert id="BR-OPT-00300-0257" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="every $psp in ../../../../../../cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($psp = efac:Tenderer/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0257</assert>
<assert id="BR-OPT-00300-0258" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="every $revOrg in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($revOrg = efac:Tenderer/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0258</assert>
<assert id="BR-OPT-00300-0259" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="every $addInfo in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($addInfo = efac:Tenderer/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0259</assert>
<assert id="BR-OPT-00300-0260" role="ERROR" diagnostics="ND-TenderingParty_OPT-300-Tenderer" test="every $employ in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text()) satisfies not($employ = efac:Tenderer/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00300-0260</assert>
Expand Down Expand Up @@ -531,9 +529,6 @@
<assert id="BR-OPT-00200-0102" role="ERROR" diagnostics="OPT-200-Organization-Company" test="(not(../efac:TouchPoint/cac:PartyIdentification/cbc:ID)) or not(cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:TenderingParty/efac:SubContractor/cbc:ID/normalize-space(text()))">rule|text|BR-OPT-00200-0102</assert>
<assert id="BR-OPT-00200-0103" role="ERROR" diagnostics="OPT-200-Organization-Company" test="((cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:SettledContract/cac:SignatoryParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:TenderingParty/efac:Tenderer/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:AppealInformationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:LotResult/cac:FinancingParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:LotResult/cac:PayerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:AppealInformationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../../../../../cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TenderRecipientParty/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:AppealsInformation/efac:AppealStatus/efac:AppealProcessingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:AppealsInformation/efac:AppealStatus/efac:AppealingParty/cac:Party/cac:PartyIdentification/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor/cbc:ID/normalize-space(text())) or (cac:PartyIdentification/cbc:ID/normalize-space(text()) = ../../../efac:NoticeResult/efac:TenderingParty/efac:SubContractor/cbc:ID/normalize-space(text())))">rule|text|BR-OPT-00200-0103</assert>
</rule>
<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity/cbc:CompanyID">
<assert id="BR-BT-00501-0259" role="ERROR" test="count(for $x in ., $y in /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity/cbc:CompanyID[. = $x] return $y) = 1">rule|text|BR-BT-00501-0259</assert>
</rule>
<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyIdentification/cbc:ID">
<assert id="BR-OPT-00201-0100" role="ERROR" test="(count(for $x in ., $y in /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyIdentification/cbc:ID[. = $x] return $y) = 1) or not(.)">rule|text|BR-OPT-00201-0100</assert>
</rule>
Expand Down
Loading
Loading