From b7ef82bb2cf78b65323e0aac2cb527c331a7c4d7 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:26:18 +0000 Subject: [PATCH 1/2] 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 7018c17a31e..998ad724726 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -139,7 +139,7 @@ jayway-jsonpath = "2.9.0" jctools = "4.0.5" jersey = "4.0.2" # @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 a700b6be805..a211ab4e839 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -221,7 +221,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs 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 b5beca7913b..00000000000 --- 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 00000000000..46ada2fb897 --- /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 97d72a04dac..524adef62af 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -159,7 +159,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime org.glassfish.jersey:jersey-bom:4.0.2=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 de3055b0b4b..cbc2547702e 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -184,7 +184,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20=jarValidation,testRuntimeClassp org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=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 d2cdfd08dd8..39d2e09693b 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -171,7 +171,7 @@ org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,sol org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=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 dab8526fa6f..a4ea3a83fa2 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -186,7 +186,7 @@ org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs 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 521d5efe58d..90a0905f69b 100644 --- a/solr/ui/gradle.lockfile +++ b/solr/ui/gradle.lockfile @@ -436,7 +436,7 @@ org.jetbrains.skiko:skiko:0.9.22.2=composeHotReloadDevTools org.jetbrains.skiko:skiko:0.9.37.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata org.jetbrains:annotations:13.0=composeHotReloadRuntime,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains:annotations:23.0.0=composeHotReloadDevTools -org.jetbrains:annotations:26.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath +org.jetbrains:annotations:26.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath org.jspecify:jspecify:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath org.ow2.asm:asm-tree:9.8=composeHotReloadAgent org.ow2.asm:asm:9.8=composeHotReloadAgent From 4e7d00f86d3bfe39d4bd11bb6a6d9403c5e8c9ba Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:26:38 +0000 Subject: [PATCH 2/2] 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 00000000000..07d10395492 --- /dev/null +++ b/changelog/unreleased/PR#3626-update-org-jetbrains-annotations.yml @@ -0,0 +1,7 @@ +title: Update org.jetbrains:annotations to v26.1.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3626 + url: https://github.com/apache/solr/pull/3626