Skip to content

Commit d8b894d

Browse files
solrbotsolrbot
committed
Update jersey to v4
1 parent 03826d9 commit d8b894d

File tree

52 files changed

+422
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+422
-367
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ javacc = "7.0.13"
135135
jaxb = "2.3.9"
136136
jayway-jsonpath = "2.9.0"
137137
jctools = "4.0.5"
138-
jersey = "3.1.11"
138+
jersey = "4.0.0"
139139
# TODO Sync with jersey versions
140140
jersey-containers = "2.39.1"
141141
# @keep for version alignment

‎solr/api/gradle.lockfile‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,16 @@ io.swagger.core.v3:swagger-core-jakarta:2.2.22=swaggerBuild
7777
io.swagger.core.v3:swagger-integration-jakarta:2.2.22=swaggerBuild
7878
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22=swaggerBuild
7979
io.swagger.core.v3:swagger-models-jakarta:2.2.22=swaggerBuild
80-
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
80+
jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,testRuntimeClasspath
81+
jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspath
8182
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
8283
jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
83-
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,swaggerBuild,testRuntimeClasspath
84-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
84+
jakarta.validation:jakarta.validation-api:3.0.2=swaggerBuild
85+
jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath
86+
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,runtimeClasspath,swaggerBuild,testCompileClasspath
87+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,testRuntimeClasspath
8588
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild
89+
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath
8690
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
8791
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
8892
org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
@@ -142,18 +146,18 @@ org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,test
142146
org.eclipse.jetty:jetty-server:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
143147
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
144148
org.eclipse.jetty:jetty-util:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
145-
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
146-
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
147-
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
148-
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,testRuntimeClasspath
149-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,testRuntimeClasspath
149+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath
150+
org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath
151+
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath
152+
org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath
153+
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath
150154
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,testRuntimeClasspath
151-
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,testRuntimeClasspath
152-
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,testRuntimeClasspath
153-
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,testRuntimeClasspath
154-
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,testRuntimeClasspath
155-
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,testRuntimeClasspath
156-
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,testRuntimeClasspath
155+
org.glassfish.jersey.core:jersey-client:4.0.0=jarValidation,testRuntimeClasspath
156+
org.glassfish.jersey.core:jersey-common:4.0.0=jarValidation,testRuntimeClasspath
157+
org.glassfish.jersey.core:jersey-server:4.0.0=jarValidation,testRuntimeClasspath
158+
org.glassfish.jersey.ext:jersey-entity-filtering:4.0.0=jarValidation,testRuntimeClasspath
159+
org.glassfish.jersey.inject:jersey-hk2:4.0.0=jarValidation,testRuntimeClasspath
160+
org.glassfish.jersey.media:jersey-media-json-jackson:4.0.0=jarValidation,testRuntimeClasspath
157161
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
158162
org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,testRuntimeClasspath
159163
org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeC
6868
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
6969
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
7070
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
71-
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
71+
jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,runtimeClasspath,testRuntimeClasspath
72+
jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
7273
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
7374
jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
74-
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
75-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
75+
jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
76+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
77+
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
7678
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
7779
junit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7880
net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -133,18 +135,18 @@ org.eclipse.jetty:jetty-security:12.0.27=compileClasspath,jarValidation,runtimeC
133135
org.eclipse.jetty:jetty-server:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
134136
org.eclipse.jetty:jetty-session:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
135137
org.eclipse.jetty:jetty-util:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
136-
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
137-
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
138-
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
139-
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
140-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,testRuntimeClasspath
138+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
139+
org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
140+
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
141+
org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
142+
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
141143
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,testRuntimeClasspath
142-
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
143-
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
144-
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
145-
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
146-
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
147-
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
144+
org.glassfish.jersey.core:jersey-client:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
145+
org.glassfish.jersey.core:jersey-common:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
146+
org.glassfish.jersey.core:jersey-server:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
147+
org.glassfish.jersey.ext:jersey-entity-filtering:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
148+
org.glassfish.jersey.inject:jersey-hk2:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
149+
org.glassfish.jersey.media:jersey-media-json-jackson:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
148150
org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
149151
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath
150152
org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=compileClasspath,jarVa
7575
io.prometheus:prometheus-metrics-model:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7676
io.sgr:s2-geometry-library-java:1.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7777
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
78-
jakarta.activation:jakarta.activation-api:2.1.3=permitUnusedDeclared
79-
jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
78+
jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
79+
jakarta.annotation:jakarta.annotation-api:3.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
8080
jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
8181
jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
82-
jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
83-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
84-
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared
82+
jakarta.validation:jakarta.validation-api:3.1.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
83+
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper
84+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
85+
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
8586
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
8687
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
8788
net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -153,19 +154,19 @@ org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,test
153154
org.eclipse.jetty:jetty-server:12.0.27=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
154155
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
155156
org.eclipse.jetty:jetty-util:12.0.27=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
156-
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
157+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
157158
org.glassfish.hk2.external:jakarta.inject:2.6.1=permitUnusedDeclared
158-
org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
159-
org.glassfish.hk2:hk2-locator:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
160-
org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
161-
org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
159+
org.glassfish.hk2:hk2-api:4.0.0-M3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
160+
org.glassfish.hk2:hk2-locator:4.0.0-M3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
161+
org.glassfish.hk2:hk2-utils:4.0.0-M3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
162+
org.glassfish.hk2:osgi-resource-locator:3.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
162163
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
163-
org.glassfish.jersey.core:jersey-client:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164-
org.glassfish.jersey.core:jersey-common:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
165-
org.glassfish.jersey.core:jersey-server:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
166-
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
167-
org.glassfish.jersey.inject:jersey-hk2:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
168-
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164+
org.glassfish.jersey.core:jersey-client:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
165+
org.glassfish.jersey.core:jersey-common:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
166+
org.glassfish.jersey.core:jersey-server:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
167+
org.glassfish.jersey.ext:jersey-entity-filtering:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
168+
org.glassfish.jersey.inject:jersey-hk2:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
169+
org.glassfish.jersey.media:jersey-media-json-jackson:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
169170
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
170171
org.javassist:javassist:3.30.2-GA=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
171172
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)