Update DKPro Similarity dependency to 2.3.0

dkpro · Jul 23, 2020 · a27a20d · a27a20d
1 parent be0a09a
commit a27a20d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml
@@ -53,11 +53,11 @@
   		</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>dkpro.similarity</groupId>
+			<groupId>org.dkpro.similarity</groupId>
 			<artifactId>
-				dkpro.similarity.algorithms.wikipedia-asl
+				dkpro-similarity-algorithms-wikipedia-asl
 			</artifactId>
-			<version>2.2.0-SNAPSHOT</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>de.tudarmstadt.ukp.dkpro.wsd</groupId>

diff --git a/...dt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java b/...dt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+import org.dkpro.similarity.algorithms.api.SimilarityException;
 
 import de.tudarmstadt.ukp.dkpro.wsd.algorithm.AbstractWSDAlgorithm;
 import de.tudarmstadt.ukp.dkpro.wsd.algorithm.WSDAlgorithmCollectiveSequentialBasic;
@@ -38,7 +39,6 @@
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory;
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventoryException;
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseWeightedInventory;
-import dkpro.similarity.algorithms.api.SimilarityException;
 import edu.uci.ics.jung.algorithms.scoring.PageRankWithPriors;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;

diff --git a/...phconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java b/...phconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java
@@ -21,14 +21,14 @@
 import java.util.List;
 
 import org.apache.commons.collections15.ListUtils;
+import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.junit.Before;
 
 import de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.algorithm.SequentialGraphDisambiguation;
 import de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.wikipedia.util.IncomingLinksCache;
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory;
 import de.tudarmstadt.ukp.dkpro.wsd.si.linkdatabase.PerformanceLinkInformationReader;
 import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import dkpro.similarity.algorithms.api.SimilarityException;
 
 /**
  * A class for sequential disambiguation using Wikipedia links from a special database as weights between senses

diff --git a/.../graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java b/.../graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java
@@ -18,15 +18,16 @@
 
 package de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.wikipedia.algorithm;
 
+import org.dkpro.similarity.algorithms.api.SimilarityException;
+import org.dkpro.similarity.algorithms.wikipedia.measures.WikiLinkComparator;
+
 import de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.algorithm.SequentialGraphDisambiguation;
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory;
 import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
 import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
 import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
 import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
 import de.tudarmstadt.ukp.wikipedia.api.exception.WikiInitializationException;
-import dkpro.similarity.algorithms.api.SimilarityException;
-import dkpro.similarity.algorithms.wikipedia.measures.WikiLinkComparator;
 
 /**
  * A class for sequential disambiguation using Wikipedia links as weights between senses

diff --git a/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml b/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml
@@ -89,11 +89,11 @@
 	  		<version>0.8.1</version>
 	  	</dependency>
 		<dependency>
-			<groupId>dkpro.similarity</groupId>
+			<groupId>org.dkpro.similarity</groupId>
 			<artifactId>
-				dkpro.similarity.algorithms.core-asl
+				dkpro-similarity-algorithms-core-asl
 			</artifactId>
-			<version>2.2.0-SNAPSHOT</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>

diff --git a/...a/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java b/...a/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java
@@ -25,14 +25,14 @@
 import java.util.Set;
 
 import org.apache.commons.collections15.Transformer;
+import org.dkpro.similarity.algorithms.api.SimilarityException;
+import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 
 import de.tudarmstadt.ukp.dkpro.lexsemresource.Entity;
 import de.tudarmstadt.ukp.dkpro.lexsemresource.LexicalSemanticResource;
 import de.tudarmstadt.ukp.dkpro.lexsemresource.exception.LexicalSemanticResourceException;
 import de.tudarmstadt.ukp.dkpro.wsd.WSDException;
 import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory;
-import dkpro.similarity.algorithms.api.SimilarityException;
-import dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 import edu.uci.ics.jung.algorithms.cluster.EdgeBetweennessClusterer;
 import edu.uci.ics.jung.algorithms.cluster.WeakComponentClusterer;
 import edu.uci.ics.jung.algorithms.filters.FilterUtils;

diff --git a/...va/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java b/...va/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java
@@ -25,11 +25,11 @@
 import org.apache.uima.fit.descriptor.ExternalResource;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
+import org.dkpro.similarity.algorithms.api.SimilarityException;
+import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 
 import de.tudarmstadt.ukp.dkpro.lexsemresource.LexicalSemanticResource;
 import de.tudarmstadt.ukp.dkpro.wsd.wsi.algorithm.SimpleGraphClusteringInductionAlgorithm;
-import dkpro.similarity.algorithms.api.SimilarityException;
-import dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 
 /**
  * @author zorn