Merge branch 'master' of https://git.informatik.uni-leipzig.de/dbpedia-assoc/marvin-config

README.md

@@ -23,7 +23,7 @@ cd marvin-config
 # (~10 minutes) install dief in marvin-extraction/extraction-framework
 # if you installed it already you can run `git pull && mvn clean install` to update
 rm -rf marvin-extraction/extraction-framework
-./setup-dief.sh
+./setup-or-reset-dief.sh
 
 # test run Romanian extraction, very small
 ./marvin_extraction_run.sh test

databus-poms/dbpedia/wikidata/alias/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alias</artifactId>

databus-poms/dbpedia/wikidata/debug/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debug</artifactId>

databus-poms/dbpedia/wikidata/description/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>description</artifactId>

databus-poms/dbpedia/wikidata/geo-coordinates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>geo-coordinates</artifactId>

databus-poms/dbpedia/wikidata/images/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>images</artifactId>

databus-poms/dbpedia/wikidata/instance-types/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>instance-types</artifactId>

databus-poms/dbpedia/wikidata/labels/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>labels</artifactId>

databus-poms/dbpedia/wikidata/mappingbased-literals/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mappingbased-literals</artifactId>

databus-poms/dbpedia/wikidata/mappingbased-objects-uncleaned/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mappingbased-objects-uncleaned</artifactId>

databus-poms/dbpedia/wikidata/mappingbased-objects/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mappingbased-objects</artifactId>

databus-poms/dbpedia/wikidata/ontology-subclassof/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ontology-subclassof</artifactId>

databus-poms/dbpedia/wikidata/page/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>page</artifactId>

databus-poms/dbpedia/wikidata/pom.xml

@@ -11,7 +11,7 @@
     <groupId>wikidata</groupId>
     <artifactId>group-metadata</artifactId>
     <packaging>pom</packaging>
-    <version>2019.10.01</version>
+    <version>2020.03.01</version>
 
     <modules>
         <module>alias</module>
@@ -30,7 +30,7 @@
         <!--module>raw</module-->
         <module>redirects</module>
         <module>references</module>
-        <module>revision</module>
+        <!--module>revision</module-->
         <module>sameas-all-wikis</module>
         <module>sameas-external</module>
         <!--module>sameas-wikidata</module-->
@@ -84,7 +84,7 @@ characters
 * deleted due to bzip2 non-recoverable bad blocks
         ]]></databus.documentation>
         <!-- used for derive plugin -->
-        <databus.marvinversion>2019.10.01</databus.marvinversion>
+        <databus.marvinversion>2020.03.01</databus.marvinversion>
     </properties>
 
     <!-- currently still needed to find the super-pom, once the super-pom is in maven central,
@@ -154,7 +154,7 @@ order by asc(?versionstring)
                     <version>https://databus.dbpedia.org/marvin/wikidata/properties/${databus.marvinversion}</version>
                     <version>https://databus.dbpedia.org/marvin/wikidata/redirects/${databus.marvinversion}</version>
                     <version>https://databus.dbpedia.org/marvin/wikidata/references/${databus.marvinversion}</version>
-                    <version>https://databus.dbpedia.org/marvin/wikidata/revision/${databus.marvinversion}</version>
+                    <!--version>https://databus.dbpedia.org/marvin/wikidata/revision/${databus.marvinversion}</version-->
                     <version>https://databus.dbpedia.org/marvin/wikidata/sameas-all-wikis/${databus.marvinversion}</version>
                     <version>https://databus.dbpedia.org/marvin/wikidata/sameas-external/${databus.marvinversion}</version>
                 </versions>

databus-poms/dbpedia/wikidata/properties/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>properties</artifactId>

databus-poms/dbpedia/wikidata/redirects/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>redirects</artifactId>

databus-poms/dbpedia/wikidata/references/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>references</artifactId>

databus-poms/dbpedia/wikidata/revision/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>revision</artifactId>

databus-poms/dbpedia/wikidata/sameas-all-wikis/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sameas-all-wikis</artifactId>

databus-poms/dbpedia/wikidata/sameas-external/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>group-metadata</artifactId>
         <groupId>wikidata</groupId>
-        <version>2019.10.01</version>
+        <version>2020.03.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sameas-external</artifactId>