Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions changelog/unreleased/SOLR-18082-introduce-jersey-bom.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
title: Introduce jersey BOM and align jersey dependencies to 3.1.11
type: dependency_update
authors:
- name: Christos Malliaridis
links:
- name: PR#4244
url: https://github.com/apache/solr/pull/4244
- name: SOLR-18082
url: https://issues.apache.org/jira/browse/SOLR-18082
13 changes: 6 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ jaxb = "2.3.9"
jayway-jsonpath = "2.9.0"
jctools = "4.0.5"
jersey = "3.1.11"
# TODO Sync with jersey versions
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

love the removal of a TODO!

jersey-containers = "2.39.1"
# @keep for version alignment
jetbrains-annotations = "26.0.2"
# @keep for version alignment
Expand Down Expand Up @@ -416,11 +414,12 @@ javacc-javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc"
jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version.ref = "jaxb" }
jayway-jsonpath = { module = "com.jayway.jsonpath:json-path", version.ref = "jayway-jsonpath" }
jctools-core = { module = "org.jctools:jctools-core", version.ref = "jctools" }
jersey-containers-jettyhttp = { module = "org.glassfish.jersey.containers:jersey-container-jetty-http", version.ref = "jersey-containers" }
jersey-core-common = { module = "org.glassfish.jersey.core:jersey-common", version.ref = "jersey" }
jersey-core-server = { module = "org.glassfish.jersey.core:jersey-server", version.ref = "jersey" }
jersey-inject-hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = "jersey" }
jersey-media-jsonjackson = { module = "org.glassfish.jersey.media:jersey-media-json-jackson", version.ref = "jersey" }
jersey-bom = { module = "org.glassfish.jersey:jersey-bom", version.ref = "jersey" }
jersey-containers-jettyhttp = { module = "org.glassfish.jersey.containers:jersey-container-jetty-http" }
jersey-core-common = { module = "org.glassfish.jersey.core:jersey-common" }
jersey-core-server = { module = "org.glassfish.jersey.core:jersey-server" }
jersey-inject-hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2" }
jersey-media-jsonjackson = { module = "org.glassfish.jersey.media:jersey-media-json-jackson" }
# @keep transitive dependency for version alignment
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
# @keep transitive dependency for version alignment
Expand Down
3 changes: 2 additions & 1 deletion solr/api/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,14 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=jarValidation,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
Expand Down
3 changes: 2 additions & 1 deletion solr/benchmark/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,14 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClassp
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath
org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
1 change: 1 addition & 0 deletions solr/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dependencies {

implementation libs.dropwizard.metrics.core

implementation platform(libs.jersey.bom)
runtimeOnly(libs.jersey.containers.jettyhttp, {
exclude group: "org.eclipse.jetty", module: "jetty-continuation"
exclude group: "org.glassfish.hk2.external", module: "jakarta.inject"
Expand Down
5 changes: 3 additions & 2 deletions solr/core/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ org.eclipse.jetty:jetty-client:12.0.27=apiHelper,compileClasspath,jarValidation,
org.eclipse.jetty:jetty-http:12.0.27=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.27=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.27=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
Expand All @@ -154,13 +154,14 @@ org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,runtimeClasspath,
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
Expand Down
3 changes: 2 additions & 1 deletion solr/cross-dc-manager/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,14 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrP
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/jersey-container-jetty-http-3.1.11.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecc49adcb77cb56fda6a06100368c9eb7abb5e01
5 changes: 3 additions & 2 deletions solr/modules/analysis-extras/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ org.eclipse.jetty:jetty-client:12.0.27=apiHelper,jarValidation,runtimeClasspath,
org.eclipse.jetty:jetty-http:12.0.27=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.27=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.27=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.27=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
Expand All @@ -153,13 +153,14 @@ org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtime
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
Expand Down
5 changes: 3 additions & 2 deletions solr/modules/clustering/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ org.eclipse.jetty:jetty-client:12.0.27=jarValidation,runtimeClasspath,runtimeLib
org.eclipse.jetty:jetty-http:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.27=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
Expand All @@ -141,13 +141,14 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrP
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey:jersey-bom:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
Expand Down
Loading
Loading