Merge branch '1.11.x' into feature/1131-bratAnnotatorNotes

* 1.11.x: (371 commits) No issue. Set version to 1.11.0-SNAPSHOT. No issue. Fix checkstyle issue. No issue. Fix more JavaDoc issues. No issue. Upgrade to DKPro Meta 0.2.0. #1382 - TEI reader seems not to be trimming whitespace #1382 - TEI reader seems not to be trimming whitespace #1378 - BratReader crashes when an annotation covers more than two spans of text #1379 - Add generic XML types #1382 - TEI reader seems not to be trimming whitespace #1384 - Update datasets API #1384 - Update datasets API #1384 - Update datasets API #1384 - Update datasets API #1381 - Annotations starting/ending in inter-token space cause exception #1379 - Add generic XML types #1379 - Add generic XML types #1379 - Add generic XML types #1376 - Update TreeTagger build.xml #1346 - Reader for Annotated Gigaword #186 - Change artifactId to "dkpro-core-XXX" ... % Conflicts: % dkpro-core-io-brat-asl/src/main/java/de/tudarmstadt/ukp/dkpro/core/io/brat/BratReader.java % dkpro-core-io-brat-asl/src/main/java/de/tudarmstadt/ukp/dkpro/core/io/brat/internal/model/BratAnnotationDocument.java % dkpro-core-io-brat-asl/src/main/java/de/tudarmstadt/ukp/dkpro/core/io/brat/internal/model/TypeMapping.java % dkpro-core-io-brat-asl/src/test/java/de/tudarmstadt/ukp/dkpro/core/io/brat/BratReaderWriterTest.java
dkpro · Jul 19, 2019 · 993a2ac · 993a2ac
2 parents 983af70 + 23d1bdc
commit 993a2ac
Show file tree

Hide file tree

Showing 1,797 changed files with 57,925 additions and 13,812 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ cache/
 libudpipe_java.dylib
 .DS_Store
 .checkstyle
+learning.log
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -43,6 +43,7 @@ Mateusz Parzonka
 Michael Unterkalmsteiner [mikmakmuk]
 Milen Kouylekov <milen.kouylekov@usit.uio.no> [kouylekov, kouylekov-usit]
 Nicolai Erbs <nico.erbs@gmail.com> [nicolaierbs]
+Nicolas Paris [parisni]
 Niklas Jakob 
 Nils Reimers [nreimers]
 Oliver Ferschke [ferschke]

diff --git a/dkpro-core-api-anomaly-asl/pom.xml b/dkpro-core-api-anomaly-asl/pom.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>de.tudarmstadt.ukp.dkpro.core-asl</artifactId>
-    <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-    <version>1.9.2-SNAPSHOT</version>
+    <artifactId>dkpro-core-asl</artifactId>
+    <groupId>org.dkpro.core</groupId>
+    <version>1.11.1-SNAPSHOT</version>
     <relativePath>../dkpro-core-asl</relativePath>
   </parent>
-  <artifactId>de.tudarmstadt.ukp.dkpro.core.api.anomaly-asl</artifactId>
+  <artifactId>dkpro-core-api-anomaly-asl</artifactId>
   <packaging>jar</packaging>
   <name>DKPro Core ASL - Anomaly API</name>
   <url>https://dkpro.github.io/dkpro-core/</url>

diff --git a/...core/api/anomaly/AnomalyApiConstants.java → ...core/api/anomaly/AnomalyApiConstants.java b/...core/api/anomaly/AnomalyApiConstants.java → ...core/api/anomaly/AnomalyApiConstants.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.anomaly;
+package org.dkpro.core.api.anomaly;
 
 /**
  * Actually just an excuse to get a javadoc artifact.

diff --git a/.../dkpro/core/api/anomaly/package-info.java → .../dkpro/core/api/anomaly/package-info.java b/.../dkpro/core/api/anomaly/package-info.java → .../dkpro/core/api/anomaly/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Types for annotating spelling or grammar problems.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.anomaly;
+package org.dkpro.core.api.anomaly;
diff --git a/dkpro-core-api-coref-asl/pom.xml b/dkpro-core-api-coref-asl/pom.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>de.tudarmstadt.ukp.dkpro.core-asl</artifactId>
-    <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-    <version>1.9.2-SNAPSHOT</version>
+    <artifactId>dkpro-core-asl</artifactId>
+    <groupId>org.dkpro.core</groupId>
+    <version>1.11.1-SNAPSHOT</version>
     <relativePath>../dkpro-core-asl</relativePath>
   </parent>
-  <artifactId>de.tudarmstadt.ukp.dkpro.core.api.coref-asl</artifactId>
+  <artifactId>dkpro-core-api-coref-asl</artifactId>
   <packaging>jar</packaging>
   <name>DKPro Core ASL - Coreference API</name>
   <url>https://dkpro.github.io/dkpro-core/</url>

diff --git a/...pro/core/api/coref/CorefApiConstants.java → ...pro/core/api/coref/CorefApiConstants.java b/...pro/core/api/coref/CorefApiConstants.java → ...pro/core/api/coref/CorefApiConstants.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.coref;
+package org.dkpro.core.api.coref;
 
 /**
  * Actually just an excuse to get a javadoc artifact.

diff --git a/...kp/dkpro/core/api/coref/package-info.java → ...rg/dkpro/core/api/coref/package-info.java b/...kp/dkpro/core/api/coref/package-info.java → ...rg/dkpro/core/api/coref/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Types for coreference annotations.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.coref;
+package org.dkpro.core.api.coref;
diff --git a/dkpro-core-api-datasets-asl/pom.xml b/dkpro-core-api-datasets-asl/pom.xml
@@ -18,12 +18,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-    <artifactId>de.tudarmstadt.ukp.dkpro.core-asl</artifactId>
-    <version>1.9.2-SNAPSHOT</version>
+    <groupId>org.dkpro.core</groupId>
+    <artifactId>dkpro-core-asl</artifactId>
+    <version>1.11.1-SNAPSHOT</version>
     <relativePath>../dkpro-core-asl</relativePath>
   </parent>
-  <artifactId>de.tudarmstadt.ukp.dkpro.core.api.datasets-asl</artifactId>
+  <artifactId>dkpro-core-api-datasets-asl</artifactId>
   <packaging>jar</packaging>
   <name>DKPro Core ASL - Datasets</name>
   <url>https://dkpro.github.io/dkpro-core/</url>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.github.junrar</groupId>
       <artifactId>junrar</artifactId>
-      <version>0.7</version>
+      <version>4.0.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>
@@ -89,8 +89,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.testing-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-testing-asl</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/.../core/api/datasets/ActionDescription.java → .../core/api/datasets/ActionDescription.java b/.../core/api/datasets/ActionDescription.java → .../core/api/datasets/ActionDescription.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.datasets;
+package org.dkpro.core.api.datasets;
 
 import java.util.Map;
 

diff --git a/...ore/api/datasets/ArtifactDescription.java → ...ore/api/datasets/ArtifactDescription.java b/...ore/api/datasets/ArtifactDescription.java → ...ore/api/datasets/ArtifactDescription.java
@@ -15,12 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.datasets;
+package org.dkpro.core.api.datasets;
 
 import java.util.List;
 
 public interface ArtifactDescription
 {
+    /**
+     * @return the dataset to which this artifact belongs.
+     */
+    DatasetDescription  getDataset();
+
     /**
      * @return artifact name/ID
      */
@@ -43,6 +48,16 @@ public interface ArtifactDescription
      * @return SHA1 hash of the artifact.
      */
     String getSha1();
+
+    /**
+     * @return SHA512 hash of the artifact.
+     */
+    String getSha512();
+
+    /**
+     * @return the verification mode.
+     */
+    VerificationMode getVerificationMode();
 
     /**
      * Whether this artifact is shared between multiple datasets. If this flag is enabled, the

diff --git a/.../dkpro/core/api/datasets/DataPackage.java → .../dkpro/core/api/datasets/DataPackage.java b/.../dkpro/core/api/datasets/DataPackage.java → .../dkpro/core/api/datasets/DataPackage.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.datasets;
+package org.dkpro.core.api.datasets;
 
 @Deprecated
 public class DataPackage

diff --git a/.../ukp/dkpro/core/api/datasets/Dataset.java → .../org/dkpro/core/api/datasets/Dataset.java b/.../ukp/dkpro/core/api/datasets/Dataset.java → .../org/dkpro/core/api/datasets/Dataset.java
@@ -15,16 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.datasets;
+package org.dkpro.core.api.datasets;
 
 import java.io.File;
 import java.util.Arrays;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.SplitImpl;
+import org.dkpro.core.api.datasets.internal.SplitImpl;
 
 public interface Dataset
 {

diff --git a/...core/api/datasets/DatasetDescription.java → ...core/api/datasets/DatasetDescription.java b/...core/api/datasets/DatasetDescription.java → ...core/api/datasets/DatasetDescription.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.tudarmstadt.ukp.dkpro.core.api.datasets;
+package org.dkpro.core.api.datasets;
 
 import java.util.List;
 import java.util.Map;