Skip to content

Commit 4bbf6cc

Browse files
solrbotsolrbot
authored
Update dependency com.lmax:disruptor to v4 (#3127)
And should address a warning when used with Java 25
1 parent 88c7edd commit 4bbf6cc

22 files changed

Lines changed: 27 additions & 20 deletions

File tree

‎changelog/unreleased/PR#3127-update-com-lmax-disruptor.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
title: Update com.lmax:disruptor to v4
2+
type: dependency_update
3+
authors:
4+
- name: solrbot
5+
links:
6+
- name: PR#3127
7+
url: https://github.com/apache/solr/pull/3127

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ langchain4j-bom = "1.9.1"
161161
# @keep Link checker version used in ref-guide
162162
link-checker = "1.4.2"
163163
littlerobots-versioncatalogupdate = "0.8.5"
164-
lmax-disruptor = "3.4.4"
164+
lmax-disruptor = "4.0.0"
165165
logchange = "1.19.13"
166166
ltgt-errorprone = "3.1.0"
167167
mockito = "5.19.0"

‎solr/benchmark/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,er
2828
com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
2929
com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspath
3030
com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
31-
com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,testRuntimeClasspath
31+
com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
3232
com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath
3333
commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath
3434
commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/cross-dc-manager/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ com.google.protobuf:protobuf-java-util:3.25.8=jarValidation,runtimeClasspath,run
3636
com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
3737
com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3838
com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
39-
com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
39+
com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
4040
com.squareup.okhttp3:okhttp-jvm:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
4141
com.squareup.okhttp3:okhttp:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
4242
com.squareup.okio:okio-jvm:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath

‎solr/licenses/disruptor-3.4.4.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/disruptor-4.0.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9e77a6b0b1d3d0dac3e9f7f63535dad8ef217cbc

‎solr/modules/analysis-extras/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnno
2929
com.ibm.icu:icu4j:77.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
3030
com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3131
com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
32-
com.lmax:disruptor:3.4.4=solrPlatformLibs
32+
com.lmax:disruptor:4.0.0=solrPlatformLibs
3333
com.microsoft.onnxruntime:onnxruntime:1.23.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
3434
com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3535
commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/modules/clustering/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,er
2828
com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
2929
com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3030
com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
31-
com.lmax:disruptor:3.4.4=solrPlatformLibs
31+
com.lmax:disruptor:4.0.0=solrPlatformLibs
3232
com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3333
commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3434
commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/modules/cross-dc/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileCl
2929
com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
3030
com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3131
com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
32-
com.lmax:disruptor:3.4.4=solrPlatformLibs
32+
com.lmax:disruptor:4.0.0=solrPlatformLibs
3333
com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3434
commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3535
commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/modules/cuvs/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,er
2828
com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor
2929
com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3030
com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
31-
com.lmax:disruptor:3.4.4=solrPlatformLibs
31+
com.lmax:disruptor:4.0.0=solrPlatformLibs
3232
com.nvidia.cuvs.lucene:cuvs-lucene:25.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
3333
com.nvidia.cuvs:cuvs-java:25.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
3434
com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

0 commit comments

Comments
 (0)