diff --git a/changelog/unreleased/PR#4391-update-apache-opennlp.yml b/changelog/unreleased/PR#4391-update-apache-opennlp.yml new file mode 100644 index 000000000000..77b9ce681bac --- /dev/null +++ b/changelog/unreleased/PR#4391-update-apache-opennlp.yml @@ -0,0 +1,7 @@ +title: Update apache.opennlp to v2.5.9 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4391 + url: https://github.com/apache/solr/pull/4391 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31ec..905d5cd61cf6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,7 @@ apache-httpcomponents-httpmime = "4.5.14" apache-kafka = "3.9.2" apache-log4j = "2.25.3" apache-lucene = "10.4.0" -apache-opennlp = "2.5.8" +apache-opennlp = "2.5.9" apache-rat = "0.15" apache-tika = "3.2.3" apache-tomcat = "6.0.53" diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index b3efa59c203d..e5717f2057e8 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -33,7 +33,7 @@ com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnno com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.microsoft.onnxruntime:onnxruntime:1.24.3=jarValidation,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.25.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -126,8 +126,8 @@ org.apache.lucene:lucene-spatial-extras:10.4.0=compileClasspath,jarValidation,ru org.apache.lucene:lucene-spatial3d:10.4.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.4.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.8=jarValidation,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.8=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.9=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.9=jarValidation,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/licenses/onnxruntime-1.24.3.jar.sha1 b/solr/licenses/onnxruntime-1.24.3.jar.sha1 deleted file mode 100644 index f72f4175aadf..000000000000 --- a/solr/licenses/onnxruntime-1.24.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e29eb8434270224246b5c323a30592ab95cd7436 diff --git a/solr/licenses/onnxruntime-1.25.0.jar.sha1 b/solr/licenses/onnxruntime-1.25.0.jar.sha1 new file mode 100644 index 000000000000..d6a72a3fcca5 --- /dev/null +++ b/solr/licenses/onnxruntime-1.25.0.jar.sha1 @@ -0,0 +1 @@ +7981d37daa718f0eebdd2041b27084b3810800ca diff --git a/solr/licenses/opennlp-dl-2.5.8.jar.sha1 b/solr/licenses/opennlp-dl-2.5.8.jar.sha1 deleted file mode 100644 index edd6030f8fe2..000000000000 --- a/solr/licenses/opennlp-dl-2.5.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2bda552bec316919a0fcaa5eb8a07d4076ec79fd diff --git a/solr/licenses/opennlp-dl-2.5.9.jar.sha1 b/solr/licenses/opennlp-dl-2.5.9.jar.sha1 new file mode 100644 index 000000000000..03dc61bcfb64 --- /dev/null +++ b/solr/licenses/opennlp-dl-2.5.9.jar.sha1 @@ -0,0 +1 @@ +8c0ce9908be4ed7ee91cdbb8f7c4f1bf79ea1716 diff --git a/solr/licenses/opennlp-tools-2.5.8.jar.sha1 b/solr/licenses/opennlp-tools-2.5.8.jar.sha1 deleted file mode 100644 index 00b00808b45b..000000000000 --- a/solr/licenses/opennlp-tools-2.5.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6fbf727022dde9be666c4542a3f67401584593e5 diff --git a/solr/licenses/opennlp-tools-2.5.9.jar.sha1 b/solr/licenses/opennlp-tools-2.5.9.jar.sha1 new file mode 100644 index 000000000000..df06e0116e6e --- /dev/null +++ b/solr/licenses/opennlp-tools-2.5.9.jar.sha1 @@ -0,0 +1 @@ +3a9c5279e4ad1950a92ab5aa85fa88e970d82927 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index ea2b716d3cab..25d7c786ec85 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -31,7 +31,7 @@ com.ibm.icu:icu4j:77.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLi com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=solrPlatformLibs -com.microsoft.onnxruntime:onnxruntime:1.24.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.25.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -124,8 +124,8 @@ org.apache.lucene:lucene-spatial-extras:10.4.0=apiHelper,jarValidation,runtimeCl org.apache.lucene:lucene-spatial3d:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index a3a8216ae710..a9041732effc 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -117,7 +117,7 @@ org.apache.lucene:lucene-spatial-extras:10.4.0=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 8a8b6c829558..534542f7b6e1 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -32,7 +32,7 @@ com.ibm.icu:icu4j:77.1=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=solrPlatformLibs -com.microsoft.onnxruntime:onnxruntime:1.24.3=jarValidation,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.25.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -132,8 +132,8 @@ org.apache.lucene:lucene-spatial-extras:10.4.0=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.8=jarValidation,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.8=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.9=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.9=jarValidation,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath