From 34793e81261ce1504012a2826d623afa36b3b74f Mon Sep 17 00:00:00 2001 From: SolrBot Date: Tue, 28 Apr 2026 11:50:59 +0000 Subject: [PATCH 1/2] Update hk2 to v4 --- gradle/libs.versions.toml | 2 +- solr/api/gradle.lockfile | 8 ++++---- solr/benchmark/gradle.lockfile | 8 ++++---- solr/core/gradle.lockfile | 11 ++++------- solr/cross-dc-manager/gradle.lockfile | 8 ++++---- solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 | 1 - .../licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1 | 1 - solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-api-3.1.1.jar.sha1 | 1 - solr/licenses/hk2-api-4.0.0-M3.jar.sha1 | 1 - solr/licenses/hk2-api-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-locator-4.0.0-M3.jar.sha1 | 1 - solr/licenses/hk2-locator-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-utils-3.1.1.jar.sha1 | 1 - solr/licenses/hk2-utils-4.0.0-M3.jar.sha1 | 1 - solr/licenses/hk2-utils-4.0.0.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 8 ++++---- solr/modules/clustering/gradle.lockfile | 8 ++++---- solr/modules/cross-dc/gradle.lockfile | 8 ++++---- solr/modules/cuvs/gradle.lockfile | 8 ++++---- solr/modules/extraction/gradle.lockfile | 8 ++++---- solr/modules/gcs-repository/gradle.lockfile | 8 ++++---- solr/modules/jwt-auth/gradle.lockfile | 8 ++++---- solr/modules/langid/gradle.lockfile | 8 ++++---- solr/modules/language-models/gradle.lockfile | 8 ++++---- solr/modules/ltr/gradle.lockfile | 8 ++++---- solr/modules/opentelemetry/gradle.lockfile | 8 ++++---- solr/modules/s3-repository/gradle.lockfile | 8 ++++---- solr/modules/scripting/gradle.lockfile | 8 ++++---- solr/modules/sql/gradle.lockfile | 8 ++++---- solr/server/gradle.lockfile | 8 ++++---- solr/solr-ref-guide/gradle.lockfile | 8 ++++---- solr/solrj-jetty/gradle.lockfile | 8 ++++---- solr/solrj-streaming/gradle.lockfile | 8 ++++---- solr/solrj-zookeeper/gradle.lockfile | 8 ++++---- solr/solrj/gradle.lockfile | 8 ++++---- solr/test-framework/gradle.lockfile | 8 ++++---- solr/webapp/gradle.lockfile | 8 ++++---- 38 files changed, 109 insertions(+), 115 deletions(-) delete mode 100644 solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 delete mode 100644 solr/licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1 create mode 100644 solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-api-3.1.1.jar.sha1 delete mode 100644 solr/licenses/hk2-api-4.0.0-M3.jar.sha1 create mode 100644 solr/licenses/hk2-api-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-locator-4.0.0-M3.jar.sha1 create mode 100644 solr/licenses/hk2-locator-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-utils-3.1.1.jar.sha1 delete mode 100644 solr/licenses/hk2-utils-4.0.0-M3.jar.sha1 create mode 100644 solr/licenses/hk2-utils-4.0.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e6c402e8d9b9..ac0de7ee62f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -115,7 +115,7 @@ grpc = "1.65.1" # @keep Gulp version used in ref-guide gulp-cli = "3.1.0" hamcrest = "3.0" -hk2 = "3.1.1" +hk2 = "4.0.0" hsqldb = "2.7.4" ibm-icu = "77.1" immutables-valueannotations = "2.12.1" diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 874ea4343754..0358fcd9dc1d 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -146,10 +146,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 975a714e17bf..c297c9008094 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -136,10 +136,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,testRunt org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index b3efa59c203d..0d4dcb228e5f 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -153,13 +153,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=runtimeLibs -org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=runtimeLibs -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=runtimeLibs +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index a700b6be8058..5d442006d1d1 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -205,10 +205,10 @@ org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,jarValidation,runtimeCla org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:12.0.34=solrPlatformLibs -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 b/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 deleted file mode 100644 index 9c73a4a5a50e..000000000000 --- a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -271bbab4cb1e3e5c556acf2580f75cb184818c1f diff --git a/solr/licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1 b/solr/licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1 deleted file mode 100644 index b26316790a13..000000000000 --- a/solr/licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -71779579326f1648524a86fdee77bdf1d2d45336 diff --git a/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 b/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 new file mode 100644 index 000000000000..74dc5a847595 --- /dev/null +++ b/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 @@ -0,0 +1 @@ +dd41cb8276601df780f0621702b2d70f3f5ca64a diff --git a/solr/licenses/hk2-api-3.1.1.jar.sha1 b/solr/licenses/hk2-api-3.1.1.jar.sha1 deleted file mode 100644 index 88c7e86b9768..000000000000 --- a/solr/licenses/hk2-api-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -18d114e0da203809052f5f000803f2db6c9e9cf5 diff --git a/solr/licenses/hk2-api-4.0.0-M3.jar.sha1 b/solr/licenses/hk2-api-4.0.0-M3.jar.sha1 deleted file mode 100644 index 09a9b097e3ad..000000000000 --- a/solr/licenses/hk2-api-4.0.0-M3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b9520d9c4ecdc8b688a50968c19b54b55fc1274 diff --git a/solr/licenses/hk2-api-4.0.0.jar.sha1 b/solr/licenses/hk2-api-4.0.0.jar.sha1 new file mode 100644 index 000000000000..a1ef9b37a4e5 --- /dev/null +++ b/solr/licenses/hk2-api-4.0.0.jar.sha1 @@ -0,0 +1 @@ +9fe4c23a496155801fb3120653a1539723ea53d6 diff --git a/solr/licenses/hk2-locator-4.0.0-M3.jar.sha1 b/solr/licenses/hk2-locator-4.0.0-M3.jar.sha1 deleted file mode 100644 index 7a0d7c496a24..000000000000 --- a/solr/licenses/hk2-locator-4.0.0-M3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -64a198be0ce5a86c6e6e439188fc4e7187416588 diff --git a/solr/licenses/hk2-locator-4.0.0.jar.sha1 b/solr/licenses/hk2-locator-4.0.0.jar.sha1 new file mode 100644 index 000000000000..7e143b08a288 --- /dev/null +++ b/solr/licenses/hk2-locator-4.0.0.jar.sha1 @@ -0,0 +1 @@ +cdb680d52ab329206c72e1e55687a8500c1b6921 diff --git a/solr/licenses/hk2-utils-3.1.1.jar.sha1 b/solr/licenses/hk2-utils-3.1.1.jar.sha1 deleted file mode 100644 index 2f421cd17b8e..000000000000 --- a/solr/licenses/hk2-utils-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7f6959b2a724d479d8b1420c4aa03751eb4447f diff --git a/solr/licenses/hk2-utils-4.0.0-M3.jar.sha1 b/solr/licenses/hk2-utils-4.0.0-M3.jar.sha1 deleted file mode 100644 index bdce9d40e148..000000000000 --- a/solr/licenses/hk2-utils-4.0.0-M3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d0017a4fffdb8184582d579c15e4d90765e4d11b diff --git a/solr/licenses/hk2-utils-4.0.0.jar.sha1 b/solr/licenses/hk2-utils-4.0.0.jar.sha1 new file mode 100644 index 000000000000..f8dcc1ed1293 --- /dev/null +++ b/solr/licenses/hk2-utils-4.0.0.jar.sha1 @@ -0,0 +1 @@ +5b7182df0884117826f0ff10a35b3b9a4ea22abc diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index ea2b716d3cab..ab3cd4dd632e 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -151,10 +151,10 @@ org.eclipse.jetty:jetty-security:12.0.34=apiHelper,jarValidation,runtimeClasspat org.eclipse.jetty:jetty-server:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 285e6bf46c9d..0594ab724cef 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -139,10 +139,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 2ba24ada0d9c..95bb97a89ad5 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -143,10 +143,10 @@ org.eclipse.jetty:jetty-security:12.0.34=apiHelper,jarValidation,runtimeClasspat org.eclipse.jetty:jetty-server:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index 282575ad5667..8e1ef31e0c38 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -140,10 +140,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 97d72a04dac9..7c7c734b7d27 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -144,10 +144,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index fcdce63db232..9e1f012944e5 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -190,10 +190,10 @@ org.eclipse.jetty:jetty-security:12.0.34=apiHelper,jarValidation,runtimeClasspat org.eclipse.jetty:jetty-server:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index de3055b0b4b2..3f4482662049 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -164,10 +164,10 @@ org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLib org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.freemarker:freemarker:2.3.32=jarValidation,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index a3a8216ae710..2dcabcddea58 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -140,10 +140,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index d2cdfd08dd84..5079a67db5b0 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -153,10 +153,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index a6d75e790465..395dfe5bf526 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -139,10 +139,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index dab8526fa6fa..bcd05af7a14e 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -170,10 +170,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 42c7fd4b4bfb..6f911461aaae 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -181,10 +181,10 @@ org.eclipse.jetty:jetty-server:12.0.34=apiHelper,jarValidation,runtimeClasspath, org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 094e8d94e4e6..0b390260b3d7 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -138,10 +138,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 8a8b6c829558..d1286739988e 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -162,10 +162,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 7c9d3a8102f7..0ac598da4677 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -134,10 +134,10 @@ org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,serverLib org.eclipse.jetty:jetty-start:12.0.34=jarValidation,startJar org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,runtimeClasspath,serverLib -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,solrCore -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,solrCore -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,solrCore -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,solrCore +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,solrCore +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,solrCore +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,solrCore +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,solrCore org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,solrCore org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,solrCore org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index b054cf151d7d..b60a33f96164 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -147,10 +147,10 @@ org.eclipse.jetty:jetty-security:12.0.34=testRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.34=testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=testRuntimeClasspath diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile index 8f531bef3f88..65d1fd31c5ef 100644 --- a/solr/solrj-jetty/gradle.lockfile +++ b/solr/solrj-jetty/gradle.lockfile @@ -136,10 +136,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testCompileClasspath,test org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 6a6c1f2a4ceb..670b13d9803c 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -147,10 +147,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index c74b90d857f9..2d9565419055 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -153,10 +153,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 180be6254699..19e757bf0f53 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -147,10 +147,10 @@ org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRu org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 2d644e4d0289..09f9d7def6b4 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -136,10 +136,10 @@ org.eclipse.jetty:jetty-security:12.0.34=apiHelper,compileClasspath,jarValidatio org.eclipse.jetty:jetty-server:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 0d546bce8746..90e303bde1f4 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -133,10 +133,10 @@ org.eclipse.jetty:jetty-server:12.0.34=serverLib,solrCore org.eclipse.jetty:jetty-session:12.0.34=serverLib org.eclipse.jetty:jetty-util:12.0.34=serverLib,solrCore org.eclipse.jetty:jetty-xml:12.0.34=serverLib -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=solrCore -org.glassfish.hk2:hk2-api:4.0.0-M3=solrCore -org.glassfish.hk2:hk2-locator:4.0.0-M3=solrCore -org.glassfish.hk2:hk2-utils:4.0.0-M3=solrCore +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=solrCore +org.glassfish.hk2:hk2-api:4.0.0=solrCore +org.glassfish.hk2:hk2-locator:4.0.0=solrCore +org.glassfish.hk2:hk2-utils:4.0.0=solrCore org.glassfish.hk2:osgi-resource-locator:3.0.0=solrCore org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=solrCore org.glassfish.jersey.core:jersey-client:4.0.2=solrCore From 155f0293a2ec02812ba2a7e20a0ff4e1d27a0b39 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Tue, 28 Apr 2026 11:51:19 +0000 Subject: [PATCH 2/2] Update changelog entry --- changelog/unreleased/PR#4365-update-hk2.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4365-update-hk2.yml diff --git a/changelog/unreleased/PR#4365-update-hk2.yml b/changelog/unreleased/PR#4365-update-hk2.yml new file mode 100644 index 000000000000..0688751b0650 --- /dev/null +++ b/changelog/unreleased/PR#4365-update-hk2.yml @@ -0,0 +1,7 @@ +title: Update hk2 to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4365 + url: https://github.com/apache/solr/pull/4365