Merge branch 'development' into beta

clarin-eric · Apr 23, 2019 · ea51f44 · ea51f44
2 parents eba9648 + f1e5da3
commit ea51f44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>vlo-mapping</artifactId>
-    <version>1.3.0-beta1</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>VLO mapping definitions</name>

diff --git a/uniform-maps/LicenseAvailabilityMap.xml b/uniform-maps/LicenseAvailabilityMap.xml
@@ -32,7 +32,8 @@
         <variant value="frei verfügbar" />        
         <variant value="http://www.europeana.eu/rights/orphan-work-eu/" />
         <variant value="http://rightsstatements.org/vocab/InC-OW-EU/1.0/" />
-        <variant value="https://lindat.mff.cuni.cz/repository/xmlui/page/licence-UD-1.3" />        
+        <variant value="https://lindat.mff.cuni.cz/repository/xmlui/page/licence-UD-1.3" />
+        <variant value="https://cst.ku.dk/projekter/dannet/license.txt" />       
         <variant value="Open" />
         <variant value="open" />
         <variant value="open 2009" />

diff --git a/uniform-maps/LicenseURIMap.xml b/uniform-maps/LicenseURIMap.xml
@@ -71,11 +71,16 @@
 		<normalizedValue value="http://www.meta-net.eu/meta-share/meta-share-licenses/META-SHARE%20Commercial%20NoRedistribution%20NoDerivatives%20For-a-fee-v1.0.pdf" />
 		<variant value="MS-C-NoReD-ND-FF" />
 	</mapping>
+	<mapping>
+		<normalizedValue value="https://kitwiki.csc.fi/twiki/bin/view/FinCLARIN/ClarinEulaAca?NC=1" />
+		<variant value="http(s?):\/\/kitwiki.csc.fi\/twiki\/bin\/view\/FinCLARIN\/ClarinEulaAca(\?.*)(?&lt;=NC=1)\&amp;NORED=1(.*)" isRegExp="true" />
+		<variant value="CLARIN_ACA-NC" />
+		<variant value="CLARIN-ACA-NC" />
+	</mapping>
 	<mapping>
 		<normalizedValue value="https://kitwiki.csc.fi/twiki/bin/view/FinCLARIN/ClarinEulaAca" />
-		<variant value="http(s)?:\/\/kitwiki.csc.fi\/twiki\/bin\/view\/FinCLARIN\/ClarinEulaAca(.*)" isRegExp="true" />
+		<variant value="http(s?):\/\/kitwiki.csc.fi\/twiki\/bin\/view\/FinCLARIN\/ClarinEulaAca(.*)" isRegExp="true" />
 		<variant value="CLARIN_ACA" />
-		<variant value="CLARIN_ACA-NC" />
 		<variant value="CLARIN ACA" />
 	</mapping>
 	<mapping>