Apache Solr open-source search software
SOLR-16684: Stop overriding org.apache.opennlp:opennlp-tools in solr (#1424)
Jan Høydahl1d0c8a18302c
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ec3c22f0745..93795a3cd85 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -320,6 +320,8 @@ Other Changes* SOLR-16672: Simplify SolrCLI Healthcheck command's logic for obtaining a target collection (Eric Pugh)+* SOLR-16684: Keep solr's opennlp-tools version in sync with Lucene (janhoy)+================== 9.1.1 ==================Bug Fixesdiff --git a/solr/modules/analysis-extras/build.gradle b/solr/modules/analysis-extras/build.gradleindex db0a50db438..8fa1c000adb 100644--- a/solr/modules/analysis-extras/build.gradle+++ b/solr/modules/analysis-extras/build.gradle@@ -32,6 +32,7 @@ dependencies {runtimeOnly 'org.apache.lucene:lucene-analysis-smartcn'runtimeOnly 'org.apache.lucene:lucene-analysis-stempel'implementation 'org.apache.lucene:lucene-core'+ // NOTE: Need to stay on same version of opennlp-tools as lucene-analysis-opennlpimplementation 'org.apache.opennlp:opennlp-tools'implementation 'org.slf4j:slf4j-api'diff --git a/solr/modules/langid/build.gradle b/solr/modules/langid/build.gradleindex 5991c5667d1..c25227a7635 100644--- a/solr/modules/langid/build.gradle+++ b/solr/modules/langid/build.gradle@@ -26,6 +26,7 @@ dependencies {implementation ('org.apache.tika:tika-core') { transitive = false }implementation 'commons-io:commons-io'implementation 'com.cybozu.labs:langdetect'+ // NOTE: Currently not defined in versions.props since we need to stay on same version as Lucene due to opennlpimplementation 'org.apache.opennlp:opennlp-tools'implementation 'org.slf4j:slf4j-api'diff --git a/versions.lock b/versions.lockindex 0d4d7505860..87b79c28535 100644--- a/versions.lock+++ b/versions.lock@@ -232,7 +232,7 @@ org.apache.lucene:lucene-spatial-extras:9.4.2 (1 constraints: 11052636)org.apache.lucene:lucene-spatial3d:9.4.2 (1 constraints: be10b5b9)org.apache.lucene:lucene-suggest:9.4.2 (1 constraints: 11052636)org.apache.lucene:lucene-test-framework:9.4.2 (1 constraints: 11052636)-org.apache.opennlp:opennlp-tools:1.9.4 (3 constraints: 0823a25b)+org.apache.opennlp:opennlp-tools:1.9.4 (2 constraints: f91d5c6d)org.apache.pdfbox:fontbox:2.0.26 (1 constraints: 180b72d8)org.apache.pdfbox:jbig2-imageio:3.0.4 (1 constraints: 5e0cef01)org.apache.pdfbox:jempbox:1.8.16 (1 constraints: 970c910e)diff --git a/versions.props b/versions.propsindex 52be0f6abba..b4e1bbe675a 100644--- a/versions.props+++ b/versions.props@@ -51,7 +51,6 @@ org.apache.httpcomponents:httpmime=4.5.14org.apache.kerby:*=1.0.1org.apache.logging.log4j:*=2.20.0org.apache.lucene:*=9.4.2-org.apache.opennlp:opennlp-tools=1.9.4org.apache.tika:*=1.28.5org.apache.tomcat:annotations-api=6.0.53org.apache.zookeeper:*=3.8.1