[solr] branch branch_9x updated: SOLR-16684: Stop overriding org.apache.opennlp:opennlp-tools in solr (#1424)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 7e72fdcec03 SOLR-16684: Stop overriding org.apache.opennlp:opennlp-tools in solr (#1424)
7e72fdcec03 is described below

commit 7e72fdcec037997c23b10333bf6cb92256439b45
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu Mar 2 20:08:41 2023 +0100

    SOLR-16684: Stop overriding org.apache.opennlp:opennlp-tools in solr (#1424)
    
    Signed-off-by: Jan Høydahl <ja...@users.noreply.github.com>
    (cherry picked from commit 1d0c8a18302c2d4732f2e25ae8a524b34294fa59)
---
 solr/CHANGES.txt                          | 2 ++
 solr/modules/analysis-extras/build.gradle | 1 +
 solr/modules/langid/build.gradle          | 1 +
 versions.lock                             | 2 +-
 versions.props                            | 1 -
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1d14ecbff9e..4bc8e23329a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -292,6 +292,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 Fixes
diff --git a/solr/modules/analysis-extras/build.gradle b/solr/modules/analysis-extras/build.gradle
index 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-opennlp
   implementation 'org.apache.opennlp:opennlp-tools'
   implementation 'org.slf4j:slf4j-api'
 
diff --git a/solr/modules/langid/build.gradle b/solr/modules/langid/build.gradle
index 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 opennlp
   implementation 'org.apache.opennlp:opennlp-tools'
   implementation 'org.slf4j:slf4j-api'
 
diff --git a/versions.lock b/versions.lock
index da319e8fcf3..41304c90daa 100644
--- a/versions.lock
+++ b/versions.lock
@@ -234,7 +234,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.props
index d800048b532..276b6fcf180 100644
--- a/versions.props
+++ b/versions.props
@@ -52,7 +52,6 @@ org.apache.httpcomponents:httpmime=4.5.14
 org.apache.kerby:*=1.0.1
 org.apache.logging.log4j:*=2.20.0
 org.apache.lucene:*=9.4.2
-org.apache.opennlp:opennlp-tools=1.9.4
 org.apache.tika:*=1.28.5
 org.apache.tomcat:annotations-api=6.0.53
 org.apache.zookeeper:*=3.8.1