Skip to content

Commit 9c2a5af

Browse files
authored
Bump Solr 9x to latest opennlp 1.9.5 (#4555)
1 parent 4cfbe6d commit 9c2a5af

8 files changed

Lines changed: 13 additions & 5 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Increment OpenNLP to 1.9.5 fixing some CVE's
3+
type: dependency_update # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Eric Pugh
6+
links:
7+
- name: PR#4555
8+
url: https://github.com/apache/solr/pull/4555

solr/licenses/opennlp-tools-1.9.4.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
15fd24951658ae6cd2bc9ccc7f005a8bbde7b2c7

solr/modules/analysis-extras/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies {
3131
runtimeOnly 'org.apache.lucene:lucene-analysis-smartcn'
3232
runtimeOnly 'org.apache.lucene:lucene-analysis-stempel'
3333
implementation 'org.apache.lucene:lucene-core'
34-
// NOTE: Need to stay on same version of opennlp-tools as lucene-analysis-opennlp
3534
implementation 'org.apache.opennlp:opennlp-tools'
3635
implementation 'org.slf4j:slf4j-api'
3736

solr/modules/langid/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ dependencies {
2828
}
2929
implementation 'commons-io:commons-io'
3030
implementation 'com.cybozu.labs:langdetect'
31-
// NOTE: Currently not defined in versions.props since we need to stay on same version as Lucene due to opennlp
3231
implementation 'org.apache.opennlp:opennlp-tools'
3332
implementation 'org.slf4j:slf4j-api'
3433

solr/solr-ref-guide/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ asciidoc:
5050
dep-version-dropwizard: '4.2.26'
5151
dep-version-hadoop: '3.4.1'
5252
dep-version-log4j: '2.21.0'
53-
dep-version-opennlp: '1.9.4'
53+
dep-version-opennlp: '1.9.5'
5454
dep-version-tika: '1.28.5'
5555
dep-version-zookeeper: '3.9.4'
5656
dep-version-lucene: '9.12.3'

versions.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ org.apache.lucene:lucene-spatial-extras:9.12.3 (1 constraints: 4105623b)
252252
org.apache.lucene:lucene-spatial3d:9.12.3 (1 constraints: ee109eca)
253253
org.apache.lucene:lucene-suggest:9.12.3 (1 constraints: 4105623b)
254254
org.apache.lucene:lucene-test-framework:9.12.3 (1 constraints: 4105623b)
255-
org.apache.opennlp:opennlp-tools:1.9.4 (1 constraints: 9811cee0)
255+
org.apache.opennlp:opennlp-tools:1.9.5 (2 constraints: a8161c14)
256256
org.apache.poi:poi:5.5.1 (2 constraints: db0f56a8)
257257
org.apache.poi:poi-ooxml:5.5.1 (1 constraints: 0d051436)
258258
org.apache.poi:poi-ooxml-lite:5.5.1 (1 constraints: cf0aa7cb)

versions.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ org.apache.kafka:*=3.9.2
5858
org.apache.kerby:*=2.1.0
5959
org.apache.logging.log4j:*=2.26.0
6060
org.apache.lucene:*=9.12.3
61+
# Override the OpenNLP tools version that Solr would otherwise inherit from Lucene
62+
org.apache.opennlp:opennlp-tools=1.9.5
6163
org.apache.poi:*=5.5.1
6264
org.apache.tika:*=3.3.0
6365
org.apache.tomcat:annotations-api=6.0.53

0 commit comments

Comments
 (0)