updates sandbox components to use opennlp-tools version 2.3.1 (#112)

- bumps version of sandbox components to 2.3.2-SNAPSHOT
apache · Nov 28, 2023 · ac08064 · ac08064
1 parent 1deaa1a
commit ac08064
Showing 24 changed files with 48 additions and 47 deletions.
diff --git a/caseditor-corpus-server-plugin/pom.xml b/caseditor-corpus-server-plugin/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>caseditor-corpus-server-plugin</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP CasEditor Corpus Server Plugin</name>
 

diff --git a/caseditor-opennlp-plugin/pom.xml b/caseditor-opennlp-plugin/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>caseditor-opennlp-plugin</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP CasEditor Plugin</name>
 

diff --git a/corpus-server/corpus-server-connector/pom.xml b/corpus-server/corpus-server-connector/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>corpus-server</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>corpus-server-connector</artifactId>
@@ -70,14 +70,14 @@
 		<dependency>
 			<groupId>org.apache.opennlp</groupId>
 			<artifactId>corpus-server-core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.opennlp</groupId>
 			<artifactId>corpus-server-impl</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/corpus-server/corpus-server-core/feature.xml b/corpus-server/corpus-server-core/feature.xml
@@ -34,6 +34,6 @@
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-jaxrs/1.9.2/jackson-jaxrs-1.9.2.jar</bundle>
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-xc/1.9.2/jackson-xc-1.9.2.jar</bundle>
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar</bundle>
-        <bundle>mvn:org.apache.opennlp/corpus-server/2.3.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.opennlp/corpus-server/2.3.2-SNAPSHOT</bundle>
     </feature>
 </features>
diff --git a/corpus-server/corpus-server-core/pom.xml b/corpus-server/corpus-server-core/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>corpus-server</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>corpus-server-core</artifactId>

diff --git a/corpus-server/corpus-server-impl/feature.xml b/corpus-server/corpus-server-impl/feature.xml
@@ -23,6 +23,6 @@
 	<!-- This feature.xml should be automatically be generated, all dependencies are duplicated here! -->
     <feature name="opennlp-corpus-server-impl" version="0.0.1.SNAPSHOT">
         <bundle>mvn:org.apache.derby/derby/10.14.2.0</bundle>
-        <bundle>mvn:org.apache.opennlp/corpus-server-impl/2.3.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.opennlp/corpus-server-impl/2.3.2-SNAPSHOT</bundle>
     </feature>
 </features>
diff --git a/corpus-server/corpus-server-impl/pom.xml b/corpus-server/corpus-server-impl/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>corpus-server</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>corpus-server-impl</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
 	<name>Apache OpenNLP Corpus Server Implementation</name>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.apache.opennlp</groupId>
 			<artifactId>corpus-server-core</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.2-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/corpus-server/corpus-server-tools/pom.xml b/corpus-server/corpus-server-tools/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>corpus-server</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>corpus-server-tools</artifactId>

diff --git a/corpus-server/pom.xml b/corpus-server/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
 	<artifactId>corpus-server</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Apache OpenNLP Corpus Server</name>

diff --git a/mahout-addon/pom.xml b/mahout-addon/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mahout-addon</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP Mahout Addon</name>
 

diff --git a/mallet-addon/pom.xml b/mallet-addon/pom.xml
@@ -24,12 +24,12 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<groupId>kottmann.opennlp</groupId>
 	<artifactId>mallet-addon</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP Mallet Addon</name>

diff --git a/modelbuilder-addon/pom.xml b/modelbuilder-addon/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>modelbuilder-addon</artifactId>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.3.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache OpenNLP ModelBuilder Addon</name>

diff --git a/nlp-utils/pom.xml b/nlp-utils/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nlp-utils</artifactId>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.3.2-SNAPSHOT</version>
   <name>Apache OpenNLP Utils</name>
 
   <dependencies>

diff --git a/opennlp-coref/pom.xml b/opennlp-coref/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>opennlp-coref</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP Coreferencer</name>
 

diff --git a/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java b/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
@@ -42,7 +42,8 @@ public class TreebankNameFinder {
 
   private final NameFinderME nameFinder;
 
-  /** Creates an English name finder using the specified model.
+  /**
+   * Creates an English name finder using the specified model.
    * @param mod The model used for finding names.
    */
   public TreebankNameFinder(TokenNameFinderModel mod) {
@@ -60,7 +61,7 @@ private static void processParse(TreebankNameFinder[] finders, String[] tags, Bu
     Span[][] nameSpans = new Span[finders.length][];
 
     for (String line = input.readLine(); null != line; line = input.readLine()) {
-      if (line.equals("")) {
+      if (line.isEmpty()) {
         System.out.println();
         clearPrevTokenMaps(finders);
         continue;
@@ -96,10 +97,10 @@ private static void processText(TreebankNameFinder[] finders, String[] tags, Buf
       throws IOException {
     Span[][] nameSpans = new Span[finders.length][];
     String[][] nameOutcomes = new String[finders.length][];
-    opennlp.tools.tokenize.Tokenizer tokenizer = new SimpleTokenizer();
+    opennlp.tools.tokenize.Tokenizer tokenizer = SimpleTokenizer.INSTANCE;
     StringBuffer output = new StringBuffer();
     for (String line = input.readLine(); null != line; line = input.readLine()) {
-      if (line.equals("")) {
+      if (line.isEmpty()) {
         clearPrevTokenMaps(finders);
         System.out.println();
         continue;

diff --git a/opennlp-dl/pom.xml b/opennlp-dl/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>opennlp-dl</artifactId>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.3.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Apache OpenNLP DL4J</name>
 

diff --git a/opennlp-similarity/pom.xml b/opennlp-similarity/pom.xml
@@ -17,11 +17,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>opennlp-similarity</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Apache OpenNLP Tool Similarity distribution</name>

diff --git a/opennlp-wsd/pom.xml b/opennlp-wsd/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>opennlp-wsd</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Apache OpenNLP WSD</name>
 

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Apache OpenNLP Sandbox</name>
@@ -117,7 +117,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <opennlp.tools.version>2.3.0</opennlp.tools.version>
+        <opennlp.tools.version>2.3.1</opennlp.tools.version>
         <opennlp.forkCount>1.0C</opennlp.forkCount>
 
         <slf4j.version>1.7.36</slf4j.version>

diff --git a/summarizer/pom.xml b/summarizer/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.opennlp</groupId>
     <artifactId>opennlp-sandbox</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>summarizer</artifactId>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.3.2-SNAPSHOT</version>
   <name>Apache OpenNLP Summarizer</name>
 
   <properties>

diff --git a/tagging-server/feature.xml b/tagging-server/feature.xml
@@ -34,6 +34,6 @@
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-jaxrs/1.9.2/jackson-jaxrs-1.9.2.jar</bundle>
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-xc/1.9.2/jackson-xc-1.9.2.jar</bundle>
         <bundle>https://repo1.maven.org/maven2/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar</bundle>
-        <bundle>mvn:org.apache.opennlp/tagging-server/2.3.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.opennlp/tagging-server/2.3.2-SNAPSHOT</bundle>
     </feature>
 </features>
diff --git a/tagging-server/pom.xml b/tagging-server/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tagging-server</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
 	<name>Apache OpenNLP Tagging Server</name>

diff --git a/tf-ner-poc/pom.xml b/tf-ner-poc/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.apache.opennlp</groupId>
         <artifactId>opennlp-sandbox</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tf-ner-poc</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
     <name>Apache OpenNLP TF NER poc</name>
 
     <properties>

diff --git a/wikinews-importer/pom.xml b/wikinews-importer/pom.xml
@@ -24,11 +24,11 @@
 	<parent>
 		<groupId>org.apache.opennlp</groupId>
 		<artifactId>opennlp-sandbox</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>wikinews-importer</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Apache OpenNLP Wikinews Importer</name>