Skip to content

Apache Lucene open-source search software

Upgrade OpenNLP from 2.3.2 to 2.5.3 (#14130)

Michael Froha7b7f0d6583c
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index b36a48c2fd0..fb9e7665a9e 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -102,6 +102,9 @@ Other
* GITHUB#14091: Cover all DataType. (Lu Xugang)
+* GITHUB#14130: Upgrade OpenNLP from 2.3.2 to 2.5.3, which transitively upgrades Slf4j
+ from 1.7.36 to 2.0.16. (Michael Froh)
+
======================= Lucene 10.1.0 =======================
API Changes
diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/NLPPOSTaggerOp.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/NLPPOSTaggerOp.java
index dee4afefc58..ef7a6fb6245 100644
--- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/NLPPOSTaggerOp.java
+++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/NLPPOSTaggerOp.java
@@ -17,8 +17,8 @@
package org.apache.lucene.analysis.opennlp.tools;
-import java.io.IOException;
import opennlp.tools.postag.POSModel;
+import opennlp.tools.postag.POSTagFormat;
import opennlp.tools.postag.POSTagger;
import opennlp.tools.postag.POSTaggerME;
@@ -29,8 +29,8 @@ import opennlp.tools.postag.POSTaggerME;
public class NLPPOSTaggerOp {
private final POSTagger tagger;
- public NLPPOSTaggerOp(POSModel model) throws IOException {
- tagger = new POSTaggerME(model);
+ public NLPPOSTaggerOp(POSModel model) {
+ tagger = new POSTaggerME(model, POSTagFormat.PENN);
}
public synchronized String[] getPOSTags(String[] words) {
diff --git a/lucene/licenses/opennlp-tools-2.3.2.jar.sha1 b/lucene/licenses/opennlp-tools-2.3.2.jar.sha1
deleted file mode 100644
index 94b2924f8fa..00000000000
--- a/lucene/licenses/opennlp-tools-2.3.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d739edba1e729691ed5ab80e1ccf330555a02ea7
diff --git a/lucene/licenses/opennlp-tools-2.5.3.jar.sha1 b/lucene/licenses/opennlp-tools-2.5.3.jar.sha1
new file mode 100644
index 00000000000..fb01299fa29
--- /dev/null
+++ b/lucene/licenses/opennlp-tools-2.5.3.jar.sha1
@@ -0,0 +1 @@
+4b544138ec079c1c73dc2c1b928506871c4b1b47
diff --git a/lucene/licenses/slf4j-api-1.7.36.jar.sha1 b/lucene/licenses/slf4j-api-1.7.36.jar.sha1
deleted file mode 100644
index 828b7cf7e05..00000000000
--- a/lucene/licenses/slf4j-api-1.7.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6c62681a2f655b49963a5983b8b0950a6120ae14
diff --git a/lucene/licenses/slf4j-api-2.0.16.jar.sha1 b/lucene/licenses/slf4j-api-2.0.16.jar.sha1
new file mode 100644
index 00000000000..b1bb75be39b
--- /dev/null
+++ b/lucene/licenses/slf4j-api-2.0.16.jar.sha1
@@ -0,0 +1 @@
+0172931663a09a1fa515567af5fbef00897d3c04
diff --git a/versions.lock b/versions.lock
index f3057288a9f..07f8ff30543 100644
--- a/versions.lock
+++ b/versions.lock
@@ -12,7 +12,7 @@
"org.antlr:antlr4-runtime:4.11.1" : "d9953130,refs=4",
"org.apache.commons:commons-compress:1.19" : "5ce8cdc6,refs=2",
"org.apache.commons:commons-math3:3.6.1" : "85a1e4c6,refs=2",
- "org.apache.opennlp:opennlp-tools:2.3.2" : "2f760bab,refs=4",
+ "org.apache.opennlp:opennlp-tools:2.5.3" : "2f760bab,refs=4",
"org.carrot2:morfologik-fsa:2.1.9" : "79af844b,refs=4",
"org.carrot2:morfologik-polish:2.1.9" : "fe494320,refs=3",
"org.carrot2:morfologik-stemming:2.1.9" : "79af844b,refs=4",
@@ -22,7 +22,7 @@
"org.ow2.asm:asm:9.6" : "d9953130,refs=4",
"org.ow2.asm:asm-commons:9.6" : "d9953130,refs=4",
"org.ow2.asm:asm-tree:9.6" : "d9953130,refs=4",
- "org.slf4j:slf4j-api:1.7.36" : "2f760bab,refs=4",
+ "org.slf4j:slf4j-api:2.0.16" : "2f760bab,refs=4",
"ua.net.nlp:morfologik-ukrainian-search:4.9.1" : "fe494320,refs=3",
"xerces:xercesImpl:2.12.0" : "5ce8cdc6,refs=2"
},
@@ -56,7 +56,7 @@
"org.antlr:antlr4-runtime:4.11.1" : "6fbc4021,refs=5",
"org.apache.commons:commons-compress:1.19" : "6f16ff86,refs=2",
"org.apache.commons:commons-math3:3.6.1" : "152d9f78,refs=3",
- "org.apache.opennlp:opennlp-tools:2.3.2" : "b91715f0,refs=6",
+ "org.apache.opennlp:opennlp-tools:2.5.3" : "b91715f0,refs=6",
"org.assertj:assertj-core:3.21.0" : "b7ba1646,refs=2",
"org.carrot2:morfologik-fsa:2.1.9" : "e077a675,refs=8",
"org.carrot2:morfologik-polish:2.1.9" : "cb00cecf,refs=5",
@@ -73,7 +73,7 @@
"org.ow2.asm:asm-commons:9.6" : "6fbc4021,refs=5",
"org.ow2.asm:asm-tree:9.6" : "6fbc4021,refs=5",
"org.pcollections:pcollections:3.1.4" : "6897bc09,refs=38",
- "org.slf4j:slf4j-api:1.7.36" : "b91715f0,refs=6",
+ "org.slf4j:slf4j-api:2.0.16" : "b91715f0,refs=6",
"ua.net.nlp:morfologik-ukrainian-search:4.9.1" : "cb00cecf,refs=5",
"xerces:xercesImpl:2.12.0" : "6f16ff86,refs=2"
}
diff --git a/versions.toml b/versions.toml
index d1e693e03ca..679287f9d7d 100644
--- a/versions.toml
+++ b/versions.toml
@@ -25,7 +25,7 @@ minJava = "21"
morfologik = "2.1.9"
morfologik-ukrainian = "4.9.1"
nekohtml = "1.9.17"
-opennlp = "2.3.2"
+opennlp = "2.5.3"
procfork = "1.0.6"
randomizedtesting = "2.8.1"
rat = "0.14"