Skip to content

Commit 9513e1b

Browse files
solrbotsolrbot
committed
Update dependency org.glassfish.jersey.containers:jersey-container-jetty-http to v3
1 parent ffa6a3a commit 9513e1b

33 files changed

+279
-153
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.11"
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,24 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,testRuntimeClassp
130130
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
131131
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
132132
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,testRuntimeClasspath
133-
org.eclipse.jetty:jetty-http:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
134-
org.eclipse.jetty:jetty-io:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
133+
org.eclipse.jetty:jetty-http:12.0.19=testCompileClasspath
134+
org.eclipse.jetty:jetty-http:12.0.22=jarValidation,testRuntimeClasspath
135+
org.eclipse.jetty:jetty-io:12.0.19=testCompileClasspath
136+
org.eclipse.jetty:jetty-io:12.0.22=jarValidation,testRuntimeClasspath
135137
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
136-
org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
137-
org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
138+
org.eclipse.jetty:jetty-security:12.0.19=testCompileClasspath
139+
org.eclipse.jetty:jetty-security:12.0.22=jarValidation,testRuntimeClasspath
140+
org.eclipse.jetty:jetty-server:12.0.19=testCompileClasspath
141+
org.eclipse.jetty:jetty-server:12.0.22=jarValidation,testRuntimeClasspath
138142
org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
139-
org.eclipse.jetty:jetty-util:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
143+
org.eclipse.jetty:jetty-util:12.0.19=testCompileClasspath
144+
org.eclipse.jetty:jetty-util:12.0.22=jarValidation,testRuntimeClasspath
140145
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
141146
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
142147
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
143148
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,testRuntimeClasspath
144149
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,testRuntimeClasspath
145-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,testRuntimeClasspath
150+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,testRuntimeClasspath
146151
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,testRuntimeClasspath
147152
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,testRuntimeClasspath
148153
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,19 +121,24 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,
121121
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
122122
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
123123
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
124-
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
125-
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
124+
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,testCompileClasspath
125+
org.eclipse.jetty:jetty-http:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
126+
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,testCompileClasspath
127+
org.eclipse.jetty:jetty-io:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
126128
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
127-
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
128-
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
129+
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,testCompileClasspath
130+
org.eclipse.jetty:jetty-security:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
131+
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,testCompileClasspath
132+
org.eclipse.jetty:jetty-server:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
129133
org.eclipse.jetty:jetty-session:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
130-
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
134+
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,testCompileClasspath
135+
org.eclipse.jetty:jetty-util:12.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
131136
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
132137
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
133138
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
134139
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
135140
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,testRuntimeClasspath
136-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,testRuntimeClasspath
141+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
137142
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
138143
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath
139144
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,22 @@ org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtime
135135
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
136136
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
137137
org.eclipse.jetty:jetty-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
138-
org.eclipse.jetty:jetty-continuation:9.4.49.v20220914=permitUnusedDeclared
139-
org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
140-
org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
138+
org.eclipse.jetty:jetty-http:12.0.19=apiHelper
139+
org.eclipse.jetty:jetty-http:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
140+
org.eclipse.jetty:jetty-io:12.0.19=apiHelper
141+
org.eclipse.jetty:jetty-io:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
141142
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
142-
org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
143-
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
143+
org.eclipse.jetty:jetty-security:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
144+
org.eclipse.jetty:jetty-server:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
144145
org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
145-
org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
146+
org.eclipse.jetty:jetty-util:12.0.19=apiHelper
147+
org.eclipse.jetty:jetty-util:12.0.22=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
146148
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
147-
org.glassfish.hk2.external:jakarta.inject:2.6.1=permitUnusedDeclared
148149
org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
149150
org.glassfish.hk2:hk2-locator:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
150151
org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
151152
org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
152-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
153+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
153154
org.glassfish.jersey.core:jersey-client:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
154155
org.glassfish.jersey.core:jersey-common:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
155156
org.glassfish.jersey.core:jersey-server:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath

‎solr/cross-dc-manager/gradle.lockfile‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,26 @@ org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,solrPlatformLibs,testR
163163
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
164164
org.eclipse.jetty:jetty-deploy:12.0.19=solrPlatformLibs
165165
org.eclipse.jetty:jetty-ee:12.0.19=solrPlatformLibs
166-
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
167-
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
166+
org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,testCompileClasspath
167+
org.eclipse.jetty:jetty-http:12.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
168+
org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,testCompileClasspath
169+
org.eclipse.jetty:jetty-io:12.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
168170
org.eclipse.jetty:jetty-jmx:12.0.19=solrPlatformLibs
169171
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,solrPlatformLibs,testRuntimeClasspath
170-
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
171-
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
172+
org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,testCompileClasspath
173+
org.eclipse.jetty:jetty-security:12.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
174+
org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,testCompileClasspath
175+
org.eclipse.jetty:jetty-server:12.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
172176
org.eclipse.jetty:jetty-session:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
173-
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
177+
org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,testCompileClasspath
178+
org.eclipse.jetty:jetty-util:12.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
174179
org.eclipse.jetty:jetty-xml:12.0.19=solrPlatformLibs
175180
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
176181
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
177182
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
178183
org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
179184
org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
180-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
185+
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
181186
org.glassfish.jersey.core:jersey-client:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
182187
org.glassfish.jersey.core:jersey-common:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
183188
org.glassfish.jersey.core:jersey-server:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/licenses/jersey-container-jetty-http-2.39.1.jar.sha1‎

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

‎solr/licenses/jersey-container-jetty-http-3.1.11.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecc49adcb77cb56fda6a06100368c9eb7abb5e01

‎solr/licenses/jetty-http-12.0.22.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dc59a0f4156c94b6a7949c0a775ce51642db0395

‎solr/licenses/jetty-io-12.0.22.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6a1f61ddde45854b34e046ed5070b24029b99f84

‎solr/licenses/jetty-security-12.0.22.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5eb766e070cf926588ec67d12f33d0da42f57237

0 commit comments

Comments
 (0)