Skip to content

Commit f3c7dfe

Browse files
committed
Update Web server stack to v4 (branch_9x)
1 parent 06fc1d2 commit f3c7dfe

2 files changed

Lines changed: 39 additions & 38 deletions

File tree

versions.lock

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0)
166166
io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b)
167167
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
168168
io.swagger.core.v3:swagger-annotations-jakarta:2.2.53 (1 constraints: 3e053e3b)
169-
jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4)
170-
jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e)
171-
jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3)
172-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954)
169+
jakarta.activation:jakarta.activation-api:2.1.3 (2 constraints: cf1f6b1a)
170+
jakarta.annotation:jakarta.annotation-api:3.0.0 (5 constraints: 0351530b)
171+
jakarta.inject:jakarta.inject-api:2.0.1 (6 constraints: 1b621332)
172+
jakarta.validation:jakarta.validation-api:3.1.0 (1 constraints: fd10bcc3)
173+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0 (6 constraints: 6e651751)
174+
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 (2 constraints: fd1d3f69)
173175
junit:junit:4.13.2 (7 constraints: 736dcb65)
174176
net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb)
175177
net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf)
@@ -277,41 +279,41 @@ org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319)
277279
org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a)
278280
org.codehaus.woodstox:stax2-api:4.3.0 (4 constraints: 5d338b6e)
279281
org.conscrypt:conscrypt-openjdk-uber:2.5.2 (3 constraints: 193286c8)
280-
org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161)
281-
org.eclipse.jetty:jetty-alpn-java-client:10.0.26 (2 constraints: 231b156f)
282-
org.eclipse.jetty:jetty-alpn-java-server:10.0.26 (1 constraints: 6b059440)
283-
org.eclipse.jetty:jetty-alpn-server:10.0.26 (2 constraints: f9167b49)
284-
org.eclipse.jetty:jetty-client:10.0.26 (2 constraints: 231b156f)
285-
org.eclipse.jetty:jetty-deploy:10.0.26 (1 constraints: 6b059440)
286-
org.eclipse.jetty:jetty-http:10.0.26 (6 constraints: 824ff191)
287-
org.eclipse.jetty:jetty-io:10.0.26 (9 constraints: c77dd1ef)
288-
org.eclipse.jetty:jetty-jmx:10.0.26 (1 constraints: 6b059440)
289-
org.eclipse.jetty:jetty-rewrite:10.0.26 (1 constraints: 6b059440)
290-
org.eclipse.jetty:jetty-security:10.0.26 (2 constraints: c0137579)
291-
org.eclipse.jetty:jetty-server:10.0.26 (7 constraints: ea6da02c)
282+
org.eclipse.jetty:jetty-alpn-client:12.0.27 (3 constraints: fd2ee062)
283+
org.eclipse.jetty:jetty-alpn-java-client:12.0.27 (2 constraints: 231b156f)
284+
org.eclipse.jetty:jetty-alpn-java-server:12.0.27 (1 constraints: 6b059440)
285+
org.eclipse.jetty:jetty-alpn-server:12.0.27 (2 constraints: fc168849)
286+
org.eclipse.jetty:jetty-client:12.0.27 (2 constraints: 231b156f)
287+
org.eclipse.jetty:jetty-deploy:12.0.27 (1 constraints: 6b059440)
288+
org.eclipse.jetty:jetty-http:12.0.27 (6 constraints: 884f9c94)
289+
org.eclipse.jetty:jetty-io:12.0.27 (9 constraints: d67d23fa)
290+
org.eclipse.jetty:jetty-jmx:12.0.27 (1 constraints: 6b059440)
291+
org.eclipse.jetty:jetty-rewrite:12.0.27 (1 constraints: 6b059440)
292+
org.eclipse.jetty:jetty-security:12.0.27 (3 constraints: 272d65a8)
293+
org.eclipse.jetty:jetty-server:12.0.27 (8 constraints: bd799096)
292294
org.eclipse.jetty:jetty-servlet:10.0.26 (2 constraints: 3a139f61)
293295
org.eclipse.jetty:jetty-servlets:10.0.26 (1 constraints: 6b059440)
294-
org.eclipse.jetty:jetty-util:10.0.26 (9 constraints: c181ff9f)
295-
org.eclipse.jetty:jetty-webapp:10.0.26 (2 constraints: 48132762)
296-
org.eclipse.jetty:jetty-xml:10.0.26 (3 constraints: 1721b5bb)
296+
org.eclipse.jetty:jetty-util:12.0.27 (8 constraints: 5066015d)
297+
org.eclipse.jetty:jetty-webapp:10.0.26 (1 constraints: 6b059440)
298+
org.eclipse.jetty:jetty-xml:12.0.27 (3 constraints: 1a213dbc)
297299
org.eclipse.jetty.http2:http2-client:10.0.26 (2 constraints: 231b156f)
298300
org.eclipse.jetty.http2:http2-common:10.0.26 (3 constraints: e5240563)
299301
org.eclipse.jetty.http2:http2-hpack:10.0.26 (2 constraints: 2615cce0)
300302
org.eclipse.jetty.http2:http2-http-client-transport:10.0.26 (1 constraints: 6b059440)
301303
org.eclipse.jetty.http2:http2-server:10.0.26 (1 constraints: 6b059440)
302-
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9 (4 constraints: 8b30cdc0)
303-
org.glassfish.hk2:hk2-api:3.1.1 (2 constraints: 70114901)
304-
org.glassfish.hk2:hk2-locator:3.1.1 (1 constraints: 4410d8ad)
305-
org.glassfish.hk2:hk2-utils:3.1.1 (2 constraints: 19178676)
306-
org.glassfish.hk2:osgi-resource-locator:1.0.4 (1 constraints: ef10e7c2)
307-
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1 (2 constraints: 19178676)
308-
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1 (1 constraints: 4105533b)
309-
org.glassfish.jersey.core:jersey-client:3.1.12 (1 constraints: 3011edd4)
310-
org.glassfish.jersey.core:jersey-common:3.1.12 (6 constraints: 1667aa5c)
311-
org.glassfish.jersey.core:jersey-server:3.1.12 (2 constraints: 731e8152)
312-
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.12 (1 constraints: ed1510e9)
313-
org.glassfish.jersey.inject:jersey-hk2:3.1.12 (1 constraints: 3905373b)
314-
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.12 (1 constraints: 3905373b)
304+
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9 (2 constraints: 1015d6be)
305+
org.glassfish.hk2:hk2-api:4.0.1 (2 constraints: 70114d01)
306+
org.glassfish.hk2:hk2-locator:4.0.1 (1 constraints: ec10e8df)
307+
org.glassfish.hk2:hk2-utils:4.0.1 (2 constraints: 19178a76)
308+
org.glassfish.hk2:osgi-resource-locator:3.0.0 (1 constraints: ee10eec2)
309+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.1 (2 constraints: 19178a76)
310+
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2 (1 constraints: 08050136)
311+
org.glassfish.jersey.core:jersey-client:4.0.2 (1 constraints: ff10c0c3)
312+
org.glassfish.jersey.core:jersey-common:4.0.2 (6 constraints: e865aa70)
313+
org.glassfish.jersey.core:jersey-server:4.0.2 (2 constraints: 091ec321)
314+
org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2 (1 constraints: bc1526d3)
315+
org.glassfish.jersey.inject:jersey-hk2:4.0.2 (1 constraints: 08050136)
316+
org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2 (1 constraints: 08050136)
315317
org.hamcrest:hamcrest:3.0 (3 constraints: 74208125)
316318
org.hamcrest:hamcrest-core:3.0 (1 constraints: cc05fe3f)
317319
org.immutables:value-annotations:2.12.2 (1 constraints: 3905373b)
@@ -346,7 +348,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7)
346348
org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36)
347349
org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3d05333b)
348350
org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f)
349-
org.slf4j:slf4j-api:2.0.18 (70 constraints: 02f2946d)
351+
org.slf4j:slf4j-api:2.0.18 (71 constraints: 7e0b2ddc)
350352
org.threeten:threetenbp:1.7.0 (6 constraints: 32557c53)
351353
org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38)
352354
software.amazon.awssdk:annotations:2.46.18 (31 constraints: 05dc83d0)
@@ -412,7 +414,6 @@ io.micrometer:micrometer-core:1.9.12 (1 constraints: fe162919)
412414
io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
413415
jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9)
414416
jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
415-
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (1 constraints: bd0db535)
416417
javax.inject:javax.inject:1 (1 constraints: 7a0df617)
417418
joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431)
418419
net.bytebuddy:byte-buddy:1.18.10 (2 constraints: b61064d7)

versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ io.opentracing:opentracing*=0.33.0
3535
io.prometheus:prometheus*=1.8.0
3636
io.prometheus:simpleclient*=0.16.0
3737
io.swagger.core.v3:*=2.2.53
38-
jakarta.ws.rs:jakarta.ws.rs-api=3.1.0
38+
jakarta.ws.rs:jakarta.ws.rs-api=4.0.0
3939
junit:junit=4.13.2
4040
net.bytebuddy:*=1.18.10
4141
net.java.dev.jna:jna=5.18.1
@@ -71,11 +71,11 @@ org.carrot2:carrot2-core=4.5.1
7171
org.codehaus.woodstox:stax2-api=4.3.0
7272
org.eclipse.jetty*:*=10.0.26
7373
org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.9
74-
org.glassfish.hk2*:*=3.1.1
74+
org.glassfish.hk2*:*=4.0.1
7575
org.glassfish.hk2.external:jakarta.inject=2.6.1
7676
org.glassfish.hk2:osgi*=1.0.4
77-
org.glassfish.jersey*:*=3.1.12
78-
org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1
77+
org.glassfish.jersey*:*=4.0.2
78+
org.glassfish.jersey.containers:jersey-container-jetty-http=4.0.2
7979
org.hamcrest:*=3.0
8080
org.hsqldb:hsqldb=2.7.4
8181
org.immutables:value-annotations=2.12.2

0 commit comments

Comments
 (0)