Merge pull request #1116 from OP-TED/prepare/1.11.2

Prepare/1.11.2

Author: yfanti

CHANGELOG.md

@@ -1,3 +1,20 @@
+# SDK 1.11.2 Release Notes
+
+This release brings the following corrections in the validation rules, making them more permissive:
+
+* Do not require the organisation identifier (BT-501-Organization-Company) to be unique in the notice.
+* Allow the buyer and tenderer organisations to also be a service provider.
+
+This release brings the following corrections in the notice visualisation templates:
+
+* Add back the display of BT-748-Lot for all relevant notice subtypes. It was incorrectly removed in the previous version.
+
+This release also includes updated translations and updated notice visualisation templates.
+
+A comprehensive list of changes between SDK 1.11.1 and SDK 1.11.2 can be seen at <https://github.com/OP-TED/eForms-SDK/compare/1.11.1...1.11.2>
+
+You can explore the changes between those versions at <https://docs.ted.europa.eu/eforms-sdk-explorer?base=1.11.0&version=1.11.1>
+
 # SDK 1.11.1 Release Notes
 
 This release brings the following corrections in the validation rules, making them more permissive:

fields/fields.json

@@ -1,6 +1,6 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "eforms-sdk-1.11.1",
+  "sdkVersion" : "eforms-sdk-1.11.2",
   "metadataDatabase" : {
     "version" : "1.11.0",
     "createdOn" : "2024-03-25T10:00:00"
@@ -22368,15 +22368,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",
@@ -37420,10 +37411,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",
@@ -37558,10 +37545,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",

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-sdk</artifactId>
-  <version>1.11.1</version>
+  <version>1.11.2</version>
   <packaging>jar</packaging>
 
   <name>eForms SDK</name>
@@ -48,7 +48,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2024-08-12T09:40:24Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-01-22T15:41:02Z</project.build.outputTimestamp>
 
     <sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
 

schematrons/dynamic/validation-stage-5.sch

@@ -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">
@@ -491,7 +490,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>
@@ -544,9 +542,6 @@
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID">
 		<assert id="BR-OPT-00200-0100" role="ERROR" test="count(for $x in ., $y in /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID[. = $x] return $y) = 1">rule|text|BR-OPT-00200-0100</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">rule|text|BR-OPT-00201-0100</assert>
 	</rule>

schematrons/static/validation-stage-5.sch

@@ -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">
@@ -491,7 +490,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>
@@ -544,9 +542,6 @@
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID">
 		<assert id="BR-OPT-00200-0100" role="ERROR" test="count(for $x in ., $y in /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID[. = $x] return $y) = 1">rule|text|BR-OPT-00200-0100</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">rule|text|BR-OPT-00201-0100</assert>
 	</rule>