From c62926d9ee5c77fec572010ab091f51bc4240b56 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:55:01 +0000 Subject: [PATCH 1/2] Update dependency org.checkerframework:checker-qual to v4 --- gradle/libs.versions.toml | 2 +- solr/licenses/checker-qual-3.54.0.jar.sha1 | 1 - solr/licenses/checker-qual-4.0.0.jar.sha1 | 1 + solr/modules/gcs-repository/gradle.lockfile | 2 +- solr/modules/sql/gradle.lockfile | 2 +- solr/solr-ref-guide/gradle.lockfile | 2 +- solr/solrj-streaming/gradle.lockfile | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 solr/licenses/checker-qual-3.54.0.jar.sha1 create mode 100644 solr/licenses/checker-qual-4.0.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31ec..885856d123e3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -69,7 +69,7 @@ carrot2-core = "4.8.1" carrotsearch-hppc = "0.10.0" carrotsearch-randomizedtesting = "2.8.4" # @keep for version alignment -checkerframework = "3.54.0" +checkerframework = "4.0.0" codehaus-woodstox = "4.2.2" commons-cli = "1.11.0" commons-codec = "1.21.0" diff --git a/solr/licenses/checker-qual-3.54.0.jar.sha1 b/solr/licenses/checker-qual-3.54.0.jar.sha1 deleted file mode 100644 index 92727a159302..000000000000 --- a/solr/licenses/checker-qual-3.54.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3ce292a54faccba14e2a9f3077a4dc05e5770a8 diff --git a/solr/licenses/checker-qual-4.0.0.jar.sha1 b/solr/licenses/checker-qual-4.0.0.jar.sha1 new file mode 100644 index 000000000000..d92873d717ef --- /dev/null +++ b/solr/licenses/checker-qual-4.0.0.jar.sha1 @@ -0,0 +1 @@ +8606b799965b73ad6f28e54d55fa5eec26e6fb27 diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index fcdce63db232..9ab978c99626 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -169,7 +169,7 @@ org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspat 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 -org.checkerframework:checker-qual:3.54.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 8a8b6c829558..b66b7709a945 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -140,7 +140,7 @@ org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClas org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath -org.checkerframework:checker-qual:3.54.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.janino:janino:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index b054cf151d7d..a23f38d95dfa 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -125,7 +125,7 @@ org.apache.lucene:lucene-test-framework:10.4.0=testCompileClasspath,testRuntimeC org.apache.zookeeper:zookeeper-jute:3.9.4=testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testRuntimeClasspath -org.checkerframework:checker-qual:3.54.0=testRuntimeClasspath +org.checkerframework:checker-qual:4.0.0=testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.11=testRuntimeClasspath org.codehaus.janino:janino:3.1.11=testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 6a6c1f2a4ceb..1212b23bc2f6 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -125,7 +125,7 @@ org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspat org.apache.zookeeper:zookeeper-jute:3.9.4=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath -org.checkerframework:checker-qual:3.54.0=jarValidation,testRuntimeClasspath +org.checkerframework:checker-qual:4.0.0=jarValidation,testRuntimeClasspath org.codehaus.janino:commons-compiler:3.1.11=jarValidation,testRuntimeClasspath org.codehaus.janino:janino:3.1.11=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath From 4c52ae0e63e7ee57b73afcf48d3a3d792be6107e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:55:24 +0000 Subject: [PATCH 2/2] Update changelog entry --- .../PR#4354-update-org-checkerframework-checker-qual.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4354-update-org-checkerframework-checker-qual.yml diff --git a/changelog/unreleased/PR#4354-update-org-checkerframework-checker-qual.yml b/changelog/unreleased/PR#4354-update-org-checkerframework-checker-qual.yml new file mode 100644 index 000000000000..17283f238c03 --- /dev/null +++ b/changelog/unreleased/PR#4354-update-org-checkerframework-checker-qual.yml @@ -0,0 +1,7 @@ +title: Update org.checkerframework:checker-qual to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4354 + url: https://github.com/apache/solr/pull/4354