Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade opennlp and codec 10x #14177

Merged
merged 2 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lucene/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ Other

* GITHUB#14116 Use CDL to block threads to avoid flaky tests. (Ao Li)

* 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
Expand Down
1 change: 1 addition & 0 deletions lucene/analysis.tests/src/test/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
requires org.apache.lucene.analysis.smartcn;
requires org.apache.lucene.analysis.stempel;
requires org.apache.lucene.test_framework;
requires org.apache.commons.codec;

exports org.apache.lucene.analysis.tests;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -29,8 +29,8 @@
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) {
Expand Down
1 change: 0 additions & 1 deletion lucene/licenses/commons-codec-1.13.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions lucene/licenses/commons-codec-1.17.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cd6bb9d856db5f61871a94d5801efd0b93b7fcb2
1 change: 0 additions & 1 deletion lucene/licenses/opennlp-tools-2.3.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions lucene/licenses/opennlp-tools-2.5.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4b544138ec079c1c73dc2c1b928506871c4b1b47
1 change: 0 additions & 1 deletion lucene/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions lucene/licenses/slf4j-api-2.0.16.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0172931663a09a1fa515567af5fbef00897d3c04
12 changes: 6 additions & 6 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"main_dependencies" : {
"com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1" : "fa9ef26b,refs=4",
"com.ibm.icu:icu4j:74.2" : "47ea4550,refs=6",
"commons-codec:commons-codec:1.13" : "e9962aab,refs=4",
"commons-codec:commons-codec:1.17.2" : "e9962aab,refs=4",
"io.sgr:s2-geometry-library-java:1.0.0" : "cbc357ab,refs=4",
"junit:junit:4.13.1" : "fa9ef26b,refs=4",
"net.sf.jopt-simple:jopt-simple:5.0.4" : "85a1e4c6,refs=2",
"net.sourceforge.nekohtml:nekohtml:1.9.17" : "5ce8cdc6,refs=2",
"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",
Expand All @@ -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"
},
Expand All @@ -46,7 +46,7 @@
"com.google.j2objc:j2objc-annotations:1.3" : "6897bc09,refs=38",
"com.google.protobuf:protobuf-java:3.19.2" : "6897bc09,refs=38",
"com.ibm.icu:icu4j:74.2" : "ffa00415,refs=8",
"commons-codec:commons-codec:1.13" : "733734f0,refs=6",
"commons-codec:commons-codec:1.17.2" : "733734f0,refs=6",
"io.github.java-diff-utils:java-diff-utils:4.0" : "6897bc09,refs=38",
"io.sgr:s2-geometry-library-java:1.0.0" : "1d5a4b2b,refs=4",
"javax.inject:javax.inject:1" : "6897bc09,refs=38",
Expand All @@ -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",
Expand All @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
antlr = "4.11.1"
asm = "9.6"
assertj = "3.21.0"
commons-codec = "1.13"
commons-codec = "1.17.2"
commons-compress = "1.19"
ecj = "3.36.0"
errorprone = "2.18.0"
Expand All @@ -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"
Expand Down