diff --git a/changelog/unreleased/PR#3942-update-apache-opennlp.yml b/changelog/unreleased/PR#3942-update-apache-opennlp.yml new file mode 100644 index 00000000000..8783203a25b --- /dev/null +++ b/changelog/unreleased/PR#3942-update-apache-opennlp.yml @@ -0,0 +1,7 @@ +title: Update apache.opennlp to v2.5.7 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3942 + url: https://github.com/apache/solr/pull/3942 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f93fe6d9b3..ddfe8e1e304 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ apache-httpcomponents-httpmime = "4.5.14" apache-kafka = "3.9.1" apache-log4j = "2.21.0" apache-lucene = "10.3.2" -apache-opennlp = "2.5.6" +apache-opennlp = "2.5.7" 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 4a4ce7af390..f3febe34d7e 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.23.0=jarValidation,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.23.2=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -125,8 +125,8 @@ org.apache.lucene:lucene-spatial-extras:10.3.2=compileClasspath,jarValidation,ru org.apache.lucene:lucene-spatial3d:10.3.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.3.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.3.2=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.6=jarValidation,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.6=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.7=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.7=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.23.0.jar.sha1 b/solr/licenses/onnxruntime-1.23.0.jar.sha1 deleted file mode 100644 index 224cf397612..00000000000 --- a/solr/licenses/onnxruntime-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ca305e937b558f390e8d85a0a419d137b0ae259 diff --git a/solr/licenses/onnxruntime-1.23.2.jar.sha1 b/solr/licenses/onnxruntime-1.23.2.jar.sha1 new file mode 100644 index 00000000000..3fe5a921f3a --- /dev/null +++ b/solr/licenses/onnxruntime-1.23.2.jar.sha1 @@ -0,0 +1 @@ +98997ea42fb000cfe57200bed6712464acb4d4e7 diff --git a/solr/licenses/opennlp-dl-2.5.6.jar.sha1 b/solr/licenses/opennlp-dl-2.5.6.jar.sha1 deleted file mode 100644 index e1188a3a780..00000000000 --- a/solr/licenses/opennlp-dl-2.5.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -434b4b17b02789bb2b2346640fc16a3bcf43ae12 diff --git a/solr/licenses/opennlp-dl-2.5.7.jar.sha1 b/solr/licenses/opennlp-dl-2.5.7.jar.sha1 new file mode 100644 index 00000000000..20358460945 --- /dev/null +++ b/solr/licenses/opennlp-dl-2.5.7.jar.sha1 @@ -0,0 +1 @@ +3fc5c35e249e63b8bb2927edf761ae37cdcb3ce8 diff --git a/solr/licenses/opennlp-tools-2.5.6.jar.sha1 b/solr/licenses/opennlp-tools-2.5.6.jar.sha1 deleted file mode 100644 index b7429118191..00000000000 --- a/solr/licenses/opennlp-tools-2.5.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9d5d38502b8c16d08ae4990f105a65893da099a1 diff --git a/solr/licenses/opennlp-tools-2.5.7.jar.sha1 b/solr/licenses/opennlp-tools-2.5.7.jar.sha1 new file mode 100644 index 00000000000..04c8cf7d5bc --- /dev/null +++ b/solr/licenses/opennlp-tools-2.5.7.jar.sha1 @@ -0,0 +1 @@ +524ee84832c7c12c4023aae011e6f9ee91975265 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index c1425912839..ace7ef1a7b0 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -30,7 +30,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:3.4.4=solrPlatformLibs -com.microsoft.onnxruntime:onnxruntime:1.23.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.23.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -121,8 +121,8 @@ org.apache.lucene:lucene-spatial-extras:10.3.2=apiHelper,jarValidation,runtimeCl org.apache.lucene:lucene-spatial3d:10.3.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.3.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.3.2=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.7=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.7=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 293aa809f06..957e6d40138 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -115,7 +115,7 @@ org.apache.lucene:lucene-spatial-extras:10.3.2=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.3.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.3.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.3.2=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.7=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 6482ac10b74..1e584801bf6 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -31,7 +31,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:3.4.4=solrPlatformLibs -com.microsoft.onnxruntime:onnxruntime:1.23.0=jarValidation,testRuntimeClasspath +com.microsoft.onnxruntime:onnxruntime:1.23.2=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -130,8 +130,8 @@ org.apache.lucene:lucene-spatial-extras:10.3.2=jarValidation,runtimeClasspath,ru org.apache.lucene:lucene-spatial3d:10.3.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-suggest:10.3.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-test-framework:10.3.2=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.opennlp:opennlp-dl:2.5.6=jarValidation,testRuntimeClasspath -org.apache.opennlp:opennlp-tools:2.5.6=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-dl:2.5.7=jarValidation,testRuntimeClasspath +org.apache.opennlp:opennlp-tools:2.5.7=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