From addef9f75a480b32c72acfff4556d984e0b66f3a Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 23 Feb 2026 17:11:58 +0000 Subject: [PATCH 1/3] Update dependency org.jetbrains:annotations to v26.1.0 --- gradle/libs.versions.toml | 2 +- solr/cross-dc-manager/gradle.lockfile | 2 +- solr/licenses/annotations-26.0.2.jar.sha1 | 1 - solr/licenses/annotations-26.1.0.jar.sha1 | 1 + solr/modules/extraction/gradle.lockfile | 2 +- solr/modules/jwt-auth/gradle.lockfile | 2 +- solr/modules/language-models/gradle.lockfile | 2 +- solr/modules/opentelemetry/gradle.lockfile | 2 +- solr/ui/gradle.lockfile | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 solr/licenses/annotations-26.0.2.jar.sha1 create mode 100644 solr/licenses/annotations-26.1.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c854fb41b01..8b813cd1c027 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -139,7 +139,7 @@ jersey = "3.1.11" # TODO Sync with jersey versions jersey-containers = "2.39.1" # @keep for version alignment -jetbrains-annotations = "26.0.2" +jetbrains-annotations = "26.1.0" # @keep for version alignment jna = "5.18.1" # @keep for version alignment diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 400921456623..b0ee1e6067e7 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -216,7 +216,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtim org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains:annotations:26.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/licenses/annotations-26.0.2.jar.sha1 b/solr/licenses/annotations-26.0.2.jar.sha1 deleted file mode 100644 index b5beca7913b6..000000000000 --- a/solr/licenses/annotations-26.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c7ce3cdeda3d18909368dfe5977332dfad326c6d diff --git a/solr/licenses/annotations-26.1.0.jar.sha1 b/solr/licenses/annotations-26.1.0.jar.sha1 new file mode 100644 index 000000000000..46ada2fb8973 --- /dev/null +++ b/solr/licenses/annotations-26.1.0.jar.sha1 @@ -0,0 +1 @@ +c1e9226d7ca6661020c58c94397da0cc3673d5e4 diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 2ccfe67726b3..4b9409012ad8 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -155,7 +155,7 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,run org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:26.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 8a9d1765fd54..c5b1a4d3e794 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -180,7 +180,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0=jarValidation,testRuntimeClasspa org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:26.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index 27221b30a3e7..d6ea9b3d9b3d 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -167,7 +167,7 @@ org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,sol org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains:annotations:26.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index dbb2a9b95b65..9ee4bb0b609a 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -182,7 +182,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtim org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains:annotations:26.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile index 2196fbb365b2..efe74e0c67cc 100644 --- a/solr/ui/gradle.lockfile +++ b/solr/ui/gradle.lockfile @@ -282,7 +282,7 @@ org.jetbrains.skiko:skiko-js-wasm-runtime:0.9.4.2=COMPOSE_SKIKO_JS_WASM_RUNTIME, org.jetbrains.skiko:skiko-wasm-js:0.9.4.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath org.jetbrains.skiko:skiko:0.9.4.2=allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainApiDependenciesMetadata,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopCompileClasspath,desktopMainApiDependenciesMetadata,desktopMainCompileClasspath,desktopMainCompileOnlyDependenciesMetadata,desktopMainImplementationDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestApiDependenciesMetadata,desktopTestCompileClasspath,desktopTestCompileOnlyDependenciesMetadata,desktopTestImplementationDependenciesMetadata,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainApiDependenciesMetadata,wasmJsMainCompileOnlyDependenciesMetadata,wasmJsMainImplementationDependenciesMetadata,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestApiDependenciesMetadata,wasmJsTestCompileClasspath,wasmJsTestCompileOnlyDependenciesMetadata,wasmJsTestImplementationDependenciesMetadata,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath -org.jetbrains:annotations:26.0.2=desktopCompileClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath +org.jetbrains:annotations:26.1.0=desktopCompileClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath org.jspecify:jspecify:1.0.0=desktopTestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainApiDependenciesMetadata,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopCompileClasspath,desktopMainApiDependenciesMetadata,desktopMainCompileClasspath,desktopMainCompileOnlyDependenciesMetadata,desktopMainImplementationDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestApiDependenciesMetadata,desktopTestCompileClasspath,desktopTestCompileOnlyDependenciesMetadata,desktopTestImplementationDependenciesMetadata,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainApiDependenciesMetadata,wasmJsMainCompileOnlyDependenciesMetadata,wasmJsMainImplementationDependenciesMetadata,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestApiDependenciesMetadata,wasmJsTestCompileClasspath,wasmJsTestCompileOnlyDependenciesMetadata,wasmJsTestImplementationDependenciesMetadata,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath empty=commonMainIntransitiveDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,desktopMainAnnotationProcessor,desktopMainIntransitiveDependenciesMetadata,desktopTestAnnotationProcessor,desktopTestIntransitiveDependenciesMetadata,jarValidation,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testKotlinScriptDefExtensions,wasmJsMainIntransitiveDependenciesMetadata,wasmJsTestIntransitiveDependenciesMetadata From 0b7ee9ce7cbdb0580b30861778f3bc0ee790f813 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 23 Feb 2026 17:12:40 +0000 Subject: [PATCH 2/3] Update changelog entry --- .../PR#3626-update-org-jetbrains-annotations.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml diff --git a/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml b/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml new file mode 100644 index 000000000000..115ba658e65f --- /dev/null +++ b/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml @@ -0,0 +1,7 @@ +title: Update org.jetbrains:annotations to v26.0.2-1 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3626 + url: https://github.com/apache/solr/pull/3626 From 2c74653b03ebcbbd6d763cdb90f672de3ecc3e2e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 23 Feb 2026 17:13:08 +0000 Subject: [PATCH 3/3] Update changelog entry --- .../unreleased/PR#3626-update-org-jetbrains-annotations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml b/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml index 115ba658e65f..07d10395492c 100644 --- a/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml +++ b/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml @@ -1,4 +1,4 @@ -title: Update org.jetbrains:annotations to v26.0.2-1 +title: Update org.jetbrains:annotations to v26.1.0 type: dependency_update authors: - name: solrbot