From f7ffdfb4d7232f248de674921660e10c167981dc Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Thu, 23 May 2024 16:06:20 +0200
Subject: [PATCH 1/3] schematrons: Remove all rules that fetch another notice
 (TEDEFO-3376)

They have currently no effect, as the service they call does not exist,
and they are also incomplete.
They cause errors with ph-schematron 8.0.0 in pure mode, so it's better
to remove them.

(cherry picked from commit e9d516db18565c7839c7bad2ebba0128e34e6035)
---
 schematrons/dynamic/config.sch              |  3 +-
 schematrons/dynamic/validation-stage-6a.sch |  3 --
 schematrons/dynamic/validation-stage-6b.sch | 35 ---------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/schematrons/dynamic/config.sch b/schematrons/dynamic/config.sch
index bb6e87b5f..1f41704e3 100644
--- a/schematrons/dynamic/config.sch
+++ b/schematrons/dynamic/config.sch
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- URL prefix of the service to fetch a notice.
 	 The value must be between single quotes.
-	 The notice identifier will be appended, to build the URL used to fetch the corresponding notice XML. -->
+	 The notice identifier will be appended, to build the URL used to fetch the corresponding notice XML.
+	 Currently not used. -->
 <let xmlns="http://purl.oclc.org/dsdl/schematron" name="urlPrefix" value="'http://localhost:8080/notices/'"/>
diff --git a/schematrons/dynamic/validation-stage-6a.sch b/schematrons/dynamic/validation-stage-6a.sch
index bc2017f45..f26c1ee99 100644
--- a/schematrons/dynamic/validation-stage-6a.sch
+++ b/schematrons/dynamic/validation-stage-6a.sch
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--File generated from metadata database version 1.6.0 created on the 2023-02-17T12:00.-->
 <pattern id="EFORMS-validation-stage-6a" xmlns="http://purl.oclc.org/dsdl/schematron">
-	<rule context="/*/cac:ProcurementProject/cac:MainCommodityClassification[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier]">
-		<assert id="BR-BT-00262-0300" role="ERROR" diagnostics="BT-262-Procedure" test="(cbc:ItemClassificationCode/normalize-space(text()) = fn:doc(concat($urlPrefix, /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier/normalize-space(text())))/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/normalize-space(text())) or not(fn:doc(concat($urlPrefix, /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier/normalize-space(text())))/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5') and (fn:doc(concat($urlPrefix, /*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier/normalize-space(text())))/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode))">rule|text|BR-BT-00262-0300</assert>
-	</rule>
 </pattern>
\ No newline at end of file
diff --git a/schematrons/dynamic/validation-stage-6b.sch b/schematrons/dynamic/validation-stage-6b.sch
index b2fe1c383..6b97cdec3 100644
--- a/schematrons/dynamic/validation-stage-6b.sch
+++ b/schematrons/dynamic/validation-stage-6b.sch
@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pattern id="EFORMS-validation-stage-6b" xmlns="http://purl.oclc.org/dsdl/schematron">
-<!-- This file contains schematron rules to enforce that certain values in a Change Notice are the 
-	 same as those in the parent notice (the notice that is subject to the change). -->
-
-<!-- Reference to the parent notice. -->
-<let name="parentNoticeId" value="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier/fn:normalize-space(text())"/>
-
-<!-- Function that fetches a notice based on its identifier.
-	 The value of $urlPrefix is defined in config.sch. -->
-<let name="getParentNotice" value="function($id) { fn:doc(concat($urlPrefix, $id)) }"/>
-
-<!-- XML document of the parent notice. -->
-<let name="parentNotice" value="$getParentNotice($parentNoticeId)"/>
-
-<!-- Rules applying at root or Procedure level -->
-<rule context="/*[$isChangeNotice = true()]">
-	<!-- Notice subtype -->
-	<assert role="ERROR" test="$noticeSubType eq $parentNotice/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/fn:normalize-space(text())">
-		The notice subtype must be the same as for the parent notice.
-	</assert>
-
-	<!-- BT-105-Procedure Procedure Type -->
-	<assert role="ERROR" test="deep-equal( cac:TenderingProcess/cbc:ProcedureCode/fn:normalize-space(text()), $parentNotice/*/cac:TenderingProcess/cbc:ProcedureCode/fn:normalize-space(text()) )">
-		The value of "Procedure Type" (BT-105-Procedure) value must be the same as for the parent notice.
-	</assert>
-
-	<!-- BT-04-notice Procedure Identifier -->
-	<assert role="ERROR" test="cbc:ContractFolderID/fn:normalize-space(text()) = $parentNotice/*/cbc:ContractFolderID/fn:normalize-space(text())">
-		The value of "Procedure Identifier" (BT-04-notice) must be the same as for the parent notice.
-	</assert>
-
-	<!-- BT-23-Procedure Main Nature  -->
-	<assert role="ERROR" test="( cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']/fn:normalize-space(text()) = $parentNotice/*/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']/fn:normalize-space(text()) )">
-		The value of "Main Nature" (BT-23-Procedure) must be the same as for the parent notice.
-	</assert>
-</rule>
 
 </pattern>

From 3377e97f971d8c748fabce73e7f21858df1f5cf1 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Tue, 13 Aug 2024 10:46:12 +0200
Subject: [PATCH 2/3] CHANGELOG: Update for SDK 1.6.5

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1087f798..46cc25be5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# SDK 1.6.5 Release Notes
+
+This release brings the following corrections in the validation rules, making them more permissive:
+
+* Remove rules that try to fetch another notice. They never had any effect, as the service they call does not exist, and they can cause errors with some schematron implementations.
+
+A comprehensive list of changes between SDK 1.6.4 and SDK 1.6.5 can be seen at <https://github.com/OP-TED/eForms-SDK/compare/1.6.4...1.6.5>
+
+You can explore the changes between those versions at <https://docs.ted.europa.eu/eforms-sdk-explorer?base=1.6.4&version=1.6.5>
+
 # SDK 1.6.4 Release Notes
 
 This release brings the following corrections in the validation rules, making them more permissive:

From ae1cc4a023f99fb9e34f6251b5e0ab634d5cbe3b Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Tue, 13 Aug 2024 10:46:50 +0200
Subject: [PATCH 3/3] Update version to 1.6.5 in pom.xml and fields.json

---
 fields/fields.json | 2 +-
 pom.xml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fields/fields.json b/fields/fields.json
index f45ddfbb3..69210c641 100644
--- a/fields/fields.json
+++ b/fields/fields.json
@@ -1,6 +1,6 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "eforms-sdk-1.6.4",
+  "sdkVersion" : "eforms-sdk-1.6.5",
   "metadataDatabase" : {
     "version" : "1.6.0",
     "createdOn" : "2023-02-17T12:00:00"
diff --git a/pom.xml b/pom.xml
index 50bec629b..e9dc2bd67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-sdk</artifactId>
-  <version>1.6.4</version>
+  <version>1.6.5</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-01-24T15:41:45Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-13T08:46:11Z</project.build.outputTimestamp>
 
     <version.eforms-sdk-analyzer>1.6.0-SNAPSHOT</version.eforms-sdk-analyzer>