diff --git a/versions.lock b/versions.lock index 24dbe962d..c0cb78d49 100644 --- a/versions.lock +++ b/versions.lock @@ -24,7 +24,7 @@ com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335) com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52) com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b) -com.palantir.conjure.java:conjure-lib:7.4.0 (3 constraints: 3f25053a) +com.palantir.conjure.java:conjure-lib:7.5.0 (3 constraints: 4025653a) com.palantir.conjure.java.api:errors:2.34.0 (3 constraints: 2f258049) com.palantir.conjure.java.api:service-config:2.34.0 (3 constraints: a128f8e1) com.palantir.conjure.java.api:ssl-config:2.34.0 (2 constraints: fd174886) @@ -101,7 +101,7 @@ com.spotify.dataenum:dataenum:1.4.1 (1 constraints: e9105ac1) com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b) io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35) io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b) -io.undertow:undertow-core:2.2.20.Final (2 constraints: a219fde9) +io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea) io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361) jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac) junit:junit:4.13.2 (2 constraints: 43140975) diff --git a/versions.props b/versions.props index f74c211c8..a09b8c21f 100644 --- a/versions.props +++ b/versions.props @@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 31.1-jre com.netflix.concurrency-limits:* = 0.2.2 com.netflix.feign:feign-*= 8.18.0 -com.palantir.conjure.java:* = 7.4.0 -com.palantir.conjure.java:conjure-lib = 7.4.0 +com.palantir.conjure.java:* = 7.5.0 +com.palantir.conjure.java:conjure-lib = 7.5.0 com.palantir.conjure.java.api:* = 2.34.0 com.palantir.conjure.verification:* = 0.19.0 com.palantir.dialogue:* = 3.77.0 @@ -22,7 +22,13 @@ org.jmock:jmock = 2.12.0 org.mockito:* = 5.2.0 org.slf4j:* = 1.7.36 io.leangen.geantyref:geantyref = 1.3.4 -io.undertow:* = 2.2.20.Final +io.undertow:* = 2.2.24.Final +# dependency-upgrader:OFF +# Last version of undertow with both Jakarta+Javax support before 'undertow-servlet' was +# updated to jakarta only. This should NEVER be done in production code, it is only used +# here to enable existing test coverage. +io.undertow:undertow-servlet-jakarta = 2.2.20.Final +# dependency-upgrader:ON com.palantir.refreshable:refreshable = 2.2.0 org.hibernate.validator:* = 6.2.0.Final org.checkerframework:checker-qual = 3.32.0