Skip to content

Commit ad3fa5a

Browse files
solrbotsolrbot
committed
Update dependency org.glassfish.jersey.containers:jersey-container-jetty-http to v3
1 parent 49314f0 commit ad3fa5a

40 files changed

+409
-265
lines changed

‎gradle/libs.versions.toml‎

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

‎solr/api/gradle.lockfile‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,27 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,testRuntimeClassp
149149
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
150150
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
151151
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,testRuntimeClasspath
152-
org.eclipse.jetty:jetty-http:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
153-
org.eclipse.jetty:jetty-io:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
152+
org.eclipse.jetty:jetty-http:12.0.19=testCompileClasspath
153+
org.eclipse.jetty:jetty-http:12.0.22=jarValidation,testRuntimeClasspath
154+
org.eclipse.jetty:jetty-io:12.0.19=testCompileClasspath
155+
org.eclipse.jetty:jetty-io:12.0.22=jarValidation,testRuntimeClasspath
154156
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
155-
org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
156-
org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
157+
org.eclipse.jetty:jetty-security:12.0.19=testCompileClasspath
158+
org.eclipse.jetty:jetty-security:12.0.22=jarValidation,testRuntimeClasspath
159+
org.eclipse.jetty:jetty-server:12.0.19=testCompileClasspath
160+
org.eclipse.jetty:jetty-server:12.0.22=jarValidation,testRuntimeClasspath
157161
org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
158-
org.eclipse.jetty:jetty-util:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
162+
org.eclipse.jetty:jetty-util:12.0.19=testCompileClasspath
163+
org.eclipse.jetty:jetty-util:12.0.22=jarValidation,testRuntimeClasspath
159164
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
160165
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
161166
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
162167
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,testRuntimeClasspath
163168
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,testRuntimeClasspath
164-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,testRuntimeClasspath
165-
org.glassfish.jersey.core:jersey-client:3.1.9=jarValidation,testRuntimeClasspath
166-
org.glassfish.jersey.core:jersey-common:3.1.9=jarValidation,testRuntimeClasspath
167-
org.glassfish.jersey.core:jersey-server:3.1.9=jarValidation,testRuntimeClasspath
169+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,testRuntimeClasspath
170+
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,testRuntimeClasspath
171+
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,testRuntimeClasspath
172+
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,testRuntimeClasspath
168173
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=jarValidation,testRuntimeClasspath
169174
org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,testRuntimeClasspath
170175
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRuntimeClasspath
@@ -182,7 +187,8 @@ org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath
182187
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
183188
org.semver4j:semver4j:5.3.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
184189
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,testRuntimeClasspath
185-
org.slf4j:slf4j-api:2.0.16=jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
190+
org.slf4j:slf4j-api:2.0.16=runtimeClasspath,swaggerBuild,testCompileClasspath
191+
org.slf4j:slf4j-api:2.0.17=jarValidation,testRuntimeClasspath
186192
org.slf4j:slf4j-api:2.0.9=swaggerDeps
187193
org.xerial.snappy:snappy-java:1.1.10.5=jarValidation,testRuntimeClasspath
188194
org.yaml:snakeyaml:2.2=swaggerDeps

‎solr/benchmark/gradle.lockfile‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,27 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,
120120
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
121121
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
122122
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
123-
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
124-
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
123+
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,testCompileClasspath
124+
org.eclipse.jetty:jetty-http:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
125+
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,testCompileClasspath
126+
org.eclipse.jetty:jetty-io:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
125127
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
126-
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
127-
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
128+
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,testCompileClasspath
129+
org.eclipse.jetty:jetty-security:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
130+
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,testCompileClasspath
131+
org.eclipse.jetty:jetty-server:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
128132
org.eclipse.jetty:jetty-session:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
129-
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
133+
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,testCompileClasspath
134+
org.eclipse.jetty:jetty-util:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
130135
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
131136
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
132137
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
133138
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
134139
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,testRuntimeClasspath
135-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,testRuntimeClasspath
136-
org.glassfish.jersey.core:jersey-client:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
137-
org.glassfish.jersey.core:jersey-common:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
138-
org.glassfish.jersey.core:jersey-server:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
140+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
141+
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
142+
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
143+
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
139144
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
140145
org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
141146
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -157,6 +162,7 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotatio
157162
org.quicktheories:quicktheories:0.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
158163
org.semver4j:semver4j:5.3.0=jarValidation,runtimeClasspath,testRuntimeClasspath
159164
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,runtimeClasspath,testRuntimeClasspath
160-
org.slf4j:slf4j-api:2.0.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
165+
org.slf4j:slf4j-api:2.0.16=compileClasspath,testCompileClasspath
166+
org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
161167
org.xerial.snappy:snappy-java:1.1.10.5=jarValidation,runtimeClasspath,testRuntimeClasspath
162168
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared

‎solr/core/gradle.lockfile‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ jakarta.activation:jakarta.activation-api:2.1.3=permitUnusedDeclared
7272
jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7373
jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7474
jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
75-
jakarta.validation:jakarta.validation-api:2.0.2=permitUnusedDeclared
76-
jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
75+
jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7776
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7877
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared
7978
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
80-
javax.servlet:javax.servlet-api:3.1.0=permitUnusedDeclared
8179
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
8280
net.bytebuddy:byte-buddy:1.17.7=jarValidation,testCompileClasspath,testRuntimeClasspath
8381
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -141,34 +139,29 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtime
141139
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
142140
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
143141
org.eclipse.jetty:jetty-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
144-
org.eclipse.jetty:jetty-continuation:9.4.49.v20220914=permitUnusedDeclared
145-
org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
146-
org.eclipse.jetty:jetty-http:9.4.49.v20220914=permitUnusedDeclared
147-
org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
148-
org.eclipse.jetty:jetty-io:9.4.49.v20220914=permitUnusedDeclared
142+
org.eclipse.jetty:jetty-http:12.0.19=apiHelper
143+
org.eclipse.jetty:jetty-http:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
144+
org.eclipse.jetty:jetty-io:12.0.19=apiHelper
145+
org.eclipse.jetty:jetty-io:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
149146
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
150-
org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
151-
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
152-
org.eclipse.jetty:jetty-server:9.4.49.v20220914=permitUnusedDeclared
147+
org.eclipse.jetty:jetty-security:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
148+
org.eclipse.jetty:jetty-server:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
153149
org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
154-
org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
155-
org.eclipse.jetty:jetty-util:9.4.49.v20220914=permitUnusedDeclared
150+
org.eclipse.jetty:jetty-util:12.0.19=apiHelper
151+
org.eclipse.jetty:jetty-util:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
156152
org.glassfish.hk2.external:aopalliance-repackaged:3.0.6=permitUnusedDeclared
157153
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
158-
org.glassfish.hk2.external:jakarta.inject:2.6.1=permitUnusedDeclared
159154
org.glassfish.hk2:hk2-api:3.0.6=permitUnusedDeclared
160155
org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
161156
org.glassfish.hk2:hk2-locator:3.0.6=permitUnusedDeclared
162157
org.glassfish.hk2:hk2-locator:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
163158
org.glassfish.hk2:hk2-utils:3.0.6=permitUnusedDeclared
164159
org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
165160
org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
166-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
167-
org.glassfish.jersey.core:jersey-client:2.39.1=permitUnusedDeclared
168-
org.glassfish.jersey.core:jersey-client:3.1.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
169-
org.glassfish.jersey.core:jersey-common:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
170-
org.glassfish.jersey.core:jersey-server:2.39.1=permitUnusedDeclared
171-
org.glassfish.jersey.core:jersey-server:3.1.9=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
161+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
162+
org.glassfish.jersey.core:jersey-client:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
163+
org.glassfish.jersey.core:jersey-common:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164+
org.glassfish.jersey.core:jersey-server:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
172165
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
173166
org.glassfish.jersey.inject:jersey-hk2:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
174167
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -192,7 +185,8 @@ org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClas
192185
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
193186
org.semver4j:semver4j:5.3.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
194187
org.slf4j:jcl-over-slf4j:2.0.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
195-
org.slf4j:slf4j-api:2.0.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
188+
org.slf4j:slf4j-api:2.0.16=apiHelper
189+
org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
196190
org.xerial.snappy:snappy-java:1.1.10.5=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
197191
ua.net.nlp:morfologik-ukrainian-search:4.9.1=jarValidation,testRuntimeClasspath
198192
empty=apiHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures

0 commit comments

Comments
 (0)