From 14f73fe011dd1610b4280fcc771b804cb49913d6 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 14 Jun 2023 18:30:00 +0000 Subject: [PATCH] Update org.glassfish.jersey*:* to v3 --- versions.lock | 133 ++++++++++++++++++++++++++----------------------- versions.props | 2 +- 2 files changed, 72 insertions(+), 63 deletions(-) diff --git a/versions.lock b/versions.lock index aff22bd4a41..957e95abefb 100644 --- a/versions.lock +++ b/versions.lock @@ -6,13 +6,13 @@ com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: cf1501e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.epam:parso:2.0.14 (1 constraints: 8e0c750e) -com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: 4ef8ad55) -com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 9bbe6617) -com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 42025e28) -com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: 89633f8a) +com.fasterxml.jackson:jackson-bom:2.15.2 (12 constraints: a2fc9661) +com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: f0c2dffe) +com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 9606a4f7) +com.fasterxml.jackson.core:jackson-databind:2.15.2 (18 constraints: de6708e3) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 631c9af1) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: ba0eab66) -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 (2 constraints: a624c5e0) +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (2 constraints: a724cae0) com.fasterxml.woodstox:woodstox-core:6.5.1 (2 constraints: a0239c84) com.github.ben-manes.caffeine:caffeine:3.1.6 (1 constraints: 0c050336) com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01) @@ -150,14 +150,15 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0) io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b) io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9) io.swagger.core.v3:swagger-annotations:2.2.11 (1 constraints: 3805343b) -jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe) -jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9) -jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3) -jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec) -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (5 constraints: c45d665e) +jakarta.activation:jakarta.activation-api:2.1.0 (1 constraints: 8c0f4791) +jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) +jakarta.inject:jakarta.inject-api:2.0.1 (9 constraints: 7fa85074) +jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) +jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (10 constraints: 94ccb1c5) +jakarta.xml.bind:jakarta.xml.bind-api:4.0.0 (5 constraints: 495a896a) javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5) joda-time:joda-time:2.8.1 (3 constraints: d61aef93) -junit:junit:4.13.2 (9 constraints: d5aafc9f) +junit:junit:4.13.2 (7 constraints: 136d2cb8) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.java.dev.jna:jna:5.12.1 (1 constraints: 900c8e0e) net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d) @@ -275,51 +276,52 @@ org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c) org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf) org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401) org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95) -org.eclipse.jetty:jetty-alpn-client:10.0.15 (3 constraints: f12e1a60) -org.eclipse.jetty:jetty-alpn-java-client:10.0.15 (2 constraints: 1f1b936e) -org.eclipse.jetty:jetty-alpn-java-server:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty:jetty-alpn-server:10.0.15 (2 constraints: f5160f49) -org.eclipse.jetty:jetty-client:10.0.15 (2 constraints: 1f1b936e) -org.eclipse.jetty:jetty-deploy:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty:jetty-http:10.0.15 (6 constraints: 764fc18c) -org.eclipse.jetty:jetty-io:10.0.15 (9 constraints: b57d78e3) -org.eclipse.jetty:jetty-jmx:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty:jetty-rewrite:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty:jetty-security:10.0.15 (2 constraints: bc131b79) -org.eclipse.jetty:jetty-server:10.0.15 (7 constraints: d26d3b23) -org.eclipse.jetty:jetty-servlet:10.0.15 (2 constraints: 36134761) -org.eclipse.jetty:jetty-servlets:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty:jetty-util:10.0.15 (9 constraints: a5819691) -org.eclipse.jetty:jetty-webapp:10.0.15 (2 constraints: 4413cf61) -org.eclipse.jetty:jetty-xml:10.0.15 (3 constraints: 1121b6ba) -org.eclipse.jetty.http2:http2-client:10.0.15 (2 constraints: 1f1b936e) -org.eclipse.jetty.http2:http2-common:10.0.15 (3 constraints: df24e261) -org.eclipse.jetty.http2:http2-hpack:10.0.15 (2 constraints: 221568e0) -org.eclipse.jetty.http2:http2-http-client-transport:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty.http2:http2-server:10.0.15 (1 constraints: 69059140) -org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf) +org.eclipse.jetty:jetty-alpn-client:11.0.15 (3 constraints: f42eb360) +org.eclipse.jetty:jetty-alpn-java-client:11.0.15 (2 constraints: 201b996e) +org.eclipse.jetty:jetty-alpn-java-server:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty:jetty-alpn-server:11.0.15 (2 constraints: f6161549) +org.eclipse.jetty:jetty-client:11.0.15 (2 constraints: 201b996e) +org.eclipse.jetty:jetty-deploy:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty:jetty-http:11.0.15 (6 constraints: 7a4fe28d) +org.eclipse.jetty:jetty-io:11.0.15 (9 constraints: bc7d2be7) +org.eclipse.jetty:jetty-jmx:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty:jetty-rewrite:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty:jetty-security:11.0.15 (2 constraints: bd132179) +org.eclipse.jetty:jetty-server:11.0.15 (7 constraints: c86ba14f) +org.eclipse.jetty:jetty-servlet:11.0.15 (2 constraints: 37134d61) +org.eclipse.jetty:jetty-servlets:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty:jetty-util:11.0.15 (9 constraints: 9d7f8c0d) +org.eclipse.jetty:jetty-webapp:11.0.15 (2 constraints: 4513d561) +org.eclipse.jetty:jetty-xml:11.0.15 (3 constraints: 1321ebba) +org.eclipse.jetty.http2:http2-client:11.0.15 (2 constraints: 201b996e) +org.eclipse.jetty.http2:http2-common:11.0.15 (3 constraints: e1241d62) +org.eclipse.jetty.http2:http2-hpack:11.0.15 (2 constraints: 23156ee0) +org.eclipse.jetty.http2:http2-http-client-transport:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty.http2:http2-server:11.0.15 (1 constraints: 69059140) +org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 (2 constraints: 761b7a81) +org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (2 constraints: 0d1549be) org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9) org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9) -org.glassfish.hk2:hk2-api:2.6.1 (2 constraints: 7811f501) -org.glassfish.hk2:hk2-locator:2.6.1 (1 constraints: 4410e0ad) -org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277) +org.glassfish.hk2:hk2-api:3.0.4 (2 constraints: 7611eb01) +org.glassfish.hk2:hk2-locator:3.0.4 (1 constraints: 4210d6ad) +org.glassfish.hk2:hk2-utils:3.0.4 (2 constraints: 1d17d276) org.glassfish.hk2:osgi-resource-locator:1.0.3 (2 constraints: 7d23b265) -org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277) -org.glassfish.hk2.external:jakarta.inject:2.6.1 (11 constraints: 2cbae60f) +org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 (2 constraints: 1d17d276) +org.glassfish.hk2.external:jakarta.inject:2.6.1 (1 constraints: 0b050836) org.glassfish.jaxb:jaxb-runtime:2.3.7 (2 constraints: 2217375b) org.glassfish.jaxb:txw2:2.3.7 (1 constraints: c10db935) -org.glassfish.jersey.containers:jersey-container-jetty-http:2.35 (1 constraints: de04fe30) -org.glassfish.jersey.core:jersey-client:2.35 (1 constraints: d510c6b2) -org.glassfish.jersey.core:jersey-common:2.35 (11 constraints: d3ddca6a) -org.glassfish.jersey.core:jersey-server:2.35 (7 constraints: 169eb83e) -org.glassfish.jersey.ext:jersey-entity-filtering:2.35 (1 constraints: 92156fbd) -org.glassfish.jersey.inject:jersey-hk2:2.35 (1 constraints: de04fe30) -org.glassfish.jersey.media:jersey-media-json-jackson:2.35 (1 constraints: de04fe30) -org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25) +org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.2 (1 constraints: 0805ff35) +org.glassfish.jersey.core:jersey-client:3.1.2 (1 constraints: ff10bec3) +org.glassfish.jersey.core:jersey-common:3.1.2 (11 constraints: a1dfb1a2) +org.glassfish.jersey.core:jersey-server:3.1.2 (7 constraints: 3c9fc26c) +org.glassfish.jersey.ext:jersey-entity-filtering:3.1.2 (1 constraints: bc1524d3) +org.glassfish.jersey.inject:jersey-hk2:3.1.2 (1 constraints: 0805ff35) +org.glassfish.jersey.media:jersey-media-json-jackson:3.1.2 (1 constraints: 0805ff35) +org.hamcrest:hamcrest:2.2 (5 constraints: 125db3af) org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f) org.immutables:value-annotations:2.9.3 (1 constraints: 10051336) org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c) -org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1) +org.javassist:javassist:3.29.0-GA (1 constraints: 2e1126f1) org.jctools:jctools-core:4.0.1 (1 constraints: 07050036) org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b) org.jetbrains:annotations:13.0 (1 constraints: df0e795c) @@ -327,7 +329,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.6.20 (5 constraints: 6c4c1dcd) org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 (3 constraints: 352cbb71) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (3 constraints: 582c9186) -org.junit:junit-bom:5.9.1 (1 constraints: c8116ede) +org.junit:junit-bom:5.9.1 (7 constraints: 1974131b) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) @@ -346,7 +348,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd) org.semver4j:semver4j:4.3.0 (1 constraints: 09050836) org.slf4j:jcl-over-slf4j:2.0.7 (3 constraints: cd1757a6) org.slf4j:jul-to-slf4j:2.0.7 (3 constraints: 27289948) -org.slf4j:slf4j-api:2.0.7 (59 constraints: 0d112d8b) +org.slf4j:slf4j-api:2.0.7 (60 constraints: 0f2a9bf0) org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528) org.tallison:jmatio:1.5 (1 constraints: ff0b57e9) org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28) @@ -402,7 +404,7 @@ io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871) io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c) io.micrometer:micrometer-core:1.9.11 (1 constraints: fd162819) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) -jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a) +jakarta.servlet:jakarta.servlet-api:6.0.0 (4 constraints: 556e8068) jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) javax.inject:javax.inject:1 (1 constraints: 7a0df617) net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0) @@ -420,23 +422,30 @@ org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2) org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e) org.apache.tomcat.embed:tomcat-embed-el:9.0.75 (1 constraints: d31557cf) org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271) -org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271) -org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5) -org.glassfish.grizzly:grizzly-http-server:2.4.4 (2 constraints: bb2c391b) -org.glassfish.grizzly:grizzly-http-servlet:2.4.4 (1 constraints: 681bda3f) -org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.35 (2 constraints: 623ed2c2) -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.35 (1 constraints: 292310ba) -org.glassfish.jersey.containers:jersey-container-servlet:2.35 (1 constraints: 3a1b7724) -org.glassfish.jersey.containers:jersey-container-servlet-core:2.35 (2 constraints: a031bd78) -org.glassfish.jersey.media:jersey-media-jaxb:2.35 (1 constraints: e11958ca) -org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constraints: 062875af) -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30) +org.glassfish.grizzly:grizzly-framework:4.0.0 (1 constraints: 610fdc71) +org.glassfish.grizzly:grizzly-http:4.0.0 (1 constraints: 251276f5) +org.glassfish.grizzly:grizzly-http-server:4.0.0 (2 constraints: af2c8319) +org.glassfish.grizzly:grizzly-http-servlet:4.0.0 (1 constraints: 621bd43f) +org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.2 (2 constraints: b63e2f2c) +org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:3.1.2 (1 constraints: 53235cdd) +org.glassfish.jersey.containers:jersey-container-servlet:3.1.2 (1 constraints: 641bd43f) +org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.2 (2 constraints: f43109ce) +org.glassfish.jersey.media:jersey-media-jaxb:3.1.2 (1 constraints: 0b1a5ce4) +org.glassfish.jersey.test-framework:jersey-test-framework-core:3.1.2 (2 constraints: 5a280bec) +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.2 (1 constraints: 0805ff35) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.7.1 (1 constraints: 0c050b36) org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2) +org.junit.jupiter:junit-jupiter:5.9.1 (3 constraints: 844699a3) +org.junit.jupiter:junit-jupiter-api:5.9.1 (4 constraints: 8b386434) +org.junit.jupiter:junit-jupiter-engine:5.9.1 (2 constraints: 2117d63c) +org.junit.jupiter:junit-jupiter-params:5.9.1 (2 constraints: 2117d63c) +org.junit.platform:junit-platform-commons:1.9.1 (3 constraints: ee29f32b) +org.junit.platform:junit-platform-engine:1.9.1 (2 constraints: bc19e1f3) org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236) org.objenesis:objenesis:3.1 (1 constraints: b00a12bd) +org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) org.springframework:spring-aop:5.3.27 (2 constraints: dc1e629a) org.springframework:spring-beans:5.3.27 (4 constraints: ac3ac2c8) org.springframework:spring-context:5.3.27 (2 constraints: 6d1f9ed2) diff --git a/versions.props b/versions.props index dded2b6baca..d0b4d7fa769 100644 --- a/versions.props +++ b/versions.props @@ -59,7 +59,7 @@ org.codehaus.woodstox:stax2-api=4.2.1 org.eclipse.jetty*:*=10.0.15 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6 org.glassfish.hk2*:*=2.6.1 -org.glassfish.jersey*:*=2.35 +org.glassfish.jersey*:*=3.1.2 org.hamcrest:*=2.2 org.hsqldb:hsqldb=2.7.1 org.immutables:value-annotations=2.9.3