This is an automated email from the ASF dual-hosted git repository. janhoy pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 2d5aebf9f833565e13d036e5e386388d66790655 Author: Solr Bot <[email protected]> AuthorDate: Sat Jan 3 00:28:04 2026 +0100 Update dependency jakarta.servlet:jakarta.servlet-api to v6.1.0 (#3366) (cherry picked from commit 58ad50034a38c827e114f33d2d005abc8a6f860d) --- .../PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml | 7 +++++++ gradle/libs.versions.toml | 2 +- solr/api/gradle.lockfile | 2 +- solr/benchmark/gradle.lockfile | 2 +- solr/core/gradle.lockfile | 2 +- solr/cross-dc-manager/gradle.lockfile | 2 +- solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 | 1 - solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 2 +- solr/modules/clustering/gradle.lockfile | 2 +- solr/modules/cross-dc/gradle.lockfile | 2 +- solr/modules/cuvs/gradle.lockfile | 2 +- solr/modules/extraction/gradle.lockfile | 2 +- solr/modules/gcs-repository/gradle.lockfile | 2 +- solr/modules/jwt-auth/gradle.lockfile | 2 +- solr/modules/langid/gradle.lockfile | 2 +- solr/modules/language-models/gradle.lockfile | 2 +- solr/modules/ltr/gradle.lockfile | 2 +- solr/modules/opentelemetry/gradle.lockfile | 2 +- solr/modules/s3-repository/gradle.lockfile | 2 +- solr/modules/scripting/gradle.lockfile | 2 +- solr/modules/sql/gradle.lockfile | 2 +- solr/server/gradle.lockfile | 2 +- solr/solr-ref-guide/gradle.lockfile | 2 +- solr/solrj-streaming/gradle.lockfile | 2 +- solr/solrj-zookeeper/gradle.lockfile | 2 +- solr/solrj/gradle.lockfile | 2 +- solr/test-framework/gradle.lockfile | 2 +- solr/webapp/gradle.lockfile | 2 +- 29 files changed, 34 insertions(+), 27 deletions(-) diff --git a/changelog/unreleased/PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml b/changelog/unreleased/PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml new file mode 100644 index 00000000000..d913b290bbf --- /dev/null +++ b/changelog/unreleased/PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml @@ -0,0 +1,7 @@ +title: Update jakarta.servlet:jakarta.servlet-api to v6.1.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3366 + url: https://github.com/apache/solr/pull/3366 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b2f4d5d4e52..db91a59f1cf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -124,7 +124,7 @@ j256-simplemagic = "1.17" # Keep these Jakarta versions aligned with EE 10 jakarta-annotation = "2.1.1" jakarta-inject = "2.0.1" -jakarta-servlet = "6.0.0" +jakarta-servlet = "6.1.0" jakarta-ws = "3.1.0" # @keep This is the minimum required Java version for the project. java-min = "21" diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 1acb8afaa6e..c9ce8ccb597 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -79,7 +79,7 @@ io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22=swaggerBuild io.swagger.core.v3:swagger-models-jakarta:2.2.22=swaggerBuild jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,swaggerBuild,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index fc87441720e..57b7730a427 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -70,7 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,testRuntime io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 613c949584c..f922247a5a7 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -78,7 +78,7 @@ io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath jakarta.activation:jakarta.activation-api:2.1.3=permitUnusedDeclared jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index b033991f687..2c6523ed2da 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -88,7 +88,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 b/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 deleted file mode 100644 index 2cecca548df..00000000000 --- a/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abecc699286e65035ebba9844c03931357a6a963 diff --git a/solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 b/solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 new file mode 100644 index 00000000000..02bd1a2b041 --- /dev/null +++ b/solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 @@ -0,0 +1 @@ +1169a246913fe3823782af7943e7a103634867c5 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 37b1065aafc..6252d3d2944 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -72,7 +72,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 01c47fdc4cc..b24313a58e9 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -70,7 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 677ff72c9fe..dd1727719bf 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -71,7 +71,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index b7a364b9b0b..14aeb4c97a5 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -72,7 +72,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 87c6283ca36..420e9377973 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -73,7 +73,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 116808da916..d06f7741d3b 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -121,7 +121,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index ea724f16a75..450a1328f94 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -84,7 +84,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 10082a4e667..3977ee35d6c 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -71,7 +71,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index be51a93fbbe..219a3da0757 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -85,7 +85,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 88a9b9ba9ba..b3d58223e98 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -70,7 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index a8141d7059f..3ab5d6b9260 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -103,7 +103,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 1e97d24c12a..bc2adb983d1 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -91,7 +91,7 @@ jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1=jarValidation,testCompileCla jakarta.enterprise:jakarta.enterprise.lang-model:4.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.interceptor:jakarta.interceptor-api:2.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.transaction:jakarta.transaction-api:2.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.websocket:jakarta.websocket-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 73c6f0e3b3f..84b57b5c595 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -70,7 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 856d438b440..b092272424c 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -73,7 +73,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index bb1ddc30035..d49fadae7cc 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -66,7 +66,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,solrCore io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=jarValidation,runtimeClasspath,solrCore jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,solrCore jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,solrCore -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,serverLib,solrCore +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,runtimeClasspath,serverLib,solrCore jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,solrCore jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,solrCore javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index dc2e61713e1..55a4e28fe79 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -70,7 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 428a9419dfc..fc80ed6687e 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -80,7 +80,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 3259e7533dd..d5935f4fe83 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -85,7 +85,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index c92b02e806b..a54d5daa6f4 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -86,7 +86,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 10902b5adf0..65e9066649f 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -73,7 +73,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,t io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index ad3c5aeff3b..8c42398a240 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -66,7 +66,7 @@ io.sgr:s2-geometry-library-java:1.0.0=permitUnusedDeclared,solrCore io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=permitUnusedDeclared,solrCore jakarta.annotation:jakarta.annotation-api:2.1.1=permitUnusedDeclared,solrCore jakarta.inject:jakarta.inject-api:2.0.1=permitUnusedDeclared,solrCore -jakarta.servlet:jakarta.servlet-api:6.0.0=permitUnusedDeclared,serverLib,solrCore +jakarta.servlet:jakarta.servlet-api:6.1.0=permitUnusedDeclared,serverLib,solrCore jakarta.validation:jakarta.validation-api:3.0.2=permitUnusedDeclared,solrCore jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=permitUnusedDeclared,solrCore javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
