From 62ccdfdc3fd9bc5b1ab9fbd162abc22fc8339c0d Mon Sep 17 00:00:00 2001
From: Mateusz Kopeć <m.kopec@ipipan.waw.pl>
Date: Fri, 10 Jul 2015 15:02:59 +0200
Subject: [PATCH] dependencies update
---
pom.xml | 12 +++++++++---
src/main/java/pl/waw/ipipan/zil/core/md/Main.java | 11 +++++------
src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/FeatureGeneration.java | 5 ++---
src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/InstanceCreator.java | 7 +++----
src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiLoader.java | 25 ++++++++++++-------------
src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiSaver.java | 23 +++++++++++------------
src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftLoader.java | 18 +++++++++---------
src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftSaver.java | 12 ++++++------
8 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7215be8..8aab197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,9 @@
<groupId>pl.waw.ipipan.zil.core</groupId>
<artifactId>md</artifactId>
<version>1.2-SNAPSHOT</version>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -16,6 +19,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -28,6 +32,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -42,6 +47,7 @@
<!-- explicitly define maven-deploy-plugin after other to force exec
order -->
<artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
<executions>
<execution>
<id>deploy</id>
@@ -76,12 +82,12 @@
<version>1.2.17</version>
</dependency>
<dependency>
- <groupId>ipipan.multiservice</groupId>
- <artifactId>MultiserviceUtils</artifactId>
+ <groupId>pl.waw.ipipan.zil.multiservice</groupId>
+ <artifactId>utils</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>ipipan</groupId>
+ <groupId>pl.waw.ipipan.zil.nkjp</groupId>
<artifactId>teiapi</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/Main.java b/src/main/java/pl/waw/ipipan/zil/core/md/Main.java
index 30d63dc..d4041df 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/Main.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/Main.java
@@ -1,9 +1,5 @@
package pl.waw.ipipan.zil.core.md;
-import ipipan.clarin.tei.api.entities.TEICorpusText;
-import ipipan.clarin.tei.api.exceptions.TEIException;
-import ipipan.clarin.tei.api.io.IOUtils;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -11,8 +7,6 @@ import java.io.InputStream;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.multiservice.thrift.types.MultiserviceException;
-import pl.waw.ipipan.multiservice.thrift.types.TText;
import pl.waw.ipipan.zil.core.md.detection.Detector;
import pl.waw.ipipan.zil.core.md.detection.zero.ZeroSubjectDetector;
import pl.waw.ipipan.zil.core.md.entities.Text;
@@ -20,6 +14,11 @@ import pl.waw.ipipan.zil.core.md.io.tei.TeiLoader;
import pl.waw.ipipan.zil.core.md.io.tei.TeiSaver;
import pl.waw.ipipan.zil.core.md.io.thrift.ThriftLoader;
import pl.waw.ipipan.zil.core.md.io.thrift.ThriftSaver;
+import pl.waw.ipipan.zil.multiservice.thrift.types.MultiserviceException;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TText;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEICorpusText;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.exceptions.TEIException;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.IOUtils;
/**
* @author Mateusz Kopeć
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/FeatureGeneration.java b/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/FeatureGeneration.java
index 2e46cd3..0799c8e 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/FeatureGeneration.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/FeatureGeneration.java
@@ -1,8 +1,5 @@
package pl.waw.ipipan.zil.core.md.detection.zero;
-import ipipan.clarin.tei.api.entities.TEIMention;
-import ipipan.clarin.tei.api.entities.TEIMorph;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,6 +15,8 @@ import pl.waw.ipipan.zil.core.md.entities.Sentence;
import pl.waw.ipipan.zil.core.md.entities.SyntacticGroup;
import pl.waw.ipipan.zil.core.md.entities.SyntacticWord;
import pl.waw.ipipan.zil.core.md.entities.Token;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMention;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMorph;
public class FeatureGeneration {
final private static Set<String> CLAUSE_SPLIT_LEMMAS = new HashSet<>(Arrays.asList(new String[] { "i", "albo",
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/InstanceCreator.java b/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/InstanceCreator.java
index d721d27..db665ab 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/InstanceCreator.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/detection/zero/InstanceCreator.java
@@ -1,9 +1,5 @@
package pl.waw.ipipan.zil.core.md.detection.zero;
-import ipipan.clarin.tei.api.entities.TEICorpusText;
-import ipipan.clarin.tei.api.io.IOUtils;
-import ipipan.clarin.tei.api.io.TEI_IO;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
@@ -21,6 +17,9 @@ import pl.waw.ipipan.zil.core.md.entities.Sentence;
import pl.waw.ipipan.zil.core.md.entities.Text;
import pl.waw.ipipan.zil.core.md.entities.Token;
import pl.waw.ipipan.zil.core.md.io.tei.TeiLoader;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEICorpusText;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.IOUtils;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.TEI_IO;
import weka.core.Attribute;
import weka.core.FastVector;
import weka.core.Instance;
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiLoader.java b/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiLoader.java
index 2a1e4a6..deb72db 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiLoader.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiLoader.java
@@ -1,18 +1,5 @@
package pl.waw.ipipan.zil.core.md.io.tei;
-import ipipan.clarin.tei.api.entities.TEICorpusText;
-import ipipan.clarin.tei.api.entities.TEIGroup;
-import ipipan.clarin.tei.api.entities.TEIInterpretation;
-import ipipan.clarin.tei.api.entities.TEIMention;
-import ipipan.clarin.tei.api.entities.TEIMorph;
-import ipipan.clarin.tei.api.entities.TEINamedEntity;
-import ipipan.clarin.tei.api.entities.TEIParagraph;
-import ipipan.clarin.tei.api.entities.TEISentence;
-import ipipan.clarin.tei.api.entities.TEISyntacticEntity;
-import ipipan.clarin.tei.api.entities.TEIWord;
-import ipipan.clarin.tei.api.exceptions.TEIException;
-import ipipan.clarin.tei.api.io.TEI_IO;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,6 +17,18 @@ import pl.waw.ipipan.zil.core.md.entities.SyntacticGroup;
import pl.waw.ipipan.zil.core.md.entities.SyntacticWord;
import pl.waw.ipipan.zil.core.md.entities.Text;
import pl.waw.ipipan.zil.core.md.entities.Token;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEICorpusText;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIGroup;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIInterpretation;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMention;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMorph;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEINamedEntity;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIParagraph;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEISentence;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEISyntacticEntity;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIWord;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.exceptions.TEIException;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.TEI_IO;
public class TeiLoader {
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiSaver.java b/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiSaver.java
index 2ede518..57e3b42 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiSaver.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/io/tei/TeiSaver.java
@@ -1,17 +1,5 @@
package pl.waw.ipipan.zil.core.md.io.tei;
-import ipipan.clarin.tei.api.entities.AnnotationLayer;
-import ipipan.clarin.tei.api.entities.EntitiesFactory;
-import ipipan.clarin.tei.api.entities.TEICoreference;
-import ipipan.clarin.tei.api.entities.TEICorpusText;
-import ipipan.clarin.tei.api.entities.TEIMention;
-import ipipan.clarin.tei.api.entities.TEIMorph;
-import ipipan.clarin.tei.api.entities.TEIParagraph;
-import ipipan.clarin.tei.api.entities.TEISentence;
-import ipipan.clarin.tei.api.exceptions.TEIException;
-import ipipan.clarin.tei.api.io.TEI_IO;
-import ipipan.clarin.tei.api.io.TEI_IO.CompressionMethod;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,6 +14,17 @@ import pl.waw.ipipan.zil.core.md.entities.Paragraph;
import pl.waw.ipipan.zil.core.md.entities.Sentence;
import pl.waw.ipipan.zil.core.md.entities.Text;
import pl.waw.ipipan.zil.core.md.entities.Token;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.AnnotationLayer;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.EntitiesFactory;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEICoreference;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEICorpusText;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMention;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIMorph;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEIParagraph;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.entities.TEISentence;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.exceptions.TEIException;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.TEI_IO;
+import pl.waw.ipipan.zil.nkjp.teiapi.api.io.TEI_IO.CompressionMethod;
public class TeiSaver {
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftLoader.java b/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftLoader.java
index f509a67..cdc1478 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftLoader.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftLoader.java
@@ -7,15 +7,6 @@ import java.util.Map;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.multiservice.thrift.types.MultiserviceException;
-import pl.waw.ipipan.multiservice.thrift.types.TInterpretation;
-import pl.waw.ipipan.multiservice.thrift.types.TNamedEntity;
-import pl.waw.ipipan.multiservice.thrift.types.TParagraph;
-import pl.waw.ipipan.multiservice.thrift.types.TSentence;
-import pl.waw.ipipan.multiservice.thrift.types.TSyntacticGroup;
-import pl.waw.ipipan.multiservice.thrift.types.TSyntacticWord;
-import pl.waw.ipipan.multiservice.thrift.types.TText;
-import pl.waw.ipipan.multiservice.thrift.types.TToken;
import pl.waw.ipipan.zil.core.md.entities.Interpretation;
import pl.waw.ipipan.zil.core.md.entities.NamedEntity;
import pl.waw.ipipan.zil.core.md.entities.Paragraph;
@@ -24,6 +15,15 @@ import pl.waw.ipipan.zil.core.md.entities.SyntacticGroup;
import pl.waw.ipipan.zil.core.md.entities.SyntacticWord;
import pl.waw.ipipan.zil.core.md.entities.Text;
import pl.waw.ipipan.zil.core.md.entities.Token;
+import pl.waw.ipipan.zil.multiservice.thrift.types.MultiserviceException;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TInterpretation;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TNamedEntity;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TParagraph;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TSentence;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TSyntacticGroup;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TSyntacticWord;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TText;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TToken;
public class ThriftLoader {
diff --git a/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftSaver.java b/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftSaver.java
index 971b895..162e7e7 100644
--- a/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftSaver.java
+++ b/src/main/java/pl/waw/ipipan/zil/core/md/io/thrift/ThriftSaver.java
@@ -8,17 +8,17 @@ import java.util.Map;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.multiservice.thrift.types.MultiserviceException;
-import pl.waw.ipipan.multiservice.thrift.types.TMention;
-import pl.waw.ipipan.multiservice.thrift.types.TParagraph;
-import pl.waw.ipipan.multiservice.thrift.types.TSentence;
-import pl.waw.ipipan.multiservice.thrift.types.TText;
-import pl.waw.ipipan.multiservice.thrift.types.TToken;
import pl.waw.ipipan.zil.core.md.entities.Mention;
import pl.waw.ipipan.zil.core.md.entities.Paragraph;
import pl.waw.ipipan.zil.core.md.entities.Sentence;
import pl.waw.ipipan.zil.core.md.entities.Text;
import pl.waw.ipipan.zil.core.md.entities.Token;
+import pl.waw.ipipan.zil.multiservice.thrift.types.MultiserviceException;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TMention;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TParagraph;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TSentence;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TText;
+import pl.waw.ipipan.zil.multiservice.thrift.types.TToken;
public class ThriftSaver {
--
libgit2 0.22.2