Skip to content

Commit

Permalink
Merge branch 'master' into feature/issue1190-maui
Browse files Browse the repository at this point in the history 
* master: (137 commits)
  #1343 - Segmenter for Chinese
  No issue. Formatting and remove dewac test since dewac model is no longer available.
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  #186 - Change artifactId to "dkpro-core-XXX"
  ...

% Conflicts:
%	dkpro-core-gpl/pom.xml
  • Loading branch information
@reckart
reckart committed Apr 30, 2019
2 parents be3de5a + aff6f98 commit 741a18e
Show file tree
Hide file tree
Showing 1,460 changed files with 14,375 additions and 8,613 deletions.
6 changes: 3 additions & 3 deletions dkpro-core-api-anomaly-asl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
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>
<artifactId>dkpro-core-asl</artifactId>
<groupId>org.dkpro.core</groupId>
<version>1.11.0-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>
Expand Down
2 changes: 1 addition & 1 deletion ...core/api/anomaly/AnomalyApiConstants.java → ...core/api/anomaly/AnomalyApiConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .../dkpro/core/api/anomaly/package-info.java → .../dkpro/core/api/anomaly/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 3 additions & 3 deletions dkpro-core-api-coref-asl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
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>
<artifactId>dkpro-core-asl</artifactId>
<groupId>org.dkpro.core</groupId>
<version>1.11.0-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>
Expand Down
2 changes: 1 addition & 1 deletion ...pro/core/api/coref/CorefApiConstants.java → ...pro/core/api/coref/CorefApiConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...kp/dkpro/core/api/coref/package-info.java → ...rg/dkpro/core/api/coref/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
/**
* Types for coreference annotations.
*/
package de.tudarmstadt.ukp.dkpro.core.api.coref;
package org.dkpro.core.api.coref;
10 changes: 5 additions & 5 deletions dkpro-core-api-datasets-asl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-asl</artifactId>
<version>1.11.0-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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../core/api/datasets/ActionDescription.java → .../core/api/datasets/ActionDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ore/api/datasets/ArtifactDescription.java → ...ore/api/datasets/ArtifactDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../dkpro/core/api/datasets/DataPackage.java → .../dkpro/core/api/datasets/DataPackage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .../ukp/dkpro/core/api/datasets/Dataset.java → .../org/dkpro/core/api/datasets/Dataset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...core/api/datasets/DatasetDescription.java → ...core/api/datasets/DatasetDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 8 additions & 9 deletions ...pro/core/api/datasets/DatasetFactory.java → ...pro/core/api/datasets/DatasetFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 static java.util.Collections.unmodifiableList;

Expand Down Expand Up @@ -49,20 +49,19 @@
import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dkpro.core.api.datasets.internal.ActionDescriptionImpl;
import org.dkpro.core.api.datasets.internal.ArtifactDescriptionImpl;
import org.dkpro.core.api.datasets.internal.DatasetDescriptionImpl;
import org.dkpro.core.api.datasets.internal.LicenseDescriptionImpl;
import org.dkpro.core.api.datasets.internal.LoadedDataset;
import org.dkpro.core.api.datasets.internal.actions.Action_ImplBase;
import org.dkpro.core.api.datasets.internal.actions.Explode;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.ActionDescriptionImpl;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.ArtifactDescriptionImpl;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.DatasetDescriptionImpl;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.LicenseDescriptionImpl;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.LoadedDataset;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.actions.Action_ImplBase;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.actions.Explode;

public class DatasetFactory
{
private Map<String, DatasetDescriptionImpl> datasets;
Expand Down
20 changes: 14 additions & 6 deletions ...kpro/core/api/datasets/DatasetLoader.java → ...kpro/core/api/datasets/DatasetLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.io.BufferedInputStream;
import java.io.File;
Expand All @@ -24,6 +24,7 @@
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Path;
import java.security.DigestInputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Expand All @@ -41,8 +42,7 @@
import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.ud.UDDataset;
import org.dkpro.core.api.datasets.internal.ud.UDDataset;

@Deprecated
public class DatasetLoader
Expand Down Expand Up @@ -250,12 +250,20 @@ private void extract(File aArchive, ArchiveInputStream aArchiveStream, File aTar
throw new IllegalStateException("Filename must not contain line break");
}

File out = new File(aTarget, name);
Path base = aTarget.toPath().toAbsolutePath();
Path out = base.resolve(name).toAbsolutePath();

if (!out.startsWith(base)) {
// Ignore attempts to write outside the base
continue;
}

if (entry.isDirectory()) {
FileUtils.forceMkdir(out);
FileUtils.forceMkdir(out.toFile());
}
else {
FileUtils.copyInputStreamToFile(new CloseShieldInputStream(aArchiveStream), out);
FileUtils.copyInputStreamToFile(new CloseShieldInputStream(aArchiveStream),
out.toFile());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...api/datasets/DatasetValidationPolicy.java → ...api/datasets/DatasetValidationPolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

public enum DatasetValidationPolicy
{
Expand Down
2 changes: 1 addition & 1 deletion ...ukp/dkpro/core/api/datasets/FileRole.java → ...org/dkpro/core/api/datasets/FileRole.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

public final class FileRole
{
Expand Down
2 changes: 1 addition & 1 deletion ...core/api/datasets/LicenseDescription.java → ...core/api/datasets/LicenseDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

public interface LicenseDescription
{
Expand Down
2 changes: 1 addition & 1 deletion ...dt/ukp/dkpro/core/api/datasets/Split.java → ...va/org/dkpro/core/api/datasets/Split.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.io.File;

Expand Down
4 changes: 2 additions & 2 deletions ...asets/internal/ActionDescriptionImpl.java → ...asets/internal/ActionDescriptionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal;
package org.dkpro.core.api.datasets.internal;

import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap;

import java.util.Map;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.ActionDescription;
import org.dkpro.core.api.datasets.ActionDescription;

public class ActionDescriptionImpl
implements ActionDescription
Expand Down
6 changes: 3 additions & 3 deletions ...ets/internal/ArtifactDescriptionImpl.java → ...ets/internal/ArtifactDescriptionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal;
package org.dkpro.core.api.datasets.internal;

import java.util.List;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.ActionDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.ArtifactDescription;
import org.dkpro.core.api.datasets.ActionDescription;
import org.dkpro.core.api.datasets.ArtifactDescription;

public class ArtifactDescriptionImpl
implements ArtifactDescription
Expand Down
10 changes: 5 additions & 5 deletions ...sets/internal/DatasetDescriptionImpl.java → ...sets/internal/DatasetDescriptionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal;
package org.dkpro.core.api.datasets.internal;

import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap;

import java.util.List;
import java.util.Map;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.ArtifactDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.DatasetDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.DatasetFactory;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.LicenseDescription;
import org.dkpro.core.api.datasets.ArtifactDescription;
import org.dkpro.core.api.datasets.DatasetDescription;
import org.dkpro.core.api.datasets.DatasetFactory;
import org.dkpro.core.api.datasets.LicenseDescription;

public class DatasetDescriptionImpl
implements DatasetDescription
Expand Down
4 changes: 2 additions & 2 deletions ...sets/internal/LicenseDescriptionImpl.java → ...sets/internal/LicenseDescriptionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal;
package org.dkpro.core.api.datasets.internal;

import java.util.List;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.LicenseDescription;
import org.dkpro.core.api.datasets.LicenseDescription;

public class LicenseDescriptionImpl
implements LicenseDescription
Expand Down
15 changes: 7 additions & 8 deletions .../api/datasets/internal/LoadedDataset.java → .../api/datasets/internal/LoadedDataset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.internal;
package org.dkpro.core.api.datasets.internal;

import static java.util.Arrays.asList;

Expand All @@ -30,13 +30,12 @@

import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.Dataset;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.DatasetDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.DatasetFactory;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.FileRole;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.Split;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.util.AntFileFilter;
import org.dkpro.core.api.datasets.Dataset;
import org.dkpro.core.api.datasets.DatasetDescription;
import org.dkpro.core.api.datasets.DatasetFactory;
import org.dkpro.core.api.datasets.FileRole;
import org.dkpro.core.api.datasets.Split;
import org.dkpro.core.api.datasets.internal.util.AntFileFilter;

public class LoadedDataset
implements Dataset
Expand Down
4 changes: 2 additions & 2 deletions ...core/api/datasets/internal/SplitImpl.java → ...core/api/datasets/internal/SplitImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal;
package org.dkpro.core.api.datasets.internal;

import java.io.File;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.Split;
import org.dkpro.core.api.datasets.Split;

public class SplitImpl
implements Split
Expand Down
8 changes: 4 additions & 4 deletions ...ets/internal/actions/Action_ImplBase.java → ...ets/internal/actions/Action_ImplBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tudarmstadt.ukp.dkpro.core.api.datasets.internal.actions;
package org.dkpro.core.api.datasets.internal.actions;

import java.nio.file.Path;

import de.tudarmstadt.ukp.dkpro.core.api.datasets.ActionDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.ArtifactDescription;
import de.tudarmstadt.ukp.dkpro.core.api.datasets.DatasetDescription;
import org.dkpro.core.api.datasets.ActionDescription;
import org.dkpro.core.api.datasets.ArtifactDescription;
import org.dkpro.core.api.datasets.DatasetDescription;

public abstract class Action_ImplBase
{
Expand Down
Loading

0 comments on commit 741a18e

Please sign in to comment.