Skip to content

Commit 02baaaf

Browse files
bertrand-lorentzbertrand-lorentz
authored
Merge pull request #1004 from OP-TED/prepare/1.7.5
Prepare release of SDK 1.7.5
2 parents 6717840 + b0d46ed commit 02baaaf

File tree

6 files changed

+15
-43
lines changed

6 files changed

+15
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# SDK 1.7.5 Release Notes
2+
3+
This release brings the following corrections in the validation rules, making them more permissive:
4+
5+
* 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.
6+
7+
A comprehensive list of changes between SDK 1.7.4 and SDK 1.7.5 can be seen at <https://github.com/OP-TED/eForms-SDK/compare/1.7.4...1.7.5>
8+
9+
You can explore the changes between those versions at <https://docs.ted.europa.eu/eforms-sdk-explorer?base=1.7.4&version=1.7.5>
10+
111
# SDK 1.7.4 Release Notes
212

313
This release brings the following corrections in the validation rules, making them more permissive:

‎fields/fields.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ublVersion" : "2.3",
3-
"sdkVersion" : "eforms-sdk-1.7.4",
3+
"sdkVersion" : "eforms-sdk-1.7.5",
44
"metadataDatabase" : {
55
"version" : "1.7.1",
66
"createdOn" : "2023-04-24T12:34:54"

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>eu.europa.ted.eforms</groupId>
55
<artifactId>eforms-sdk</artifactId>
6-
<version>1.7.4</version>
6+
<version>1.7.5</version>
77
<packaging>jar</packaging>
88

99
<name>eForms SDK</name>
@@ -48,7 +48,7 @@
4848

4949
<properties>
5050
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
51-
<project.build.outputTimestamp>2024-04-29T11:47:40Z</project.build.outputTimestamp>
51+
<project.build.outputTimestamp>2024-08-13T08:32:14Z</project.build.outputTimestamp>
5252

5353
<version.eforms-sdk-analyzer>1.6.0-SNAPSHOT</version.eforms-sdk-analyzer>
5454

‎schematrons/dynamic/config.sch‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- URL prefix of the service to fetch a notice.
33
The value must be between single quotes.
4-
The notice identifier will be appended, to build the URL used to fetch the corresponding notice XML. -->
4+
The notice identifier will be appended, to build the URL used to fetch the corresponding notice XML.
5+
Currently not used. -->
56
<let xmlns="http://purl.oclc.org/dsdl/schematron" name="urlPrefix" value="'http://localhost:8080/notices/'"/>

‎schematrons/dynamic/validation-stage-6a.sch‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!--File generated from metadata database version 1.7.0 created on the 2023-03-31T15:30.-->
33
<pattern id="EFORMS-validation-stage-6a" xmlns="http://purl.oclc.org/dsdl/schematron">
4-
<rule context="/*/cac:ProcurementProject/cac:MainCommodityClassification[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier]">
5-
<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>
6-
</rule>
74
</pattern>

‎schematrons/dynamic/validation-stage-6b.sch‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,4 @@
1111
</assert>
1212
</rule>
1313

14-
<!-- Schematron rules to enforce that certain values in a Change Notice are the
15-
same as those in the parent notice (the notice that is subject to the change). -->
16-
17-
<!-- Reference to the parent notice. -->
18-
<let name="parentNoticeId" value="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier/fn:normalize-space(text())"/>
19-
20-
<!-- Function that fetches a notice based on its identifier.
21-
The value of $urlPrefix is defined in config.sch. -->
22-
<let name="getParentNotice" value="function($id) { fn:doc(concat($urlPrefix, $id)) }"/>
23-
24-
<!-- XML document of the parent notice. -->
25-
<let name="parentNotice" value="$getParentNotice($parentNoticeId)"/>
26-
27-
<!-- Rules applying at root or Procedure level -->
28-
<rule context="/*[$isChangeNotice = true()]">
29-
<!-- Notice subtype -->
30-
<assert role="ERROR" test="$noticeSubType eq $parentNotice/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/fn:normalize-space(text())">
31-
The notice subtype must be the same as for the parent notice.
32-
</assert>
33-
34-
<!-- BT-105-Procedure Procedure Type -->
35-
<assert role="ERROR" test="deep-equal( cac:TenderingProcess/cbc:ProcedureCode/fn:normalize-space(text()), $parentNotice/*/cac:TenderingProcess/cbc:ProcedureCode/fn:normalize-space(text()) )">
36-
The value of "Procedure Type" (BT-105-Procedure) value must be the same as for the parent notice.
37-
</assert>
38-
39-
<!-- BT-04-notice Procedure Identifier -->
40-
<assert role="ERROR" test="cbc:ContractFolderID/fn:normalize-space(text()) = $parentNotice/*/cbc:ContractFolderID/fn:normalize-space(text())">
41-
The value of "Procedure Identifier" (BT-04-notice) must be the same as for the parent notice.
42-
</assert>
43-
44-
<!-- BT-23-Procedure Main Nature -->
45-
<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()) )">
46-
The value of "Main Nature" (BT-23-Procedure) must be the same as for the parent notice.
47-
</assert>
48-
</rule>
49-
5014
</pattern>

0 commit comments

Comments
 (0)