diff --git a/.github/workflows/solrj-test.yml b/.github/workflows/solrj-test.yml index 4e66e4af85df..3fa5a8cd30ce 100644 --- a/.github/workflows/solrj-test.yml +++ b/.github/workflows/solrj-test.yml @@ -7,6 +7,8 @@ on: paths: - '.github/workflows/solrj-test.yml' - 'solr/solrj/**' + - 'versions.props' + - 'versions.lock' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/tests-via-crave.yml b/.github/workflows/tests-via-crave.yml index 1623ed29f33d..30f354a5fefa 100644 --- a/.github/workflows/tests-via-crave.yml +++ b/.github/workflows/tests-via-crave.yml @@ -7,6 +7,8 @@ on: paths: - 'solr/**/src/**' - 'gradle/libs.versions.toml' + - 'versions.props' + - 'versions.lock' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/solr/licenses/disruptor-3.4.4.jar.sha1 b/solr/licenses/disruptor-3.4.4.jar.sha1 deleted file mode 100644 index 65262f8a5dee..000000000000 --- a/solr/licenses/disruptor-3.4.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -588321627643b6de45db44c6575e750fea3ae3f5 diff --git a/solr/licenses/disruptor-4.0.0.jar.sha1 b/solr/licenses/disruptor-4.0.0.jar.sha1 new file mode 100644 index 000000000000..5935553be265 --- /dev/null +++ b/solr/licenses/disruptor-4.0.0.jar.sha1 @@ -0,0 +1 @@ +9e77a6b0b1d3d0dac3e9f7f63535dad8ef217cbc diff --git a/versions.lock b/versions.lock index 1b983a22721d..6b9e061ac2e6 100644 --- a/versions.lock +++ b/versions.lock @@ -63,7 +63,7 @@ com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484) com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) com.jayway.jsonpath:json-path:2.10.0 (2 constraints: bf12ce4a) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) -com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) +com.lmax:disruptor:4.0.0 (1 constraints: 0605ff35) com.squareup.okhttp3:okhttp:5.4.0 (11 constraints: a49b7f8e) com.squareup.okhttp3:okhttp-jvm:5.4.0 (2 constraints: 5d11c3e8) com.squareup.okhttp3:okhttp-sse:5.4.0 (2 constraints: 13189cad) diff --git a/versions.props b/versions.props index a8f45a8439a1..8b50c0274642 100644 --- a/versions.props +++ b/versions.props @@ -17,7 +17,7 @@ com.google.protobuf:*=4.35.1 com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 com.jayway.jsonpath:json-path=2.10.0 -com.lmax:disruptor=3.4.4 +com.lmax:disruptor=4.0.0 com.squareup.okhttp3:*=5.4.0 com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0