diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java index 2ce9f6ef5ec..f43a3d10cc4 100644 --- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java +++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java @@ -27,6 +27,7 @@ import com.google.common.collect.Streams; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.palantir.atlasdb.timelock.NamespacedClients.ProxyFactory; import com.palantir.atlasdb.timelock.api.MultiClientConjureTimelockService; import com.palantir.atlasdb.timelock.api.management.TimeLockManagementService; @@ -71,7 +72,15 @@ public TimeLockServerHolder serverHolder() { } ListenableFuture killAsync() { - return serverHolder.kill(); + ListenableFuture kill = serverHolder.kill(); + kill.addListener( + () -> { + // https://github.com/palantir/dialogue/issues/1119 + clientsByNamespace.clear(); + proxies.clearProxies(); + }, + MoreExecutors.directExecutor()); + return kill; } void killSync() { diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java index 1f2530225ee..e91c4fcb25d 100644 --- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java +++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.palantir.conjure.java.api.errors.QosException; -import feign.RetryableException; +import com.palantir.conjure.java.api.errors.UnknownRemoteException; public final class ExceptionMatchers { @@ -27,6 +27,6 @@ private ExceptionMatchers() {} public static void isRetryableExceptionWhereLeaderCannotBeFound(Throwable throwable) { assertThat(throwable) .hasRootCauseInstanceOf(QosException.RetryOther.class) - .isInstanceOf(RetryableException.class); + .isInstanceOf(UnknownRemoteException.class); } } diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java index 3948d0f11f4..a82bdef7e01 100644 --- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java +++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java @@ -66,6 +66,10 @@ int getPort(TimeLockServerHolder serverHolder) { abstract int getPort(TimeLockServerHolder serverHolder); } + public void clearProxies() { + proxies.clear(); + } + public T singleNode(TimeLockServerHolder server, Class serviceInterface, ProxyMode proxyMode) { return singleNode(server, serviceInterface, true, proxyMode); } diff --git a/versions.lock b/versions.lock index ec9d5ad8c16..49601ae7322 100644 --- a/versions.lock +++ b/versions.lock @@ -9,23 +9,24 @@ com.carrotsearch:hppc:0.5.4 (1 constraints: 0b05fe35) com.clearspring.analytics:stream:2.5.2 (1 constraints: 970f7788) com.datastax.cassandra:cassandra-driver-core:3.8.0 (1 constraints: 0d051236) com.fasterxml:classmate:1.3.4 (1 constraints: 9b122713) -com.fasterxml.jackson.core:jackson-annotations:2.11.2 (11 constraints: d1b6abed) -com.fasterxml.jackson.core:jackson-core:2.11.2 (16 constraints: 7a412f28) -com.fasterxml.jackson.core:jackson-databind:2.11.2 (30 constraints: 48387656) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.2 (3 constraints: 7a44fe33) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.2 (1 constraints: 7a1c93a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2 (4 constraints: e543c7f5) -com.fasterxml.jackson.datatype:jackson-datatype-guava:2.11.2 (6 constraints: 5c5ed0a1) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.2 (7 constraints: 2a6b1fa6) -com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.2 (1 constraints: af0e575e) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.2 (4 constraints: fe4056f4) -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.11.2 (2 constraints: d52eaf68) -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.11.2 (2 constraints: 7229dae0) -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.11.2 (1 constraints: b70ea16b) -com.fasterxml.jackson.module:jackson-module-afterburner:2.11.2 (8 constraints: 658f389a) -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.2 (2 constraints: d52eaf68) -com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.2 (1 constraints: af0e575e) -com.github.ben-manes.caffeine:caffeine:2.8.5 (12 constraints: 54ba1b64) +com.fasterxml.jackson:jackson-bom:2.12.1 (14 constraints: 18375425) +com.fasterxml.jackson.core:jackson-annotations:2.12.1 (12 constraints: 86c5fb47) +com.fasterxml.jackson.core:jackson-core:2.12.1 (17 constraints: 2f509584) +com.fasterxml.jackson.core:jackson-databind:2.12.1 (31 constraints: 0247f103) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.1 (4 constraints: 3153fe85) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.1 (2 constraints: 312ba986) +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.1 (5 constraints: 9a52e94a) +com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.1 (7 constraints: 136dff64) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.1 (8 constraints: e1799698) +com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.1 (3 constraints: df3949fb) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.1 (5 constraints: b54f77d4) +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.1 (3 constraints: 8a3db647) +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.12.1 (3 constraints: 293848f2) +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.1 (2 constraints: 6c1dd64a) +com.fasterxml.jackson.module:jackson-module-afterburner:2.12.1 (9 constraints: 1e9eeb59) +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.1 (3 constraints: 8a3db647) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.1 (2 constraints: 641dd72e) +com.github.ben-manes.caffeine:caffeine:2.8.6 (12 constraints: 53bacd62) com.github.jbellis:jamm:0.3.0 (1 constraints: 910f6588) com.github.jnr:jffi:1.2.16 (1 constraints: 200ae4bc) com.github.jnr:jnr-constants:0.9.9 (1 constraints: f60a26ce) @@ -46,11 +47,11 @@ com.google.dagger:dagger:2.31.2 (4 constraints: 302ff882) com.google.dagger:dagger-compiler:2.29.1 (1 constraints: 40054f3b) com.google.dagger:dagger-producers:2.29.1 (2 constraints: f81a6f92) com.google.dagger:dagger-spi:2.29.1 (1 constraints: 840e3d5d) -com.google.errorprone:error_prone_annotations:2.5.1 (14 constraints: 44dff8c1) +com.google.errorprone:error_prone_annotations:2.5.1 (17 constraints: b620409c) com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc) com.google.googlejavaformat:google-java-format:1.5 (1 constraints: ee0d4132) com.google.guava:failureaccess:1.0.1 (4 constraints: 563320fd) -com.google.guava:guava:30.1-jre (50 constraints: 1d4b9491) +com.google.guava:guava:30.1-jre (50 constraints: 8b4a2787) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) com.google.protobuf:protobuf-java:3.14.0 (1 constraints: 3a05413b) @@ -72,28 +73,28 @@ com.palantir.cassandra:cassandra-thrift:2.2.13-1.6.0 (2 constraints: 3f176da3) com.palantir.common:streams:1.9.1 (1 constraints: 0d050c36) com.palantir.config.crypto:encrypted-config-value:2.1.0 (1 constraints: 7e179e3b) com.palantir.config.crypto:encrypted-config-value-module:2.1.0 (1 constraints: 0505f835) -com.palantir.conjure.java:conjure-lib:5.41.0 (5 constraints: 8054555c) -com.palantir.conjure.java:conjure-undertow-lib:5.41.0 (1 constraints: 3c05503b) -com.palantir.conjure.java.api:errors:2.16.2 (5 constraints: 2f5f3d4a) -com.palantir.conjure.java.api:service-config:2.16.2 (5 constraints: 3a4d329a) -com.palantir.conjure.java.api:ssl-config:2.16.2 (3 constraints: af2a488b) -com.palantir.conjure.java.runtime:client-config:5.10.0 (6 constraints: 8a664542) -com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:5.10.0 (7 constraints: 9f8296f2) -com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:5.10.0 (1 constraints: 11052036) -com.palantir.conjure.java.runtime:conjure-java-jersey-server:5.10.0 (1 constraints: 11052036) -com.palantir.conjure.java.runtime:keystores:5.10.0 (4 constraints: 9342274d) -com.palantir.conjure.java.runtime:okhttp-clients:5.10.0 (1 constraints: bc18669e) -com.palantir.conjure.java.runtime:refresh-utils:5.10.0 (2 constraints: cc1df431) -com.palantir.dialogue:dialogue-apache-hc5-client:1.81.0 (1 constraints: b5103fbe) -com.palantir.dialogue:dialogue-blocking-channels:1.81.0 (1 constraints: fe139582) -com.palantir.dialogue:dialogue-clients:1.81.0 (1 constraints: 3c05483b) -com.palantir.dialogue:dialogue-core:1.81.0 (2 constraints: b2248f00) -com.palantir.dialogue:dialogue-futures:1.81.0 (3 constraints: c5333bbc) -com.palantir.dialogue:dialogue-serde:1.81.0 (2 constraints: f015a6f4) -com.palantir.dialogue:dialogue-target:1.81.0 (7 constraints: 6d768a46) -com.palantir.docker.compose:docker-compose-rule-core:1.5.0 (3 constraints: d12ff30d) +com.palantir.conjure.java:conjure-lib:5.43.0 (5 constraints: 86544660) +com.palantir.conjure.java:conjure-undertow-lib:5.43.0 (1 constraints: 3e05563b) +com.palantir.conjure.java.api:errors:2.16.2 (5 constraints: 3c5f464d) +com.palantir.conjure.java.api:service-config:2.16.2 (5 constraints: 784d10cb) +com.palantir.conjure.java.api:ssl-config:2.16.2 (3 constraints: e42a96a4) +com.palantir.conjure.java.runtime:client-config:6.12.0 (6 constraints: ba665e79) +com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.12.0 (7 constraints: d282bd39) +com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:6.12.0 (1 constraints: 3b054d3b) +com.palantir.conjure.java.runtime:conjure-java-jersey-server:6.12.0 (1 constraints: 3b054d3b) +com.palantir.conjure.java.runtime:keystores:6.12.0 (4 constraints: c342e770) +com.palantir.conjure.java.runtime:okhttp-clients:6.12.0 (1 constraints: bf18729e) +com.palantir.conjure.java.runtime:refresh-utils:6.12.0 (2 constraints: f91d7f42) +com.palantir.dialogue:dialogue-apache-hc5-client:1.100.0 (2 constraints: a329c02b) +com.palantir.dialogue:dialogue-blocking-channels:1.100.0 (2 constraints: 2324fef1) +com.palantir.dialogue:dialogue-clients:1.100.0 (1 constraints: 64058f40) +com.palantir.dialogue:dialogue-core:1.100.0 (3 constraints: c83dab53) +com.palantir.dialogue:dialogue-futures:1.100.0 (3 constraints: 3d34853e) +com.palantir.dialogue:dialogue-serde:1.100.0 (3 constraints: 062f0fe8) +com.palantir.dialogue:dialogue-target:1.100.0 (7 constraints: 6777ee81) +com.palantir.docker.compose:docker-compose-rule-core:1.5.0 (3 constraints: d32fe90e) com.palantir.docker.compose:docker-compose-rule-events-api-objects:1.5.0 (1 constraints: c015b9d2) -com.palantir.docker.compose:docker-compose-rule-junit4:1.5.0 (2 constraints: 121afc05) +com.palantir.docker.compose:docker-compose-rule-junit4:1.5.0 (2 constraints: 141a7806) com.palantir.docker.proxy:docker-proxy-rule-core:1.1.1 (2 constraints: 0e1ab105) com.palantir.docker.proxy:docker-proxy-rule-junit4:1.1.1 (1 constraints: 0505f435) com.palantir.patches.sourceforge:trove3:3.0.3-p5 (1 constraints: da05b146) @@ -101,31 +102,31 @@ com.palantir.refreshable:refreshable:1.0.0 (3 constraints: 6029acf0) com.palantir.remoting2:error-handling:2.6.3 (2 constraints: 3f15c2ba) com.palantir.remoting2:jackson-support:2.6.3 (2 constraints: 571dfe30) com.palantir.ri:resource-identifier:1.1.0 (3 constraints: 982fa133) -com.palantir.safe-logging:preconditions:1.14.0 (27 constraints: 19c9a5e4) -com.palantir.safe-logging:safe-logging:1.14.0 (23 constraints: 2c7fdb17) -com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (2 constraints: f722094b) +com.palantir.safe-logging:preconditions:1.14.0 (28 constraints: aadd0d00) +com.palantir.safe-logging:safe-logging:1.14.0 (23 constraints: 3b7f6332) +com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9) com.palantir.sls.versions:sls-versions:0.12.1 (1 constraints: 36052a3b) -com.palantir.tokens:auth-tokens:3.6.2 (5 constraints: 575bf618) -com.palantir.tracing:tracing:4.8.0 (9 constraints: 088c278d) -com.palantir.tracing:tracing-api:4.8.0 (4 constraints: e03a791c) -com.palantir.tracing:tracing-jersey:4.8.0 (1 constraints: 101943a2) -com.palantir.tracing:tracing-okhttp3:4.8.0 (2 constraints: 0e2d8179) -com.palantir.tritium:tritium-api:0.18.0 (5 constraints: 104d6f0d) -com.palantir.tritium:tritium-caffeine:0.18.0 (1 constraints: 41053d3b) -com.palantir.tritium:tritium-core:0.18.0 (4 constraints: 1e3e733d) -com.palantir.tritium:tritium-lib:0.18.0 (1 constraints: 41053d3b) -com.palantir.tritium:tritium-metrics:0.18.0 (7 constraints: 04714108) -com.palantir.tritium:tritium-proxy:0.18.0 (1 constraints: 810e7b59) -com.palantir.tritium:tritium-registry:0.18.0 (11 constraints: afbf8198) -com.palantir.tritium:tritium-slf4j:0.18.0 (1 constraints: 810e7b59) -com.palantir.tritium:tritium-tracing:0.18.0 (1 constraints: 810e7b59) +com.palantir.tokens:auth-tokens:3.6.2 (5 constraints: 585b5219) +com.palantir.tracing:tracing:4.11.0 (9 constraints: 2f8d4a75) +com.palantir.tracing:tracing-api:4.11.0 (4 constraints: 883bc3d9) +com.palantir.tracing:tracing-jersey:4.11.0 (1 constraints: 3e197cbb) +com.palantir.tracing:tracing-okhttp3:4.11.0 (2 constraints: 6a2ddbc9) +com.palantir.tritium:tritium-api:0.18.4 (5 constraints: 244d8b14) +com.palantir.tritium:tritium-caffeine:0.18.4 (1 constraints: 41053d3b) +com.palantir.tritium:tritium-core:0.18.4 (4 constraints: 2e3ec341) +com.palantir.tritium:tritium-lib:0.18.4 (1 constraints: 41053d3b) +com.palantir.tritium:tritium-metrics:0.18.4 (8 constraints: c580229f) +com.palantir.tritium:tritium-proxy:0.18.4 (1 constraints: 850e7f59) +com.palantir.tritium:tritium-registry:0.18.4 (12 constraints: 22cfb11c) +com.palantir.tritium:tritium-slf4j:0.18.4 (1 constraints: 850e7f59) +com.palantir.tritium:tritium-tracing:0.18.4 (1 constraints: 850e7f59) com.papertrail:profiler:1.0.2 (1 constraints: e21051b8) com.squareup:javapoet:1.13.0 (3 constraints: 1c204572) com.squareup.okhttp3:logging-interceptor:3.13.1 (1 constraints: b114c190) com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 3c439bd0) com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309) com.thinkaurelius.thrift:thrift-server:0.3.7 (1 constraints: 980f6c88) -com.zaxxer:HikariCP:4.0.0 (1 constraints: 3e07ac6f) +com.zaxxer:HikariCP:4.0.1 (1 constraints: 3f07ae6f) commons-cli:commons-cli:1.1 (1 constraints: 320f7469) commons-codec:commons-codec:1.13 (2 constraints: 3d22bdb7) commons-dbutils:commons-dbutils:1.3 (1 constraints: a8041d2c) @@ -147,7 +148,7 @@ io.dropwizard:dropwizard-util:2.0.2 (5 constraints: ca496b97) io.dropwizard:dropwizard-validation:2.0.2 (5 constraints: 7649918e) io.dropwizard.logback:logback-throttling-appender:1.1.0 (1 constraints: 7a0ece4f) io.dropwizard.metrics:metrics-annotation:3.2.6 (2 constraints: 451f04ba) -io.dropwizard.metrics:metrics-core:3.2.6 (21 constraints: 8a59c04b) +io.dropwizard.metrics:metrics-core:3.2.6 (22 constraints: 2d6956dc) io.dropwizard.metrics:metrics-healthchecks:3.2.6 (2 constraints: 2a1e8c46) io.dropwizard.metrics:metrics-jersey2:3.2.6 (1 constraints: 2a0e1640) io.dropwizard.metrics:metrics-jetty9:3.2.6 (1 constraints: c80d3430) @@ -178,9 +179,9 @@ jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (13 constraints: aef80222) jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (3 constraints: ee35c874) javax.annotation:jsr250-api:1.0 (1 constraints: e90d3c32) jline:jline:2.12 (2 constraints: 6b14f871) -joda-time:joda-time:2.10.9 (7 constraints: 6a6368dd) -junit:junit:4.13.1 (7 constraints: 068de16e) -net.bytebuddy:byte-buddy:1.10.14 (2 constraints: f319b439) +joda-time:joda-time:2.10.9 (7 constraints: 91637318) +junit:junit:4.13.1 (8 constraints: be9b3047) +net.bytebuddy:byte-buddy:1.10.18 (2 constraints: f719403a) net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de) net.java.dev.jna:jna:4.1.0 (2 constraints: 6e1bbbad) net.jcip:jcip-annotations:1.0 (2 constraints: fa13a659) @@ -200,15 +201,15 @@ org.apache.commons:commons-lang3:3.9 (11 constraints: 48a8c3cb) org.apache.commons:commons-math3:3.2 (2 constraints: 90196ff8) org.apache.commons:commons-pool2:2.9.0 (1 constraints: 0d051036) org.apache.commons:commons-text:1.8 (1 constraints: b4102e9b) -org.apache.httpcomponents.client5:httpclient5:5.0.1 (1 constraints: ca13906e) -org.apache.httpcomponents.core5:httpcore5:5.0.1 (3 constraints: 57394c0b) -org.apache.httpcomponents.core5:httpcore5-h2:5.0.1 (1 constraints: 3a13043c) +org.apache.httpcomponents.client5:httpclient5:5.0.3 (1 constraints: cc13926e) +org.apache.httpcomponents.core5:httpcore5:5.0.3 (3 constraints: 5b395b0c) +org.apache.httpcomponents.core5:httpcore5-h2:5.0.2 (1 constraints: 3b13053c) org.apache.thrift:libthrift:0.9.2 (3 constraints: 6d318be9) org.assertj:assertj-core:3.17.0 (4 constraints: ab39f007) org.awaitility:awaitility:4.0.3 (2 constraints: c81ac33b) org.caffinitas.ohc:ohc-core:0.3.4 (1 constraints: 950f6988) org.checkerframework:checker-compat-qual:2.5.3 (2 constraints: 1b1dbd16) -org.checkerframework:checker-qual:3.5.0 (2 constraints: 171a3444) +org.checkerframework:checker-qual:3.7.0 (2 constraints: 191a7a44) org.clojure:clojure:1.8.0 (1 constraints: 0b050836) org.codehaus.groovy:groovy:2.4.4 (7 constraints: 1a5e98f7) org.codehaus.groovy:groovy-console:2.4.4 (1 constraints: c60f7280) @@ -239,7 +240,7 @@ org.eclipse.jetty.http2:http2-server:9.4.26.v20200117 (1 constraints: f90f7dd2) org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.3 (1 constraints: 3e0d291f) org.fusesource:sigar:1.6.4 (1 constraints: 990f7788) org.fusesource.jansi:jansi:1.11 (1 constraints: d704f230) -org.glassfish:jakarta.el:3.0.3 (2 constraints: f42529aa) +org.glassfish:jakarta.el:3.0.3 (2 constraints: bf231f5c) org.glassfish.hk2:hk2-api:2.6.1 (1 constraints: 6e0c620c) org.glassfish.hk2:hk2-locator:2.6.1 (1 constraints: 4410e0ad) org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277) @@ -248,17 +249,17 @@ org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277 org.glassfish.jersey.containers:jersey-container-servlet:2.30 (1 constraints: fa0dea31) org.glassfish.jersey.containers:jersey-container-servlet-core:2.30 (2 constraints: 96315577) org.glassfish.jersey.core:jersey-client:2.31 (2 constraints: 17348f89) -org.glassfish.jersey.core:jersey-common:2.31 (8 constraints: 699dafd9) -org.glassfish.jersey.core:jersey-server:2.31 (10 constraints: 05d9aa77) -org.glassfish.jersey.ext:jersey-bean-validation:2.30 (2 constraints: 3f2736c7) +org.glassfish.jersey.core:jersey-common:2.31 (8 constraints: 6b9d7fda) +org.glassfish.jersey.core:jersey-server:2.31 (10 constraints: a0d8b074) +org.glassfish.jersey.ext:jersey-bean-validation:2.31 (2 constraints: d9264b85) org.glassfish.jersey.ext:jersey-metainf-services:2.30 (1 constraints: fa0dea31) -org.glassfish.jersey.inject:jersey-hk2:2.30 (2 constraints: 3f2736c7) +org.glassfish.jersey.inject:jersey-hk2:2.31 (2 constraints: d9264b85) org.glassfish.jersey.media:jersey-media-jaxb:2.31 (1 constraints: d110c2b2) org.hamcrest:hamcrest:2.1 (2 constraints: df161b1d) org.hamcrest:hamcrest-core:2.1 (2 constraints: 2a1b2068) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3e103aa2) org.hibernate:hibernate-validator:4.3.0.Final (2 constraints: ee248003) -org.hibernate.validator:hibernate-validator:6.1.2.Final (2 constraints: 2a287b48) +org.hibernate.validator:hibernate-validator:6.1.2.Final (2 constraints: f5272f21) org.immutables:value:2.8.8 (1 constraints: 14051536) org.javassist:javassist:3.26.0-GA (3 constraints: 4b2fc487) org.jboss.logging:jboss-logging:3.4.1.Final (5 constraints: 39550c65) @@ -292,12 +293,12 @@ org.rocksdb:rocksdbjni:6.15.2 (1 constraints: 4005583b) org.slf4j:jcl-over-slf4j:1.7.30 (3 constraints: 432fe5ed) org.slf4j:jul-to-slf4j:1.7.30 (1 constraints: b30e965e) org.slf4j:log4j-over-slf4j:1.7.30 (3 constraints: 432fe5ed) -org.slf4j:slf4j-api:1.7.30 (61 constraints: fdb7b5e4) +org.slf4j:slf4j-api:1.7.30 (61 constraints: f1b210e0) org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308) org.wildfly.common:wildfly-common:1.5.4.Final (4 constraints: e9361c8d) org.xerial:sqlite-jdbc:3.30.1 (1 constraints: 39053e3b) org.xerial.snappy:snappy-java:1.1.1.7 (2 constraints: 5f1501e7) -org.yaml:snakeyaml:1.27 (5 constraints: 0b4c0273) +org.yaml:snakeyaml:1.27 (5 constraints: 0c4c2f73) [Test dependencies] cglib:cglib:3.2.8 (1 constraints: 1f0a62b5) @@ -306,11 +307,11 @@ com.github.peterwippermann.junit4:parameterized-suite:1.1.0 (1 constraints: 0405 com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b) com.github.tomakehurst:wiremock-standalone:2.27.2 (1 constraints: 3f054a3b) com.h2database:h2:1.4.190 (1 constraints: 7105af40) -com.palantir.conjure.java.api:test-utils:2.16.2 (1 constraints: 0d051036) +com.palantir.conjure.java.api:test-utils:2.16.2 (1 constraints: 3d05433b) com.palantir.remoting2:jersey-servers:2.6.3 (1 constraints: 0d050a36) com.palantir.remoting2:tracing:2.6.3 (1 constraints: 3310819c) com.palantir.safe-logging:preconditions-assertj:1.14.0 (1 constraints: 36052f3b) -com.palantir.tracing:tracing-test-utils:4.8.0 (1 constraints: 0e051736) +com.palantir.tracing:tracing-test-utils:4.11.0 (1 constraints: 0e051736) com.spotify.dataenum:dataenum:1.3.2 (1 constraints: e91058c1) io.dropwizard:dropwizard-testing:2.0.2 (1 constraints: 0605f735) junit:junit-dep:4.11 (1 constraints: ba1063b3) diff --git a/versions.props b/versions.props index 3b30c0fded5..864c7ee1669 100644 --- a/versions.props +++ b/versions.props @@ -19,11 +19,11 @@ com.oracle.database.jdbc:ojdbc8 = 21.1.0.0 com.palantir.common:streams = 1.9.1 com.palantir.config.crypto:encrypted-config-value-module = 2.1.0 com.palantir.conjure:conjure = 4.14.1 -com.palantir.conjure.java.api:* = 2.9.0 -com.palantir.conjure.java:* = 5.41.0 -com.palantir.conjure.java.runtime:* = 5.9.1 -com.palantir.dialogue:* = 1.81.0 -com.palantir.docker.compose:docker-compose-rule* = 1.3.0 +com.palantir.conjure.java.api:* = 2.16.2 +com.palantir.conjure.java:* = 5.43.0 +com.palantir.conjure.java.runtime:* = 6.12.0 +com.palantir.dialogue:* = 1.100.0 +com.palantir.docker.compose:docker-compose-rule* = 1.5.0 com.palantir.docker.proxy:docker-proxy-rule* = 1.1.1 com.palantir.refreshable:refreshable = 1.0.0 com.palantir.remoting2:* = 2.6.3 @@ -32,7 +32,7 @@ com.palantir.sls.versions:* = 0.12.1 com.palantir.tracing:* = 4.8.0 com.palantir.tritium:* = 0.16.8 com.squareup:javapoet = 1.13.0 -com.zaxxer:HikariCP = 4.0.0 +com.zaxxer:HikariCP = 4.0.1 io.airlift:airline = 0.9 io.dropwizard:* = 2.0.2 io.netty:* = 4.1.49.Final