Merge branch 'release/v9'

europeana · Jan 29, 2024 · 7db8a01 · 7db8a01
2 parents 8b15894 + b66ed8d
commit 7db8a01
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: push
 jobs:
 
   ci:
-    uses: europeana/metis-actions/.github/workflows/ci.yml@main
+    uses: europeana/metis-actions/.github/workflows/ci.yml@jdk17
     with:
       sonar_organization: europeana
       sonar_project_key: europeana_metis-schema
@@ -14,7 +14,7 @@ jobs:
 
   deploy-artifacts:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@main
+    uses: europeana/metis-actions/.github/workflows/deploy-artifacts.yml@jdk17
     secrets:
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   ci-release:
-    uses: europeana/metis-actions/.github/workflows/release.yml@main
+    uses: europeana/metis-actions/.github/workflows/release.yml@jdk17
     with:
       release-version: ${{ github.event.inputs.release-version }}
       commit-hash-branch: ${{ github.event.inputs.commit-hash-branch }}

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <artifactId>metis-schema</artifactId>
   <groupId>eu.europeana.metis</groupId>
-  <version>8</version>
+  <version>9</version>
 
   <properties>
     <!-- Define static list of namespaces, so we filter out all old-stuff and only include required namespaces -->
@@ -104,7 +104,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${version.maven.compiler.plugin}</version>
         <configuration>
-          <release>11</release>
+          <release>17</release>
         </configuration>
       </plugin>
       <plugin>

diff --git a/src/main/resources/schema_xsds/DQV.xsd b/src/main/resources/schema_xsds/DQV.xsd
@@ -5,29 +5,28 @@
   xmlns:oa="http://www.w3.org/ns/oa#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:dcterms="http://purl.org/dc/terms/" elementFormDefault="qualified">
-  <import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#" schemaLocation="RDF.xsd"/>
   <import namespace="http://purl.org/dc/terms/" schemaLocation="DCTERMS.xsd"/>
   <import namespace="http://www.w3.org/ns/oa#" schemaLocation="OA.xsd"/>
 
-  <element name="hasQualityAnnotation" type="rdf:ResourceType">
+  <element name="hasQualityAnnotation">
     <annotation>
       <documentation>The identifier of the Quality annotation. Example:
-        &lt;dqv:hasQualityAnnotation rdf:resource="#metadataTier"/&gt;
+        &lt;dqv:hasQualityAnnotation/&gt;
       </documentation>
     </annotation>
-
+    <complexType>
+      <sequence minOccurs="1" maxOccurs="1">
+        <element ref="dqv:QualityAnnotation" minOccurs="1" maxOccurs="1"/>
+      </sequence>
+    </complexType>
   </element>
   <element name="QualityAnnotation">
     <complexType>
-      <complexContent>
-        <extension base="rdf:AboutType">
-          <sequence minOccurs="1" maxOccurs="1">
-            <element ref="dcterms:created" minOccurs="1" maxOccurs="1"/>
-            <element ref="oa:hasTarget" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="oa:hasBody" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </extension>
-      </complexContent>
+      <sequence minOccurs="1" maxOccurs="1">
+        <element ref="dcterms:created" minOccurs="1" maxOccurs="1"/>
+        <element ref="oa:hasTarget" minOccurs="1" maxOccurs="unbounded"/>
+        <element ref="oa:hasBody" minOccurs="1" maxOccurs="1"/>
+      </sequence>
     </complexType>
   </element>
-</schema>
+</schema>
diff --git a/src/main/resources/schema_xsds/EDM-INTERNAL-MAIN.xsd b/src/main/resources/schema_xsds/EDM-INTERNAL-MAIN.xsd
@@ -66,7 +66,6 @@
             <element ref="foaf:Organization" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="dcat:Dataset" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="svcs:Service" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="dqv:QualityAnnotation" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
     </complexType>
 

diff --git a/src/main/resources/schema_xsds/ORE.xsd b/src/main/resources/schema_xsds/ORE.xsd
@@ -4,6 +4,7 @@
 	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:dcterms="http://purl.org/dc/terms/" xmlns:enrichment="http://www.europeana.eu/schemas/edm/enrichment/"
 		xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+  xmlns:dqv="http://www.w3.org/ns/dqv#"
 	elementFormDefault="qualified">
 
 	<annotation>
@@ -21,7 +22,8 @@
 		schemaLocation="ENRICHMENT.xsd" />
 	<import namespace="http://www.w3.org/2002/07/owl#"
 		schemaLocation="OWL.xsd" />
-
+  <import namespace="http://www.w3.org/ns/dqv#"
+    schemaLocation="DQV.xsd" />
 	<element name="Aggregation">
 		<complexType>
 			<annotation>
@@ -104,6 +106,7 @@
 						<element ref="edm:rights" maxOccurs="1" minOccurs="1" />
 						<element ref="edm:ugc" maxOccurs="1" minOccurs="0" />
 						<element ref="edm:intermediateProvider" maxOccurs="unbounded" minOccurs="0"/>
+						<element ref="dqv:hasQualityAnnotation" maxOccurs="unbounded" minOccurs="0"/>
 					</sequence>
 				</extension>
 			</complexContent>