Feature/4.1.0 rc.3 (#658)

Fixes: #638 #628 #637 #607 #627 #598 #596
OP-TED · Jul 18, 2024 · 1c245b5 · 1c245b5
1 parent 98dcd5d
commit 1c245b5
Show file tree

Hide file tree

Showing 84 changed files with 2,520 additions and 2,876 deletions.
diff --git a/.github/workflows/disabled.transform_epo.yml → .github/workflows/transform_epo.yml b/.github/workflows/disabled.transform_epo.yml → .github/workflows/transform_epo.yml
diff --git a/analysis_and_design/conceptual_model/ePO_CM.eap b/analysis_and_design/conceptual_model/ePO_CM.eap
diff --git a/glossary/eAccess_glossary.html b/glossary/eAccess_glossary.html
@@ -224,7 +224,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                         is left to implementers. In the case where the purpose is to link the two Requirements
                         without additional information, the simple relationship as proposed here can be directly
                         used.</td>
-                     <td>cccev:Requirement (external) -&gt; eli:LegalResource []</td>
+                     <td>cccev:Requirement (external) -&gt; eli:LegalResource [0..*]</td>
                   </tr>
                   <tr>
                      <td>cccev:specifiesEvidenceType</td>
@@ -327,7 +327,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td>Is about an European Single Procurement Document (ESPD) Request.
 
                         WG approval 05/03/2024</td>
-                     <td>epo-sub:ESPDResponse (external) -&gt; epo-acc:ESPDRequest [1]</td>
+                     <td>epo-sub:ESPD (external) -&gt; epo-acc:ESPDRequest [1]</td>
                   </tr>
                </tbody>
             </table>

diff --git a/glossary/eCatalogue_glossary.html b/glossary/eCatalogue_glossary.html
@@ -742,7 +742,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td>epo-cat:hasExternalSpecification</td>
                      <td>URI reference to external item information or specifications, e.g. web address.
                         </td>
-                     <td>epo-cat:Item -&gt; epo:Document (external) []</td>
+                     <td>epo-cat:Item -&gt; epo:Document (external) [0..*]</td>
                   </tr>
                   <tr>
                      <td>epo-cat:hasHazardousItemUNDGCode</td>

diff --git a/glossary/eFulfilment_glossary.html b/glossary/eFulfilment_glossary.html
@@ -320,11 +320,6 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td></td>
                      <td>epo-ful:TransportMeans -&gt; epo-ful:TransportMeansOperator [1..*]</td>
                   </tr>
-                  <tr>
-                     <td>epo:hasRejectedQuantity</td>
-                     <td></td>
-                     <td>epo-ful:ReceiptAdviceLine -&gt; epo:Quantity (external) [0..1]</td>
-                  </tr>
                   <tr>
                      <td>epo:playedBy</td>
                      <td></td>
@@ -558,6 +553,11 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td></td>
                      <td>epo-ful:ReceiptAdviceLine -&gt; epo:Quantity (external) [0..1]</td>
                   </tr>
+                  <tr>
+                     <td>epo-ful:hasRejectedQuantity</td>
+                     <td></td>
+                     <td>epo-ful:ReceiptAdviceLine -&gt; epo:Quantity (external) [0..1]</td>
+                  </tr>
                   <tr>
                      <td>epo-ful:hasRejectReason</td>
                      <td></td>

diff --git a/glossary/ePO_combined_glossary.html b/glossary/ePO_combined_glossary.html
diff --git a/glossary/ePO_core_glossary.html b/glossary/ePO_core_glossary.html
@@ -5396,7 +5396,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo:indicatesInvoiceeContactPoint</td>
                      <td></td>
-                     <td>epo:Buyer -&gt; cpov:ContactPoint []</td>
+                     <td>epo:Buyer -&gt; cpov:ContactPoint [0..*]</td>
                   </tr>
                   <tr>
                      <td>epo:involvesBuyer</td>

diff --git a/glossary/eSubmission_glossary.html b/glossary/eSubmission_glossary.html
@@ -68,7 +68,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Class names and defi
                         WG approval 12/03/2024</td>
                   </tr>
                   <tr>
-                     <td>epo-sub:ESPDResponse</td>
+                     <td>epo-sub:ESPD</td>
                      <td>A document conveying the fulfilment or not by the economic operator of the Exclusion
                         Grounds and the Selection Criteria set out by the Buyer for a specific Procurement
                         using an European Single Procurement Document (ESPD) Request. 
@@ -178,7 +178,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
 
                         Classifications should be defined by an organisation/country as an outcome of a security
                         assessment.</td>
-                     <td>epo-sub:Response -&gt; at-voc:access-rights (external) []</td>
+                     <td>epo-sub:Response -&gt; at-voc:access-rights (external) [0..1]</td>
                   </tr>
                   <tr>
                      <td>cccev:providesValueFor</td>
@@ -195,20 +195,10 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td></td>
                      <td>epo-sub:LegalRepresentative -&gt; epo:OfferingParty (external) [0..1]</td>
                   </tr>
-                  <tr>
-                     <td>epo:answersExclusionGround</td>
-                     <td></td>
-                     <td>epo-sub:ESPDResponse -&gt; epo:ExclusionGround (external) [1]</td>
-                  </tr>
-                  <tr>
-                     <td>epo:answersSelectionCriteria</td>
-                     <td></td>
-                     <td>epo-sub:ESPDResponse -&gt; epo:SelectionCriterion (external) [1]</td>
-                  </tr>
                   <tr>
                      <td>epo:isSupportedBy</td>
                      <td></td>
-                     <td>epo:Tender (external) -&gt; epo-sub:ESPDResponse [1]</td>
+                     <td>epo:Tender (external) -&gt; epo-sub:ESPD [1]</td>
                   </tr>
                   <tr>
                      <td>epo-sub:answersQuestion</td>
@@ -252,7 +242,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td>Offers information about an instance of a concept.
 
                         WG approval 05/03/2024</td>
-                     <td>epo-sub:ESPDResponse -&gt; org:Organization (external) [0..*]</td>
+                     <td>epo-sub:ESPD -&gt; org:Organization (external) [0..*]</td>
                   </tr>
                   <tr>
                      <td>epo-sub:providesOrganisationEmployeeQuantity</td>
@@ -286,26 +276,19 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                         WG approval 12/03/2024</td>
                      <td>epo-sub:Response -&gt; epo:Period (external) [0..1]</td>
                   </tr>
-                  <tr>
-                     <td>epo-sub:refersToOtherESPDResponse</td>
-                     <td>Reference to other European Single Procurement Document (ESPD) Response.
-
-                        WG approval 05/03/2024</td>
-                     <td>epo-sub:ESPDResponse -&gt; epo-sub:ESPDResponse [0..*]</td>
-                  </tr>
                   <tr>
                      <td>epo-sub:relatesToESPDRequest</td>
                      <td>Is about an European Single Procurement Document (ESPD) Request.
 
                         WG approval 05/03/2024</td>
-                     <td>epo-sub:ESPDResponse -&gt; epo-acc:ESPDRequest (external) [1]</td>
+                     <td>epo-sub:ESPD -&gt; epo-acc:ESPDRequest (external) [1]</td>
                   </tr>
                   <tr>
                      <td>epo-sub:specifiesResponse</td>
                      <td>Relation indicating that an ESPD Response contains a Response.
 
                         WG approval 12/03/2024</td>
-                     <td>epo-sub:ESPDResponse -&gt; epo-sub:Response [1..*]</td>
+                     <td>epo-sub:ESPD -&gt; epo-sub:Response [1..*]</td>
                   </tr>
                   <tr>
                      <td>epo-sub:summarisesInformationAboutCertificate</td>

diff --git a/implementation/eAccess/conventions_report/eAccess_convention_report.html b/implementation/eAccess/conventions_report/eAccess_convention_report.html
@@ -19,7 +19,7 @@
    <body>
       <header class="counter-skip">
          <h1 class="title">UML Conventions Comformance Report</h1>
-         <h2>[ 21/03/2024 ]</h2>
+         <h2>[ 10/07/2024 ]</h2>
          <div class="authors col-span">
             <div class="author">
                <div>Publications Office of the European Union</div>
@@ -56,7 +56,7 @@ <h1>Abstract</h1>
                   Generalisations</em>. Each major section lists model items that need correction of errors
                or consideration of warnings.</p>
             <p>The UML model in file <em>eAccess.xml</em> 
-               was tested at 11:52 on March 21, 2024.</p>
+               was tested at 12:11 on July 10, 2024.</p>
          </div>
          <h1 xmlns:f="http://https://github.com/costezki/model2owl#" id="nomenclature">Nomenclature</h1>
          <h2 xmlns:f="http://https://github.com/costezki/model2owl#" id="classNames">Class names</h2>

diff --git a/implementation/eAccess/model2owl-config/namespaces.xml b/implementation/eAccess/model2owl-config/namespaces.xml
@@ -13,14 +13,14 @@
     <prefix name="org" value="http://www.w3.org/ns/org#" importURI="http://www.w3.org/ns/org#"/>
     <prefix name="skos" value="http://www.w3.org/2004/02/skos/core#" importURI="http://www.w3.org/2004/02/skos/core"/>
 
-    <prefix name="epo" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#core"/>
     <prefix name="epo-cat" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-con" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-ord" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-not" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-ful" value="http://data.europa.eu/a4g/ontology#"/>
     <prefix name="epo-acc" value="http://data.europa.eu/a4g/ontology#"/>
-    <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#"/>
+    <prefix name="epo-sub" value="http://data.europa.eu/a4g/ontology#" importURI="http://data.europa.eu/a4g/ontology#sub"/>
 
     <prefix name="nuts" value="http://data.europa.eu/nuts/"/>
     <prefix name="espd" value="https://github.com/ESPD/ESPD-EDM/"/>

diff --git a/implementation/eAccess/owl_ontology/eAccess.rdf b/implementation/eAccess/owl_ontology/eAccess.rdf
@@ -2,6 +2,7 @@
 <rdf:RDF xmlns="http://data.europa.eu/a4g/ontology#"
          xmlns:adms="http://www.w3.org/ns/adms#"
          xmlns:at-voc="http://publications.europa.eu/resource/authority/"
+         xmlns:at-voc-new="http://publications.europa.eu/resource/authority/new/"
          xmlns:cccev="http://data.europa.eu/m8g/"
          xmlns:core="http://data.europa.eu/m8g/"
          xmlns:cpov="http://data.europa.eu/m8g/"
@@ -40,26 +41,31 @@
       <owl:imports rdf:resource="http://purl.org/dc/terms/"/>
       <owl:imports rdf:resource="http://www.w3.org/ns/org#"/>
       <owl:imports rdf:resource="http://www.w3.org/2004/02/skos/core"/>
+      <owl:imports rdf:resource="http://data.europa.eu/a4g/ontology#core"/>
+      <owl:imports rdf:resource="http://data.europa.eu/a4g/ontology#sub"/>
       <owl:imports rdf:resource="http://www.w3.org/2006/time"/>
       <owl:imports rdf:resource="http://www.w3.org/ns/locn"/>
       <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
+      <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
+      <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
+      <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
+      <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
+      <owl:imports rdf:resource="http://data.europa.eu/m8g/"/>
       <owl:imports rdf:resource="http://www.w3.org/ns/person"/>
       <owl:imports rdf:resource="http://www.w3.org/ns/adms"/>
       <owl:imports rdf:resource="http://purl.org/vocab/vann/"/>
       <owl:imports rdf:resource="http://data.europa.eu/eli/ontology#"/>
       <owl:imports rdf:resource="http://iflastandards.info/ns/fr/frbr/frbroo/"/>
-      <owl:imports rdf:resource="http://data.europa.eu/a4g/ontology#core"/>
-      <owl:imports rdf:resource="http://data.europa.eu/a4g/ontology#sub"/>
       <dct:title xml:lang="en">eProcurement Ontology Access - core</dct:title>
       <rdfs:label xml:lang="en">eProcurement Ontology Access - core</rdfs:label>
       <dct:description xml:lang="en">The eProcurement Ontology Access core describes the concepts and properties representing the European Public Procurement Access domain. The provision of these semantics offers the basis for a common understanding of the domain for all stakeholders ensuring the quality of data exchange and transparency. The ontology restrictions are published in a separate artefact.</dct:description>
       <dct:publisher>http://publications.europa.eu/resource/authority/corporate-body/PUBL</dct:publisher>
-      <rdfs:comment>This version is automatically generated from eAccess.xml on 2024-03-21</rdfs:comment>
+      <rdfs:comment>This version is automatically generated from eAccess.xml on 2024-07-10</rdfs:comment>
       <rdfs:seeAlso rdf:resource="https://github.com/OP-TED/ePO/releases"/>
       <rdfs:seeAlso rdf:resource="https://joinup.ec.europa.eu/collection/eprocurement/solution/eprocurement-ontology/about"/>
       <rdfs:seeAlso rdf:resource="https://op.europa.eu/en/web/eu-vocabularies/e-procurement"/>
       <rdfs:seeAlso rdf:resource="https://docs.ted.europa.eu/home/index.html"/>
-      <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2024-03-21</dct:issued>
+      <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2024-07-10</dct:issued>
       <dct:created rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2021-06-01</dct:created>
       <owl:versionInfo>4.1.0</owl:versionInfo>
       <owl:incompatibleWith>3.1.0</owl:incompatibleWith>
@@ -159,7 +165,7 @@
       <rdfs:subClassOf rdf:resource="http://data.europa.eu/eli/ontology#LegalResource"/>
    </owl:Class>
    <owl:Class rdf:about="http://data.europa.eu/a4g/ontology#ESPDRequest">
-      <rdfs:subClassOf rdf:resource="http://data.europa.eu/a4g/ontology#Document"/>
+      <rdfs:subClassOf rdf:resource="http://data.europa.eu/a4g/ontology#ProcurementDocument"/>
    </owl:Class>
    <owl:ObjectProperty rdf:about="http://www.w3.org/ns/adms#identifier"/>
    <rdf:Description rdf:about="http://www.w3.org/ns/adms#identifier">
@@ -284,7 +290,7 @@
       <skos:prefLabel xml:lang="en">Relates to e s p d request</skos:prefLabel>
    </rdf:Description>
    <rdf:Description rdf:about="http://data.europa.eu/a4g/ontology#relatesToESPDRequest">
-      <skos:definition xml:lang="en">Is about an European Single Procurement Document (ESPD) Request. WG approval 05/03/2024 (epo-sub:ESPDResponse -&gt; epo-acc:ESPDRequest (+epo-sub:relatesToESPDRequest))</skos:definition>
+      <skos:definition xml:lang="en">Is about an European Single Procurement Document (ESPD) Request. WG approval 05/03/2024 (epo-sub:ESPD -&gt; epo-acc:ESPDRequest (+epo-sub:relatesToESPDRequest))</skos:definition>
    </rdf:Description>
    <rdf:Description rdf:about="http://data.europa.eu/a4g/ontology#relatesToESPDRequest">
       <rdfs:isDefinedBy rdf:resource="http://data.europa.eu/a4g/ontology#acc"/>

diff --git a/implementation/eAccess/owl_ontology/eAccess.ttl b/implementation/eAccess/owl_ontology/eAccess.ttl
@@ -15,7 +15,7 @@
 
 :ESPDRequest a owl:Class ;
     rdfs:isDefinedBy :acc ;
-    rdfs:subClassOf :Document ;
+    rdfs:subClassOf :ProcurementDocument ;
     skos:definition "An updated self-declaration used by the economic operator as a preliminary evidence in replacement of certificates issued by public authorities or third parties confirming that the economic operator fulfils the Exclusion Grounds and the Selection Criteria set out by the Buyer for a specific Procurement. WG Approval 05/03/2024"@en ;
     skos:prefLabel "E s p d request"@en .
 
@@ -40,7 +40,7 @@
 
 :relatesToESPDRequest a owl:ObjectProperty ;
     rdfs:isDefinedBy :acc ;
-    skos:definition "Is about an European Single Procurement Document (ESPD) Request. WG approval 05/03/2024 (epo-sub:ESPDResponse -> epo-acc:ESPDRequest (+epo-sub:relatesToESPDRequest))"@en ;
+    skos:definition "Is about an European Single Procurement Document (ESPD) Request. WG approval 05/03/2024 (epo-sub:ESPD -> epo-acc:ESPDRequest (+epo-sub:relatesToESPDRequest))"@en ;
     skos:prefLabel "Relates to e s p d request"@en .
 
 :specifiesProcurementCriterion a owl:ObjectProperty ;
@@ -162,18 +162,20 @@ eli:Work a owl:Class ;
     rdfs:label "eProcurement Ontology Access - core"@en ;
     dcterms:created "2021-06-01"^^xsd:date ;
     dcterms:description "The eProcurement Ontology Access core describes the concepts and properties representing the European Public Procurement Access domain. The provision of these semantics offers the basis for a common understanding of the domain for all stakeholders ensuring the quality of data exchange and transparency. The ontology restrictions are published in a separate artefact."@en ;
-    dcterms:issued "2024-03-21"^^xsd:date ;
+    dcterms:issued "2024-07-10"^^xsd:date ;
     dcterms:license "© European Union, 2014. Unless otherwise noted, the reuse of the Ontology is authorised under the European Union Public Licence v1.2 (https://eupl.eu/)." ;
     dcterms:publisher "http://publications.europa.eu/resource/authority/corporate-body/PUBL" ;
     dcterms:title "eProcurement Ontology Access - core"@en ;
     vann:preferredNamespacePrefix "epo" ;
     vann:preferredNamespaceUri "http://data.europa.eu/a4g/ontology#" ;
-    rdfs:comment "This version is automatically generated from eAccess.xml on 2024-03-21" ;
+    rdfs:comment "This version is automatically generated from eAccess.xml on 2024-07-10" ;
     rdfs:seeAlso <https://docs.ted.europa.eu/home/index.html>,
         <https://github.com/OP-TED/ePO/releases>,
         <https://joinup.ec.europa.eu/collection/eprocurement/solution/eprocurement-ontology/about>,
         <https://op.europa.eu/en/web/eu-vocabularies/e-procurement> ;
-    owl:imports eli:,
+    owl:imports :core,
+        :sub,
+        eli:,
         cccev:,
         frbroo:,
         dcterms:,
@@ -184,9 +186,7 @@ eli:Work a owl:Class ;
         <http://www.w3.org/ns/locn>,
         org:,
         <http://www.w3.org/ns/person>,
-        foaf:,
-        :core,
-        :sub ;
+        foaf: ;
     owl:incompatibleWith "3.1.0" ;
     owl:priorVersion "http://data.europa.eu/a4g/ontology#acc-4.0.2" ;
     owl:versionIRI :acc-4.1.0 ;