Skip to content

Commit 02c5a24

Browse files
committed
Update dependency org.glassfish.jersey.containers:jersey-container-jetty-http to v4
1 parent 03826d9 commit 02c5a24

40 files changed

+233
-226
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jayway-jsonpath = "2.9.0"
137137
jctools = "4.0.5"
138138
jersey = "3.1.11"
139139
# TODO Sync with jersey versions
140-
jersey-containers = "2.39.1"
140+
jersey-containers = "4.0.0"
141141
# @keep for version alignment
142142
jetbrains-annotations = "26.0.2"
143143
# @keep for version alignment

solr/api/gradle.lockfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ 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.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspath
8181
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
8282
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
83+
jakarta.validation:jakarta.validation-api:3.0.2=swaggerBuild
84+
jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath
85+
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,runtimeClasspath,swaggerBuild,testCompileClasspath
86+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,testRuntimeClasspath
8587
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild
8688
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
8789
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -146,11 +148,11 @@ org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntim
146148
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
147149
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
148150
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,testRuntimeClasspath
149-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,testRuntimeClasspath
150-
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
151+
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath
152+
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.0=jarValidation,testRuntimeClasspath
153+
org.glassfish.jersey.core:jersey-client:4.0.0=jarValidation,testRuntimeClasspath
154+
org.glassfish.jersey.core:jersey-common:4.0.0=jarValidation,testRuntimeClasspath
155+
org.glassfish.jersey.core:jersey-server:4.0.0=jarValidation,testRuntimeClasspath
154156
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,testRuntimeClasspath
155157
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,testRuntimeClasspath
156158
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,testRuntimeClasspath

solr/benchmark/gradle.lockfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ 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.annotation:jakarta.annotation-api:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
7272
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
7373
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
74+
jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
75+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
7676
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
7777
junit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7878
net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -137,11 +137,11 @@ org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeCla
137137
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
138138
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
139139
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
140-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,testRuntimeClasspath
141-
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
140+
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
141+
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
142+
org.glassfish.jersey.core:jersey-client:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
143+
org.glassfish.jersey.core:jersey-common:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
144+
org.glassfish.jersey.core:jersey-server:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
145145
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
146146
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
147147
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath

solr/core/gradle.lockfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ io.prometheus:prometheus-metrics-model:1.1.0=compileClasspath,jarValidation,runt
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
7878
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
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
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
8485
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared
8586
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
8687
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -145,24 +146,22 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.27=apiHelper,jarValidation,runtime
145146
org.eclipse.jetty:jetty-alpn-java-server:12.0.27=jarValidation,testRuntimeClasspath
146147
org.eclipse.jetty:jetty-alpn-server:12.0.27=jarValidation,testRuntimeClasspath
147148
org.eclipse.jetty:jetty-client:12.0.27=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
148-
org.eclipse.jetty:jetty-continuation:9.4.49.v20220914=permitUnusedDeclared
149149
org.eclipse.jetty:jetty-http:12.0.27=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
150150
org.eclipse.jetty:jetty-io:12.0.27=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
151151
org.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspath
152-
org.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
152+
org.eclipse.jetty:jetty-security:12.0.27=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
153153
org.eclipse.jetty:jetty-server:12.0.27=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
154154
org.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath
155155
org.eclipse.jetty:jetty-util:12.0.27=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
156156
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
157-
org.glassfish.hk2.external:jakarta.inject:2.6.1=permitUnusedDeclared
158157
org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
159158
org.glassfish.hk2:hk2-locator:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
160159
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
162-
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
160+
org.glassfish.hk2:osgi-resource-locator:3.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
161+
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
162+
org.glassfish.jersey.core:jersey-client:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
163+
org.glassfish.jersey.core:jersey-common:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164+
org.glassfish.jersey.core:jersey-server:4.0.0=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
166165
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
167166
org.glassfish.jersey.inject:jersey-hk2:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
168167
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath

solr/cross-dc-manager/gradle.lockfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeC
8686
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8787
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8888
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
89-
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
89+
jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
9090
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
9191
jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
92-
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
93-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
92+
jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
93+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
9494
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
9595
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
9696
net.bytebuddy:byte-buddy-agent:1.17.7=jarValidation,testRuntimeClasspath
@@ -181,11 +181,11 @@ org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeCla
181181
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
182182
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
183183
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
184-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
185-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
186-
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
187-
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
188-
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
184+
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
185+
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
186+
org.glassfish.jersey.core:jersey-client:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
187+
org.glassfish.jersey.core:jersey-common:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
188+
org.glassfish.jersey.core:jersey-server:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
189189
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
190190
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
191191
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
54f928fadec906a99d558536756d171917b9d936

solr/licenses/jakarta.validation-api-3.0.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
846b536eff8a32c1b91fdeb3c9c5b6c39916767d
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c27a67f84ca491efcb3fa68f4df926e8a110069e

solr/licenses/jersey-client-3.1.11.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)