You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2026/01/02 23:47:49 UTC
(solr) branch branch_10x updated (b8fe8cbb43e -> 6eb71c3ecb9)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/solr.git
from b8fe8cbb43e CHANGELOG.md generated for release v10.0.0
new 2d5aebf9f83 Update dependency jakarta.servlet:jakarta.servlet-api to v6.1.0 (#3366)
new 5796409f8d9 Update dependency org.openapi.generator to v7.18.0 (#3601)
new 9e14feda765 Update bytebuddy to v1.18.3 (#3764)
new adc48bd75e6 Update dependency org.testcontainers:testcontainers to v2 (#3795)
new 5bd9ed86fda Update dependency net.java.dev.jna:jna to v5.18.1 (#3781)
new 69f1761a8be Update dependency com.github.ben-manes.versions to v0.53.0 (#3085)
new 6eb71c3ecb9 Update actions/upload-artifact action to v6 (#3959)
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/bin-solr-test.yml | 2 +-
.../PR#3085-update-com-github-ben-manes-versions.yml | 7 +++++++
.../PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml | 7 +++++++
.../unreleased/PR#3601-update-org-openapi-generator.yml | 7 +++++++
changelog/unreleased/PR#3764-update-bytebuddy.yml | 7 +++++++
changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml | 7 +++++++
.../PR#3795-update-org-testcontainers-testcontainers.yml | 7 +++++++
.../PR#3959-update-actions-upload-artifact-action.yml | 7 +++++++
gradle/libs.versions.toml | 12 ++++++------
solr/api/gradle.lockfile | 2 +-
solr/benchmark/gradle.lockfile | 2 +-
solr/core/gradle.lockfile | 4 ++--
solr/cross-dc-manager/gradle.lockfile | 6 +++---
solr/licenses/byte-buddy-1.17.7.jar.sha1 | 1 -
solr/licenses/byte-buddy-1.18.3.jar.sha1 | 1 +
solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 | 1 -
solr/licenses/byte-buddy-agent-1.18.3.jar.sha1 | 1 +
solr/licenses/docker-java-api-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-api-3.7.0.jar.sha1 | 1 +
solr/licenses/docker-java-transport-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-transport-3.7.0.jar.sha1 | 1 +
solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 | 1 +
solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 | 1 -
solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1 | 1 +
solr/licenses/jna-5.13.0.jar.sha1 | 1 -
solr/licenses/jna-5.18.1.jar.sha1 | 1 +
solr/licenses/testcontainers-1.20.4.jar.sha1 | 1 -
solr/licenses/testcontainers-2.0.3.jar.sha1 | 1 +
solr/modules/analysis-extras/gradle.lockfile | 4 ++--
solr/modules/clustering/gradle.lockfile | 2 +-
solr/modules/cross-dc/gradle.lockfile | 6 +++---
solr/modules/cuvs/gradle.lockfile | 2 +-
solr/modules/extraction/gradle.lockfile | 12 ++++++------
solr/modules/gcs-repository/gradle.lockfile | 2 +-
solr/modules/jwt-auth/gradle.lockfile | 4 ++--
solr/modules/langid/gradle.lockfile | 2 +-
solr/modules/language-models/gradle.lockfile | 2 +-
solr/modules/ltr/gradle.lockfile | 4 ++--
solr/modules/opentelemetry/gradle.lockfile | 2 +-
solr/modules/s3-repository/gradle.lockfile | 4 ++--
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 | 4 ++--
solr/test-framework/gradle.lockfile | 2 +-
solr/webapp/gradle.lockfile | 2 +-
50 files changed, 104 insertions(+), 55 deletions(-)
create mode 100644 changelog/unreleased/PR#3085-update-com-github-ben-manes-versions.yml
create mode 100644 changelog/unreleased/PR#3366-update-jakarta-servlet-jakarta-servlet-api.yml
create mode 100644 changelog/unreleased/PR#3601-update-org-openapi-generator.yml
create mode 100644 changelog/unreleased/PR#3764-update-bytebuddy.yml
create mode 100644 changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml
create mode 100644 changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml
create mode 100644 changelog/unreleased/PR#3959-update-actions-upload-artifact-action.yml
delete mode 100644 solr/licenses/byte-buddy-1.17.7.jar.sha1
create mode 100644 solr/licenses/byte-buddy-1.18.3.jar.sha1
delete mode 100644 solr/licenses/byte-buddy-agent-1.17.7.jar.sha1
create mode 100644 solr/licenses/byte-buddy-agent-1.18.3.jar.sha1
delete mode 100644 solr/licenses/docker-java-api-3.4.0.jar.sha1
create mode 100644 solr/licenses/docker-java-api-3.7.0.jar.sha1
delete mode 100644 solr/licenses/docker-java-transport-3.4.0.jar.sha1
create mode 100644 solr/licenses/docker-java-transport-3.7.0.jar.sha1
delete mode 100644 solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1
create mode 100644 solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1
delete mode 100644 solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1
create mode 100644 solr/licenses/jakarta.servlet-api-6.1.0.jar.sha1
delete mode 100644 solr/licenses/jna-5.13.0.jar.sha1
create mode 100644 solr/licenses/jna-5.18.1.jar.sha1
delete mode 100644 solr/licenses/testcontainers-1.20.4.jar.sha1
create mode 100644 solr/licenses/testcontainers-2.0.3.jar.sha1
(solr) 07/07: Update actions/upload-artifact action to v6 (#3959)
Posted by ja...@apache.org.
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 6eb71c3ecb998130fa52e527c694499a734a5552
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:03:39 2026 +0100
Update actions/upload-artifact action to v6 (#3959)
(cherry picked from commit ff0bd2c805d7b2868fd10cd908e942d1b69f83d6)
---
.github/workflows/bin-solr-test.yml | 2 +-
.../unreleased/PR#3959-update-actions-upload-artifact-action.yml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/bin-solr-test.yml b/.github/workflows/bin-solr-test.yml
index 8bb4e6fea47..54bf41cd2bf 100644
--- a/.github/workflows/bin-solr-test.yml
+++ b/.github/workflows/bin-solr-test.yml
@@ -31,7 +31,7 @@ jobs:
- name: Archive logs
if: ${{ failure() }}
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v6
with:
name: logs
path: solr/packaging/build/test-output
diff --git a/changelog/unreleased/PR#3959-update-actions-upload-artifact-action.yml b/changelog/unreleased/PR#3959-update-actions-upload-artifact-action.yml
new file mode 100644
index 00000000000..13f584f10ca
--- /dev/null
+++ b/changelog/unreleased/PR#3959-update-actions-upload-artifact-action.yml
@@ -0,0 +1,7 @@
+title: Update actions/upload-artifact action to v6
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3959
+ url: https://github.com/apache/solr/pull/3959
(solr) 03/07: Update bytebuddy to v1.18.3 (#3764)
Posted by ja...@apache.org.
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 9e14feda765eeb92228de9e8cfeeb24766608107
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:23:49 2026 +0100
Update bytebuddy to v1.18.3 (#3764)
(cherry picked from commit 9a8e04c34acc35b93b82b28239ddf56cd073c0a6)
---
changelog/unreleased/PR#3764-update-bytebuddy.yml | 7 +++++++
gradle/libs.versions.toml | 2 +-
solr/core/gradle.lockfile | 2 +-
solr/cross-dc-manager/gradle.lockfile | 4 ++--
solr/licenses/byte-buddy-1.17.7.jar.sha1 | 1 -
solr/licenses/byte-buddy-1.18.3.jar.sha1 | 1 +
solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 | 1 -
solr/licenses/byte-buddy-agent-1.18.3.jar.sha1 | 1 +
solr/modules/analysis-extras/gradle.lockfile | 2 +-
solr/modules/cross-dc/gradle.lockfile | 4 ++--
solr/modules/jwt-auth/gradle.lockfile | 2 +-
solr/modules/ltr/gradle.lockfile | 2 +-
solr/modules/s3-repository/gradle.lockfile | 2 +-
solr/solrj/gradle.lockfile | 2 +-
14 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/changelog/unreleased/PR#3764-update-bytebuddy.yml b/changelog/unreleased/PR#3764-update-bytebuddy.yml
new file mode 100644
index 00000000000..c9486412d56
--- /dev/null
+++ b/changelog/unreleased/PR#3764-update-bytebuddy.yml
@@ -0,0 +1,7 @@
+title: Update bytebuddy to v1.18.3
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3764
+ url: https://github.com/apache/solr/pull/3764
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1dd4f99b635..4b6e3d7e00f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,7 +61,7 @@ benmanes-versions = "0.51.0"
bouncycastle = "1.81"
# @keep Browserify version used in ref-guide
browserify = "17.0.0"
-bytebuddy = "1.17.7"
+bytebuddy = "1.18.3"
carrot2-core = "4.8.1"
carrotsearch-hppc = "0.10.0"
carrotsearch-randomizedtesting = "2.8.3"
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index f922247a5a7..cdaddfa4a3c 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -84,7 +84,7 @@ jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,compileClasspath,jarValidation,p
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile
index 2c6523ed2da..0525d371c69 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -93,8 +93,8 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.7=jarValidation,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.18.3=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testRuntimeClasspath
net.sf.jopt-simple:jopt-simple:5.0.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
net.sourceforge.argparse4j:argparse4j:0.7.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/licenses/byte-buddy-1.17.7.jar.sha1 b/solr/licenses/byte-buddy-1.17.7.jar.sha1
deleted file mode 100644
index 1104b3c9420..00000000000
--- a/solr/licenses/byte-buddy-1.17.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3856bfab61beb23e099a0d6629f2ba8de4b98ace
diff --git a/solr/licenses/byte-buddy-1.18.3.jar.sha1 b/solr/licenses/byte-buddy-1.18.3.jar.sha1
new file mode 100644
index 00000000000..83d98270888
--- /dev/null
+++ b/solr/licenses/byte-buddy-1.18.3.jar.sha1
@@ -0,0 +1 @@
+c35b2e4bf0e22e4d492936d46506bb2e6d8fafc8
diff --git a/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 b/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1
deleted file mode 100644
index 1074f60f1bf..00000000000
--- a/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fbf3d6d649ed37fc9e9c59480a05be0a26e3c2da
diff --git a/solr/licenses/byte-buddy-agent-1.18.3.jar.sha1 b/solr/licenses/byte-buddy-agent-1.18.3.jar.sha1
new file mode 100644
index 00000000000..8a3ccd5660d
--- /dev/null
+++ b/solr/licenses/byte-buddy-agent-1.18.3.jar.sha1
@@ -0,0 +1 @@
+5768bb83a282ecd982b2ac09e5230f3dbcf836c5
diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile
index 6252d3d2944..dbe29ed75be 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -77,7 +77,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeC
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile
index dd1727719bf..1e5e47bfdce 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -76,8 +76,8 @@ jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeC
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.7=jarValidation,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.18.3=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile
index 450a1328f94..3e42f2adf0f 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -89,7 +89,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
net.minidev:accessors-smart:2.4.9=jarValidation,testCompileClasspath,testRuntimeClasspath
net.minidev:json-smart:2.4.10=jarValidation,testCompileClasspath,testRuntimeClasspath
no.nav.security:mock-oauth2-server:0.5.10=jarValidation,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index b3d58223e98..27d3b90b3e6 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -75,7 +75,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile
index bc2adb983d1..27fa7ef3dc5 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -101,7 +101,7 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testCompileClasspath,t
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
joda-time:joda-time:2.14.0=jarValidation,testCompileClasspath,testRuntimeClasspath
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index a54d5daa6f4..2af80f358a8 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -91,7 +91,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspa
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=jarValidation,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspath
(solr) 06/07: Update dependency com.github.ben-manes.versions to v0.53.0 (#3085)
Posted by ja...@apache.org.
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 69f1761a8beb85be2eec65046de2856845d9e79f
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:05:51 2026 +0100
Update dependency com.github.ben-manes.versions to v0.53.0 (#3085)
(cherry picked from commit bf3b8b605a77faa49c5601adbeac2dfffb3c46a3)
---
.../unreleased/PR#3085-update-com-github-ben-manes-versions.yml | 7 +++++++
gradle/libs.versions.toml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog/unreleased/PR#3085-update-com-github-ben-manes-versions.yml b/changelog/unreleased/PR#3085-update-com-github-ben-manes-versions.yml
new file mode 100644
index 00000000000..8df4efcfbd9
--- /dev/null
+++ b/changelog/unreleased/PR#3085-update-com-github-ben-manes-versions.yml
@@ -0,0 +1,7 @@
+title: Update com.github.ben-manes.versions to v0.53.0
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3085
+ url: https://github.com/apache/solr/pull/3085
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7caaaa6a301..c9616523957 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -57,7 +57,7 @@ bats-core = "1.8.2"
bats-file = "0.3.0"
bc-jose4j = "0.9.6"
benmanes-caffeine = "3.2.2"
-benmanes-versions = "0.51.0"
+benmanes-versions = "0.53.0"
bouncycastle = "1.81"
# @keep Browserify version used in ref-guide
browserify = "17.0.0"
(solr) 04/07: Update dependency org.testcontainers:testcontainers to v2 (#3795)
Posted by ja...@apache.org.
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 adc48bd75e6299798310eb730e6870f66673eebe
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:20:38 2026 +0100
Update dependency org.testcontainers:testcontainers to v2 (#3795)
(cherry picked from commit 25ce417dfca6fa1c2682500a77a8f9763d4eb9ff)
---
.../PR#3795-update-org-testcontainers-testcontainers.yml | 7 +++++++
gradle/libs.versions.toml | 2 +-
solr/licenses/docker-java-api-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-api-3.7.0.jar.sha1 | 1 +
solr/licenses/docker-java-transport-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-transport-3.7.0.jar.sha1 | 1 +
solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 | 1 -
solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 | 1 +
solr/licenses/testcontainers-1.20.4.jar.sha1 | 1 -
solr/licenses/testcontainers-2.0.3.jar.sha1 | 1 +
solr/modules/extraction/gradle.lockfile | 8 ++++----
11 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml b/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml
new file mode 100644
index 00000000000..1ecfa0673b4
--- /dev/null
+++ b/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml
@@ -0,0 +1,7 @@
+title: Update org.testcontainers:testcontainers to v2
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3795
+ url: https://github.com/apache/solr/pull/3795
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4b6e3d7e00f..62fd6b86b32 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -200,7 +200,7 @@ squareup-okhttp3-okhttp = "4.12.0"
stephenc-jcip = "1.0-1"
swagger3 = "2.2.22"
tdunning-tdigest = "3.3"
-testcontainers = "1.20.4"
+testcontainers = "2.0.3"
thetaphi-forbiddenapis = "3.10"
thisptr-jacksonjq = "0.0.13"
threeten-bp = "1.6.8"
diff --git a/solr/licenses/docker-java-api-3.4.0.jar.sha1 b/solr/licenses/docker-java-api-3.4.0.jar.sha1
deleted file mode 100644
index bf5ca0d6db4..00000000000
--- a/solr/licenses/docker-java-api-3.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ef23dcc93693f15e69b64632be096c38e31bc44
diff --git a/solr/licenses/docker-java-api-3.7.0.jar.sha1 b/solr/licenses/docker-java-api-3.7.0.jar.sha1
new file mode 100644
index 00000000000..2a6ac52fd36
--- /dev/null
+++ b/solr/licenses/docker-java-api-3.7.0.jar.sha1
@@ -0,0 +1 @@
+47d3e92a30fc1832197602cb1214b866024372cb
diff --git a/solr/licenses/docker-java-transport-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-3.4.0.jar.sha1
deleted file mode 100644
index c1232d24a6b..00000000000
--- a/solr/licenses/docker-java-transport-3.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c058705684d782effc4b2edfdef1a87544ba4af8
diff --git a/solr/licenses/docker-java-transport-3.7.0.jar.sha1 b/solr/licenses/docker-java-transport-3.7.0.jar.sha1
new file mode 100644
index 00000000000..afe4f1c07cd
--- /dev/null
+++ b/solr/licenses/docker-java-transport-3.7.0.jar.sha1
@@ -0,0 +1 @@
+e68716970e65eb45c01c0207d15ff03bb32edf49
diff --git a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1
deleted file mode 100644
index b658f8f0810..00000000000
--- a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c4ce6d8695cfdb0027872f99cc20f8f679f8a969
diff --git a/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1
new file mode 100644
index 00000000000..58dd424a477
--- /dev/null
+++ b/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1
@@ -0,0 +1 @@
+55185d3af96befa953dcb0b89de3751f95999511
diff --git a/solr/licenses/testcontainers-1.20.4.jar.sha1 b/solr/licenses/testcontainers-1.20.4.jar.sha1
deleted file mode 100644
index 29746a98e88..00000000000
--- a/solr/licenses/testcontainers-1.20.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee2fe3afc9fa6cb2e6a43233998f3633f761692f
diff --git a/solr/licenses/testcontainers-2.0.3.jar.sha1 b/solr/licenses/testcontainers-2.0.3.jar.sha1
new file mode 100644
index 00000000000..a72d50fe5f7
--- /dev/null
+++ b/solr/licenses/testcontainers-2.0.3.jar.sha1
@@ -0,0 +1 @@
+457576cfd348a4c564569a7e9fc7a3b53f476454
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index 420e9377973..357c2a87642 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -12,9 +12,9 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.1=j
com.fasterxml.jackson:jackson-bom:2.20.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath
-com.github.docker-java:docker-java-api:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.github.docker-java:docker-java-transport-zerodep:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.github.docker-java:docker-java-transport:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.github.docker-java:docker-java-api:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.github.docker-java:docker-java-transport-zerodep:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.github.docker-java:docker-java-transport:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
@@ -171,6 +171,6 @@ org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatf
org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,permitUsedUndeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.20.4=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:2.0.3=jarValidation,testCompileClasspath,testRuntimeClasspath
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,signatures
(solr) 01/07: Update dependency jakarta.servlet:jakarta.servlet-api to v6.1.0 (#3366)
Posted by ja...@apache.org.
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 <12...@users.noreply.github.com>
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
(solr) 05/07: Update dependency net.java.dev.jna:jna to v5.18.1 (#3781)
Posted by ja...@apache.org.
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 5bd9ed86fda639b3ecba1ee5b03871107ada8373
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:06:20 2026 +0100
Update dependency net.java.dev.jna:jna to v5.18.1 (#3781)
(cherry picked from commit fc452d8ca7f4d3be5e3ef000618584e83abe5d83)
---
changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml | 7 +++++++
gradle/libs.versions.toml | 2 +-
solr/licenses/jna-5.13.0.jar.sha1 | 1 -
solr/licenses/jna-5.18.1.jar.sha1 | 1 +
solr/modules/extraction/gradle.lockfile | 2 +-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml b/changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml
new file mode 100644
index 00000000000..f06c266601b
--- /dev/null
+++ b/changelog/unreleased/PR#3781-update-net-java-dev-jna-jna.yml
@@ -0,0 +1,7 @@
+title: Update net.java.dev.jna:jna to v5.18.1
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3781
+ url: https://github.com/apache/solr/pull/3781
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 62fd6b86b32..7caaaa6a301 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -141,7 +141,7 @@ jersey-containers = "2.39.1"
# @keep for version alignment
jetbrains-annotations = "26.0.2"
# @keep for version alignment
-jna = "5.13.0"
+jna = "5.18.1"
# @keep for version alignment
joda-time = "2.14.0"
junit = "4.13.2"
diff --git a/solr/licenses/jna-5.13.0.jar.sha1 b/solr/licenses/jna-5.13.0.jar.sha1
deleted file mode 100644
index 93b456b9293..00000000000
--- a/solr/licenses/jna-5.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1200e7ebeedbe0d10062093f32925a912020e747
diff --git a/solr/licenses/jna-5.18.1.jar.sha1 b/solr/licenses/jna-5.18.1.jar.sha1
new file mode 100644
index 00000000000..5ca25b9cb94
--- /dev/null
+++ b/solr/licenses/jna-5.18.1.jar.sha1
@@ -0,0 +1 @@
+b27ba04287cc4abe769642fe8318d39fc89bf937
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index 357c2a87642..6d2d54df0c6 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -78,7 +78,7 @@ jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.java.dev.jna:jna:5.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-compress:1.28.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-exec:1.5.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
(solr) 02/07: Update dependency org.openapi.generator to v7.18.0 (#3601)
Posted by ja...@apache.org.
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 5796409f8d9826b78caf4afbc5009ac6851087a9
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Sat Jan 3 00:26:14 2026 +0100
Update dependency org.openapi.generator to v7.18.0 (#3601)
(cherry picked from commit f474f73a37d312a445e1c4ce573091e821bec8b9)
---
changelog/unreleased/PR#3601-update-org-openapi-generator.yml | 7 +++++++
gradle/libs.versions.toml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog/unreleased/PR#3601-update-org-openapi-generator.yml b/changelog/unreleased/PR#3601-update-org-openapi-generator.yml
new file mode 100644
index 00000000000..83d8401b1a8
--- /dev/null
+++ b/changelog/unreleased/PR#3601-update-org-openapi-generator.yml
@@ -0,0 +1,7 @@
+title: Update org.openapi.generator to v7.18.0
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3601
+ url: https://github.com/apache/solr/pull/3601
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index db91a59f1cf..1dd4f99b635 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -177,7 +177,7 @@ nodegradle-node = "7.1.0"
# @keep Node JS version used in node.gradle (LTS)
nodejs = "22.18.0"
onnx = "1.23.0"
-openapi = "7.14.0"
+openapi = "7.18.0"
openjdk-jmh = "1.37"
opentelemetry = "1.56.0"
opentelemetry-prometheus = "1.56.0-alpha"