diff --git a/atlasdb-api/build.gradle b/atlasdb-api/build.gradle index b182b2d9386..51fef02ad23 100644 --- a/atlasdb-api/build.gradle +++ b/atlasdb-api/build.gradle @@ -13,6 +13,7 @@ dependencies { compile group: 'javax.validation', name: 'validation-api' compile group: 'com.palantir.remoting-api', name: 'ssl-config' + compile group: 'com.palantir.remoting3', name: 'jaxrs-clients' processor group: 'org.immutables', name: 'value' diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/FakeQosClient.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/FakeQosClient.java new file mode 100644 index 00000000000..584b4422b1d --- /dev/null +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/FakeQosClient.java @@ -0,0 +1,31 @@ +/* + * Copyright 2017 Palantir Technologies, Inc. All rights reserved. + * + * Licensed under the BSD-3 License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://opensource.org/licenses/BSD-3-Clause + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.atlasdb.qos; + +public class FakeQosClient implements QosClient { + + private static final FakeQosClient DEFAULT = new FakeQosClient(); + + public static FakeQosClient getDefault() { + return DEFAULT; + } + + @Override + public void checkLimit() { + // no op + } +} diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/QosClient.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/QosClient.java new file mode 100644 index 00000000000..c31757ad665 --- /dev/null +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/qos/QosClient.java @@ -0,0 +1,21 @@ +/* + * Copyright 2017 Palantir Technologies, Inc. All rights reserved. + * + * Licensed under the BSD-3 License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://opensource.org/licenses/BSD-3-Clause + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.atlasdb.qos; + +public interface QosClient { + void checkLimit(); +} diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java index e44549f3584..c85ca3c1466 100644 --- a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java +++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java @@ -23,6 +23,8 @@ import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.qos.FakeQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.timestamp.TimestampService; import com.palantir.timestamp.TimestampStoreInvalidator; @@ -34,7 +36,8 @@ public interface AtlasDbFactory { default KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig) { - return createRawKeyValueService(config, leaderConfig, Optional.empty(), DEFAULT_INITIALIZE_ASYNC); + return createRawKeyValueService(config, leaderConfig, Optional.empty(), DEFAULT_INITIALIZE_ASYNC, + FakeQosClient.getDefault()); } /** @@ -46,13 +49,15 @@ default KeyValueService createRawKeyValueService( * absent. If both are present, they must match. * @param initializeAsync If the implementations supports it, and initializeAsync is true, the KVS will initialize * asynchronously when synchronous initialization fails. + * @param qosClient the client for checking limits from the Quality-of-Service service. * @return The requested KeyValueService instance */ KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional namespace, - boolean initializeAsync); + boolean initializeAsync, + QosClient qosClient); default TimestampService createTimestampService(KeyValueService rawKvs) { return createTimestampService(rawKvs, Optional.empty(), DEFAULT_INITIALIZE_ASYNC); diff --git a/atlasdb-api/versions.lock b/atlasdb-api/versions.lock index f71306031a2..61c8a7a07ff 100644 --- a/atlasdb-api/versions.lock +++ b/atlasdb-api/versions.lock @@ -11,13 +11,63 @@ "com.fasterxml.jackson.core:jackson-core": { "locked": "2.6.7", "transitive": [ - "com.fasterxml.jackson.core:jackson-databind" + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" ] }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.6.7", "transitive": [ - "com.palantir.remoting-api:ssl-config" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" ] }, "com.google.code.findbugs:annotations": { @@ -29,15 +79,58 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils" ] }, "com.google.guava:guava": { "locked": "18.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.atlasdb:atlasdb-commons": { @@ -52,20 +145,129 @@ "com.palantir.atlasdb:timestamp-api": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { - "locked": "1.4.0" + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1" + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" ] }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -75,7 +277,10 @@ "locked": "2.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -87,10 +292,22 @@ "org.apache.commons:commons-lang3": { "locked": "3.1" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "io.dropwizard.metrics:metrics-core" ] } @@ -107,13 +324,63 @@ "com.fasterxml.jackson.core:jackson-core": { "locked": "2.6.7", "transitive": [ - "com.fasterxml.jackson.core:jackson-databind" + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" ] }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.6.7", "transitive": [ - "com.palantir.remoting-api:ssl-config" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" ] }, "com.google.code.findbugs:annotations": { @@ -125,15 +392,58 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils" ] }, "com.google.guava:guava": { "locked": "18.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.atlasdb:atlasdb-commons": { @@ -148,20 +458,129 @@ "com.palantir.atlasdb:timestamp-api": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { - "locked": "1.4.0" + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1" + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" ] }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -171,7 +590,10 @@ "locked": "2.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -183,10 +605,22 @@ "org.apache.commons:commons-lang3": { "locked": "3.1" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "io.dropwizard.metrics:metrics-core" ] } diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java index 6fbb85950a6..89dfb90c83a 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java @@ -28,6 +28,7 @@ import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl; import com.palantir.atlasdb.keyvalue.cassandra.CassandraTimestampBoundStore; import com.palantir.atlasdb.keyvalue.cassandra.CassandraTimestampStoreInvalidator; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.atlasdb.versions.AtlasDbVersion; @@ -43,13 +44,15 @@ public KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional namespace, - boolean initializeAsync) { + boolean initializeAsync, + QosClient qosClient) { AtlasDbVersion.ensureVersionReported(); CassandraKeyValueServiceConfig preprocessedConfig = preprocessKvsConfig(config, namespace); return CassandraKeyValueServiceImpl.create( CassandraKeyValueServiceConfigManager.createSimpleManager(preprocessedConfig), leaderConfig, - initializeAsync); + initializeAsync, + qosClient); } @VisibleForTesting diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java index ba3b05045fa..2fa3578d295 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java @@ -37,7 +37,7 @@ import org.apache.cassandra.thrift.UnavailableException; import org.apache.thrift.TException; -import com.palantir.atlasdb.qos.AtlasDbQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.processors.AutoDelegate; /** @@ -47,9 +47,9 @@ @SuppressWarnings({"checkstyle:all", "DuplicateThrows"}) // :'( public class CassandraClient extends AutoDelegate_Client { private final Cassandra.Client delegate; - private final AtlasDbQosClient qosClient; + private final QosClient qosClient; - public CassandraClient(Cassandra.Client delegate, AtlasDbQosClient qosClient) { + public CassandraClient(Cassandra.Client delegate, QosClient qosClient) { super(delegate.getInputProtocol()); this.delegate = delegate; this.qosClient = qosClient; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java index c77f4e52e59..18cfe8fef20 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java @@ -46,7 +46,7 @@ import com.google.common.collect.Maps; import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.qos.AtlasDbQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.common.exception.AtlasDbDependencyException; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; @@ -67,11 +67,11 @@ public SSLSocketFactory load(InetSocketAddress host) throws Exception { } }); - private final AtlasDbQosClient qosClient; + private final QosClient qosClient; private final InetSocketAddress addr; private final CassandraKeyValueServiceConfig config; - public CassandraClientFactory(AtlasDbQosClient qosClient, + public CassandraClientFactory(QosClient qosClient, InetSocketAddress addr, CassandraKeyValueServiceConfig config) { this.qosClient = qosClient; @@ -92,7 +92,7 @@ public Client create() throws Exception { } } - private static Cassandra.Client getClient(AtlasDbQosClient qosClient, + private static Cassandra.Client getClient(QosClient qosClient, InetSocketAddress addr, CassandraKeyValueServiceConfig config) throws Exception { Client ret = getWrappedClient(qosClient, addr, config); @@ -111,7 +111,7 @@ private static Cassandra.Client getClient(AtlasDbQosClient qosClient, } } - private static Client getWrappedClient(AtlasDbQosClient qosClient, + private static Client getWrappedClient(QosClient qosClient, InetSocketAddress addr, CassandraKeyValueServiceConfig config) throws TException { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java index f9ed244849b..b3c29ddfefb 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java @@ -31,7 +31,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; -import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ThreadLocalRandom; @@ -51,7 +50,6 @@ import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; -import com.codahale.metrics.InstrumentedScheduledExecutorService; import com.codahale.metrics.Meter; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -74,9 +72,8 @@ import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientFactory.ClientCreationFailedException; -import com.palantir.atlasdb.qos.AtlasDbQosClient; -import com.palantir.atlasdb.qos.QosService; -import com.palantir.atlasdb.util.AtlasDbMetrics; +import com.palantir.atlasdb.qos.FakeQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.base.Throwables; @@ -155,7 +152,7 @@ public void shutdown() { private final CassandraKeyValueServiceConfig config; private final Map currentPools = Maps.newConcurrentMap(); private final StartupChecks startupChecks; - private final AtlasDbQosClient qosClient; + private final QosClient qosClient; private final ScheduledExecutorService refreshDaemon; private final MetricsManager metricsManager = new MetricsManager(); private final RequestMetrics aggregateMetrics = new RequestMetrics(null); @@ -168,36 +165,29 @@ public void shutdown() { @VisibleForTesting static CassandraClientPoolImpl createImplForTest(CassandraKeyValueServiceConfig config, StartupChecks startupChecks) { - return create(config, startupChecks, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC); + return create(config, startupChecks, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC, FakeQosClient.getDefault()); } public static CassandraClientPool create(CassandraKeyValueServiceConfig config) { - return create(config, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC); + return create(config, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC, FakeQosClient.getDefault()); } - public static CassandraClientPool create(CassandraKeyValueServiceConfig config, boolean initializeAsync) { - CassandraClientPoolImpl cassandraClientPool = create(config, - StartupChecks.RUN, initializeAsync); + public static CassandraClientPool create(CassandraKeyValueServiceConfig config, boolean initializeAsync, + QosClient qosClient) { + CassandraClientPoolImpl cassandraClientPool = create(config, StartupChecks.RUN, initializeAsync, qosClient); return cassandraClientPool.wrapper.isInitialized() ? cassandraClientPool : cassandraClientPool.wrapper; } private static CassandraClientPoolImpl create(CassandraKeyValueServiceConfig config, - StartupChecks startupChecks, boolean initializeAsync) { - // TODO eventually we'll want to pass this in from somewhere - QosService qosResource = client -> Long.MAX_VALUE; - - ScheduledExecutorService scheduler = new InstrumentedScheduledExecutorService( - Executors.newSingleThreadScheduledExecutor(), - AtlasDbMetrics.getMetricRegistry(), - "qos-client-executor"); - AtlasDbQosClient qosClient = AtlasDbQosClient.create(scheduler, qosResource, config.getKeyspaceOrThrow()); + StartupChecks startupChecks, boolean initializeAsync, QosClient qosClient) { CassandraClientPoolImpl cassandraClientPool = new CassandraClientPoolImpl(config, startupChecks, qosClient); cassandraClientPool.wrapper.initialize(initializeAsync); return cassandraClientPool; } + private CassandraClientPoolImpl(CassandraKeyValueServiceConfig config, StartupChecks startupChecks, - AtlasDbQosClient qosClient) { + QosClient qosClient) { this.config = config; this.startupChecks = startupChecks; this.qosClient = qosClient; diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java index dd48bebb3cd..e9e6b206a15 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java @@ -40,7 +40,7 @@ import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig; -import com.palantir.atlasdb.qos.AtlasDbQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.util.MetricsManager; import com.palantir.common.base.FunctionCheckedException; import com.palantir.common.pooling.PoolingContainer; @@ -50,7 +50,7 @@ public class CassandraClientPoolingContainer implements PoolingContainer { private static final Logger log = LoggerFactory.getLogger(CassandraClientPoolingContainer.class); - private final AtlasDbQosClient qosClient; + private final QosClient qosClient; private final InetSocketAddress host; private final CassandraKeyValueServiceConfig config; private final MetricsManager metricsManager = new MetricsManager(); @@ -58,7 +58,7 @@ public class CassandraClientPoolingContainer implements PoolingContainer private final AtomicInteger openRequests = new AtomicInteger(); private final GenericObjectPool clientPool; - public CassandraClientPoolingContainer(AtlasDbQosClient qosClient, + public CassandraClientPoolingContainer(QosClient qosClient, InetSocketAddress host, CassandraKeyValueServiceConfig config, int poolNumber) { diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java index 49058f401cb..8eedb67b311 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java @@ -43,6 +43,7 @@ import com.palantir.atlasdb.keyvalue.cassandra.jmx.CassandraJmxCompactionManager; import com.palantir.atlasdb.keyvalue.impl.Cells; import com.palantir.atlasdb.keyvalue.impl.KeyValueServices; +import com.palantir.atlasdb.qos.FakeQosClient; import com.palantir.common.base.Throwables; import com.palantir.common.collect.Maps2; @@ -68,7 +69,7 @@ private CassandraExpiringKeyValueService( Optional leaderConfig, boolean initializeAsync) { super(LoggerFactory.getLogger(CassandraKeyValueService.class), configManager, compactionManager, leaderConfig, - initializeAsync); + initializeAsync, FakeQosClient.getDefault()); } @Override diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java index cfdf0b7b871..e858a1f5ceb 100644 --- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java +++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java @@ -121,6 +121,8 @@ import com.palantir.atlasdb.keyvalue.impl.KeyValueServices; import com.palantir.atlasdb.keyvalue.impl.LocalRowColumnRangeIterator; import com.palantir.atlasdb.logging.LoggingArgs; +import com.palantir.atlasdb.qos.FakeQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.util.AnnotatedCallable; import com.palantir.atlasdb.util.AnnotationType; import com.palantir.common.annotation.Idempotent; @@ -222,8 +224,19 @@ public static CassandraKeyValueService create( CassandraKeyValueServiceConfigManager configManager, Optional leaderConfig, boolean initializeAsync) { - return create(configManager, leaderConfig, LoggerFactory.getLogger(CassandraKeyValueService.class), - initializeAsync); + return create(configManager, leaderConfig, initializeAsync, FakeQosClient.getDefault()); + } + + public static CassandraKeyValueService create( + CassandraKeyValueServiceConfigManager configManager, + Optional leaderConfig, + boolean initializeAsync, + QosClient qosClient) { + return create(configManager, + leaderConfig, + LoggerFactory.getLogger(CassandraKeyValueService.class), + initializeAsync, + qosClient); } @VisibleForTesting @@ -231,18 +244,25 @@ static CassandraKeyValueService create( CassandraKeyValueServiceConfigManager configManager, Optional leaderConfig, Logger log) { - return create(configManager, leaderConfig, log, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC); + return create(configManager, leaderConfig, log, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC, + FakeQosClient.getDefault()); } private static CassandraKeyValueService create( CassandraKeyValueServiceConfigManager configManager, Optional leaderConfig, Logger log, - boolean initializeAsync) { + boolean initializeAsync, + QosClient qosClient) { Optional compactionManager = CassandraJmxCompaction.createJmxCompactionManager(configManager); - CassandraKeyValueServiceImpl keyValueService = - new CassandraKeyValueServiceImpl(log, configManager, compactionManager, leaderConfig, initializeAsync); + CassandraKeyValueServiceImpl keyValueService = new CassandraKeyValueServiceImpl( + log, + configManager, + compactionManager, + leaderConfig, + initializeAsync, + qosClient); keyValueService.wrapper.initialize(initializeAsync); return keyValueService.wrapper.isInitialized() ? keyValueService : keyValueService.wrapper; } @@ -251,12 +271,13 @@ protected CassandraKeyValueServiceImpl(Logger log, CassandraKeyValueServiceConfigManager configManager, Optional compactionManager, Optional leaderConfig, - boolean initializeAsync) { + boolean initializeAsync, + QosClient qosClient) { super(AbstractKeyValueService.createFixedThreadPool("Atlas Cassandra KVS", configManager.getConfig().poolSize() * configManager.getConfig().servers().size())); this.log = log; this.configManager = configManager; - this.clientPool = CassandraClientPoolImpl.create(configManager.getConfig(), initializeAsync); + this.clientPool = CassandraClientPoolImpl.create(configManager.getConfig(), initializeAsync, qosClient); this.compactionManager = compactionManager; this.leaderConfig = leaderConfig; this.hiddenTables = new HiddenTables(); diff --git a/atlasdb-cassandra/versions.lock b/atlasdb-cassandra/versions.lock index 1f9f722203b..9d2cf2014e0 100644 --- a/atlasdb-cassandra/versions.lock +++ b/atlasdb-cassandra/versions.lock @@ -37,14 +37,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", "com.palantir.remoting3:keystores", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -65,7 +69,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -109,9 +114,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -122,7 +130,11 @@ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-processors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -154,6 +166,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -227,10 +272,23 @@ "locked": "3.0.3-p5", "requested": "3.0.3-p5" }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", "com.palantir.remoting3:keystores" ] }, @@ -240,22 +298,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:keystores": { - "locked": "3.5.1" + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -264,6 +369,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -272,6 +378,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -321,6 +433,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -347,7 +480,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.netty:netty-buffer": { @@ -394,7 +528,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -447,6 +584,12 @@ "locked": "1.4.11.Final", "requested": "1.4.11.Final" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -468,8 +611,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -527,14 +675,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", "com.palantir.remoting3:keystores", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -555,7 +707,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -599,9 +752,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -612,7 +768,11 @@ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-processors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -644,6 +804,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -717,10 +910,23 @@ "locked": "3.0.3-p5", "requested": "3.0.3-p5" }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", "com.palantir.remoting3:keystores" ] }, @@ -730,22 +936,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:keystores": { - "locked": "3.5.1" + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -754,6 +1007,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -762,6 +1016,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -811,6 +1071,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -837,7 +1118,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.netty:netty-buffer": { @@ -884,7 +1166,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -937,6 +1222,12 @@ "locked": "1.4.11.Final", "requested": "1.4.11.Final" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -958,8 +1249,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-cli-distribution/versions.lock b/atlasdb-cli-distribution/versions.lock index 8533e6b21e6..09c09fed315 100644 --- a/atlasdb-cli-distribution/versions.lock +++ b/atlasdb-cli-distribution/versions.lock @@ -75,12 +75,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -235,11 +237,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -258,7 +262,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -313,6 +320,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -566,7 +606,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -606,16 +647,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -626,7 +684,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -638,9 +710,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -721,10 +801,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -789,7 +879,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -862,7 +953,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -946,6 +1038,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -979,11 +1077,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-cli/versions.lock b/atlasdb-cli/versions.lock index b9b3569a2c0..e6bc5fe3ca2 100644 --- a/atlasdb-cli/versions.lock +++ b/atlasdb-cli/versions.lock @@ -70,11 +70,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -218,11 +220,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -243,7 +247,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -286,6 +293,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -490,7 +530,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -523,16 +564,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -543,7 +601,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -555,9 +627,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -638,10 +718,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -689,7 +779,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -763,7 +854,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -833,6 +925,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -860,9 +958,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -963,11 +1064,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1111,11 +1214,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1133,7 +1238,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1176,6 +1284,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1380,7 +1521,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1413,16 +1555,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1433,7 +1592,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1445,9 +1618,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1528,10 +1709,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1579,7 +1770,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1652,7 +1844,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1722,6 +1915,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1749,9 +1948,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/qos/AtlasDbQosClient.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/qos/AtlasDbQosClient.java index 741844a3f5d..7ce05041a93 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/qos/AtlasDbQosClient.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/qos/AtlasDbQosClient.java @@ -20,33 +20,24 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -@SuppressWarnings("FinalClass") -public class AtlasDbQosClient { - QosService qosService; +public class AtlasDbQosClient implements QosClient { + private volatile long credits; - volatile long credits; - - private AtlasDbQosClient(QosService qosService) { - this.qosService = qosService; - } - - public static AtlasDbQosClient create(ScheduledExecutorService scheduler, QosService qosService, + public AtlasDbQosClient(QosService qosService, + ScheduledExecutorService limitRefresher, String clientName) { - AtlasDbQosClient client = new AtlasDbQosClient(qosService); - - scheduler.scheduleAtFixedRate(() -> { + limitRefresher.scheduleAtFixedRate(() -> { try { - client.credits = qosService.getLimit(clientName); + credits = qosService.getLimit(clientName); } catch (Exception e) { // do nothing } - }, 0L, 1L, TimeUnit.SECONDS); - - return client; + }, 0L, 60L, TimeUnit.SECONDS); } // The KVS layer should call this before every read/write operation // Currently all operations are treated equally; each uses up a unit of credits + @Override public void checkLimit() { // always return immediately - i.e. no backoff // TODO if soft-limited, pause diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/qos/AtlasDbQosClientTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/qos/AtlasDbQosClientTest.java index f9eacfd3c96..b224c25bcfe 100644 --- a/atlasdb-client/src/test/java/com/palantir/atlasdb/qos/AtlasDbQosClientTest.java +++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/qos/AtlasDbQosClientTest.java @@ -37,14 +37,14 @@ public void setUp() { @Test public void doesNotBackOff() { - AtlasDbQosClient qosClient = AtlasDbQosClient.create(scheduler, qosService, "test-client"); + AtlasDbQosClient qosClient = new AtlasDbQosClient(qosService, scheduler, "test-client"); scheduler.tick(1L, TimeUnit.MILLISECONDS); qosClient.checkLimit(); } @Test public void throwsAfterLimitExceeded() { - AtlasDbQosClient qosClient = AtlasDbQosClient.create(scheduler, qosService, "test-client"); + AtlasDbQosClient qosClient = new AtlasDbQosClient(qosService, scheduler, "test-client"); scheduler.tick(1L, TimeUnit.MILLISECONDS); qosClient.checkLimit(); @@ -53,15 +53,15 @@ public void throwsAfterLimitExceeded() { @Test public void canCheckAgainAfterRefreshPeriod() { - AtlasDbQosClient qosClient = AtlasDbQosClient.create(scheduler, qosService, "test-client"); + AtlasDbQosClient qosClient = new AtlasDbQosClient(qosService, scheduler, "test-client"); scheduler.tick(1L, TimeUnit.MILLISECONDS); qosClient.checkLimit(); - assertThatThrownBy(qosClient::checkLimit).isInstanceOf(RuntimeException.class); + assertThatThrownBy(qosClient::checkLimit) + .isInstanceOf(RuntimeException.class).hasMessage("Rate limit exceeded"); - scheduler.tick(1L, TimeUnit.SECONDS); + scheduler.tick(60L, TimeUnit.SECONDS); qosClient.checkLimit(); } - } diff --git a/atlasdb-client/versions.lock b/atlasdb-client/versions.lock index 6b0e4745ae4..c10f8a95a99 100644 --- a/atlasdb-client/versions.lock +++ b/atlasdb-client/versions.lock @@ -27,11 +27,16 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -51,7 +56,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -85,9 +91,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -96,6 +105,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -116,6 +130,39 @@ "locked": "1.2", "requested": "1.2" }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true }, @@ -143,10 +190,24 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -155,24 +216,75 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -181,6 +293,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -227,6 +345,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "requested": "1.9.0" @@ -238,7 +377,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -253,7 +393,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -271,6 +414,12 @@ "org.hdrhistogram:HdrHistogram": { "locked": "2.1.10" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -280,8 +429,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -323,11 +477,16 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -347,7 +506,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -381,9 +541,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -392,6 +555,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -412,6 +580,39 @@ "locked": "1.2", "requested": "1.2" }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true }, @@ -439,10 +640,24 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -451,24 +666,75 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -477,6 +743,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -523,6 +795,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "requested": "1.9.0" @@ -534,7 +827,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -549,7 +843,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -567,6 +864,12 @@ "org.hdrhistogram:HdrHistogram": { "locked": "2.1.10" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -576,8 +879,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-commons/versions.lock b/atlasdb-commons/versions.lock index 6755ffe0463..8c2b90b9d55 100644 --- a/atlasdb-commons/versions.lock +++ b/atlasdb-commons/versions.lock @@ -10,7 +10,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9" + "locked": "3.0.1" }, "com.google.guava:guava": { "locked": "18.0" @@ -48,7 +48,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9" + "locked": "3.0.1" }, "com.google.guava:guava": { "locked": "18.0" diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java index 6161854ad4c..f002768a407 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java @@ -35,6 +35,8 @@ @Value.Immutable public abstract class AtlasDbConfig { + static final String UNSPECIFIED_NAMESPACE = "unspecifed"; + public abstract KeyValueServiceConfig keyValueService(); public abstract Optional leader(); @@ -283,6 +285,12 @@ private void checkLockAndTimestampBlocks() { } private void checkNamespaceConfig() { + getNamespaceString(); + } + + @Value.Derived + @JsonIgnore + public String getNamespaceString() { if (namespace().isPresent()) { String namespace = namespace().get(); @@ -295,12 +303,13 @@ private void checkNamespaceConfig() { Preconditions.checkState(client.equals(namespace), "If present, the TimeLock client config should be the same as the" + " atlas root-level namespace config."))); + return namespace; } else if (!(keyValueService() instanceof InMemoryAtlasDbConfig)) { Preconditions.checkState(keyValueService().namespace().isPresent(), "Either the atlas root-level namespace" + " or the keyspace/dbName/sid config needs to be set."); - Optional keyValueServiceNamespace = keyValueService().namespace(); + String keyValueServiceNamespace = keyValueService().namespace().get(); if (timelock().isPresent()) { TimeLockClientConfig timeLockConfig = timelock().get(); @@ -313,17 +322,19 @@ private void checkNamespaceConfig() { // (C* keyspace / Postgres dbName / Oracle sid). But changing the name of the TimeLock client // will return the timestamp bound store to 0, so we also need to fast forward the new client bound // to a value above of the original bound. - Preconditions.checkState(timeLockConfig.client().equals(keyValueServiceNamespace), + Preconditions.checkState(timeLockConfig.client().equals(Optional.of(keyValueServiceNamespace)), "AtlasDB refused to start, in order to avoid potential data corruption." + " Please contact AtlasDB support to remediate this. Specific steps are required;" + " DO NOT ATTEMPT TO FIX THIS YOURSELF."); } + return keyValueServiceNamespace; } else if (timelock().isPresent()) { // Special case - empty timelock and empty namespace/keyspace does not make sense - boolean timelockClientNonEmpty = !timelock().get().client().orElse("").isEmpty(); - Preconditions.checkState(timelockClientNonEmpty, + Preconditions.checkState(timelock().get().client().isPresent(), "For InMemoryKVS, the TimeLock client should not be empty"); + return timelock().get().client().get(); } + return UNSPECIFIED_NAMESPACE; } private boolean areTimeAndLockConfigsAbsent() { diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java index 5732795b2c8..dc2a1909aa9 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java @@ -16,11 +16,14 @@ package com.palantir.atlasdb.config; +import java.util.Optional; + import org.immutables.value.Value; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.atlasdb.AtlasDbConstants; +import com.palantir.remoting.api.config.service.ServiceConfiguration; @JsonDeserialize(as = ImmutableAtlasDbRuntimeConfig.class) @JsonSerialize(as = ImmutableAtlasDbRuntimeConfig.class) @@ -58,6 +61,8 @@ public long getTimestampCacheSize() { return AtlasDbConstants.DEFAULT_TIMESTAMP_CACHE_SIZE; } + public abstract Optional getQosServiceConfiguration(); + public static ImmutableAtlasDbRuntimeConfig defaultRuntimeConfig() { return ImmutableAtlasDbRuntimeConfig.builder().build(); } diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java index 861b877dd3a..180551f6e89 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java @@ -37,6 +37,8 @@ import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.qos.FakeQosClient; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.timestamp.TimestampService; @@ -56,7 +58,8 @@ public class ServiceDiscoveringAtlasSupplier { private final Supplier timestampStoreInvalidator; public ServiceDiscoveringAtlasSupplier(KeyValueServiceConfig config, Optional leaderConfig) { - this(config, leaderConfig, Optional.empty(), AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC); + this(config, leaderConfig, Optional.empty(), AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC, + FakeQosClient.getDefault()); } public ServiceDiscoveringAtlasSupplier( @@ -64,15 +67,17 @@ public ServiceDiscoveringAtlasSupplier( Optional leaderConfig, Optional namespace, Optional timestampTable) { - this(config, leaderConfig, namespace, timestampTable, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC); + this(config, leaderConfig, namespace, timestampTable, AtlasDbConstants.DEFAULT_INITIALIZE_ASYNC, + FakeQosClient.getDefault()); } public ServiceDiscoveringAtlasSupplier( KeyValueServiceConfig config, Optional leaderConfig, Optional namespace, - boolean initializeAsync) { - this(config, leaderConfig, namespace, Optional.empty(), initializeAsync); + boolean initializeAsync, + QosClient qosClient) { + this(config, leaderConfig, namespace, Optional.empty(), initializeAsync, qosClient); } public ServiceDiscoveringAtlasSupplier( @@ -80,7 +85,8 @@ public ServiceDiscoveringAtlasSupplier( Optional leaderConfig, Optional namespace, Optional timestampTable, - boolean initializeAsync) { + boolean initializeAsync, + QosClient qosClient) { this.config = config; this.leaderConfig = leaderConfig; @@ -92,7 +98,12 @@ public ServiceDiscoveringAtlasSupplier( + " Have you annotated it with @AutoService(AtlasDbFactory.class)?" )); keyValueService = Suppliers.memoize( - () -> atlasFactory.createRawKeyValueService(config, leaderConfig, namespace, initializeAsync)); + () -> atlasFactory.createRawKeyValueService( + config, + leaderConfig, + namespace, + initializeAsync, + qosClient)); timestampService = () -> atlasFactory.createTimestampService(getKeyValueService(), timestampTable, initializeAsync); timestampStoreInvalidator = () -> atlasFactory.createTimestampStoreInvalidator(getKeyValueService()); diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java index c51db40aed2..495122f65eb 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java @@ -18,6 +18,8 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Supplier; @@ -28,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.codahale.metrics.InstrumentedScheduledExecutorService; import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.annotations.VisibleForTesting; @@ -68,6 +71,10 @@ import com.palantir.atlasdb.persistentlock.KvsBackedPersistentLockService; import com.palantir.atlasdb.persistentlock.NoOpPersistentLockService; import com.palantir.atlasdb.persistentlock.PersistentLockService; +import com.palantir.atlasdb.qos.AtlasDbQosClient; +import com.palantir.atlasdb.qos.FakeQosClient; +import com.palantir.atlasdb.qos.QosClient; +import com.palantir.atlasdb.qos.QosService; import com.palantir.atlasdb.schema.generated.SweepTableFactory; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; @@ -108,6 +115,9 @@ import com.palantir.lock.impl.LockServiceImpl; import com.palantir.lock.v2.TimelockService; import com.palantir.logsafe.UnsafeArg; +import com.palantir.remoting.api.config.service.ServiceConfiguration; +import com.palantir.remoting3.clients.ClientConfigurations; +import com.palantir.remoting3.jaxrs.JaxRsClient; import com.palantir.timestamp.TimestampService; import com.palantir.timestamp.TimestampStoreInvalidator; import com.palantir.util.OptionalResolver; @@ -304,9 +314,16 @@ SerializableTransactionManager serializable() { java.util.function.Supplier runtimeConfigSupplier = () -> runtimeConfigSupplier().get().orElse(defaultRuntime); + + QosClient qosClient = getQosClient(runtimeConfigSupplier.get().getQosServiceConfiguration()); + ServiceDiscoveringAtlasSupplier atlasFactory = - new ServiceDiscoveringAtlasSupplier(config.keyValueService(), config.leader(), config.namespace(), - config.initializeAsync()); + new ServiceDiscoveringAtlasSupplier( + config.keyValueService(), + config.leader(), + config.namespace(), + config.initializeAsync(), + qosClient); KeyValueService rawKvs = atlasFactory.getKeyValueService(); LockRequest.setDefaultLockTimeout( @@ -392,6 +409,21 @@ SerializableTransactionManager serializable() { return transactionManager; } + private QosClient getQosClient(Optional serviceConfiguration) { + return serviceConfiguration.map(this::createAtlasDbQosClient).orElseGet(FakeQosClient::getDefault); + } + + private QosClient createAtlasDbQosClient(ServiceConfiguration serviceConfiguration) { + QosService qosService = JaxRsClient.create(QosService.class, + userAgent(), + ClientConfigurations.of(serviceConfiguration)); + ScheduledExecutorService scheduler = new InstrumentedScheduledExecutorService( + Executors.newSingleThreadScheduledExecutor(), + AtlasDbMetrics.getMetricRegistry(), + "qos-client-executor"); + return new AtlasDbQosClient(qosService, scheduler, config().getNamespaceString()); + } + private static boolean areTransactionManagerInitializationPrerequisitesSatisfied( AsyncInitializer initializer, LockAndTimestampServices lockAndTimestampServices) { diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java index d9a02a12fd2..641cc7921c6 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java @@ -17,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; @@ -54,23 +55,25 @@ public class AtlasDbConfigTest { private static final Optional OTHER_SSL_CONFIG = Optional.of(mock(SslConfiguration.class)); private static final Optional NO_SSL_CONFIG = Optional.empty(); + private static final String TEST_NAMESPACE = "client"; + private static final String OTHER_CLIENT = "other-client"; + private static final TimeLockClientConfig TIMELOCK_CONFIG_WITH_EMPTY_CLIENT = ImmutableTimeLockClientConfig .builder() .client(Optional.empty()) .serversList(DEFAULT_SERVER_LIST) .build(); - private static final TimeLockClientConfig TIMELOCK_CONFIG_WITH_OTHER_CLIENT = ImmutableTimeLockClientConfig .builder() - .client("other-client") + .client(OTHER_CLIENT) .serversList(DEFAULT_SERVER_LIST) .build(); @BeforeClass public static void setUp() { when(KVS_CONFIG_WITHOUT_NAMESPACE.namespace()).thenReturn(Optional.empty()); - when(KVS_CONFIG_WITH_OTHER_NAMESPACE.namespace()).thenReturn(Optional.of("other-client")); - when(KVS_CONFIG_WITH_NAMESPACE.namespace()).thenReturn(Optional.of("client")); + when(KVS_CONFIG_WITH_OTHER_NAMESPACE.namespace()).thenReturn(Optional.of(OTHER_CLIENT)); + when(KVS_CONFIG_WITH_NAMESPACE.namespace()).thenReturn(Optional.of(TEST_NAMESPACE)); } @Test @@ -92,6 +95,7 @@ public void configWithLeaderBlockIsValid() { .keyValueService(KVS_CONFIG_WITH_NAMESPACE) .leader(LEADER_CONFIG) .build(); + assertThat(config.getNamespaceString(), equalTo(TEST_NAMESPACE)); assertThat(config, not(nullValue())); } @@ -101,6 +105,7 @@ public void configWithTimelockBlockIsValid() { .keyValueService(KVS_CONFIG_WITH_NAMESPACE) .timelock(TIMELOCK_CONFIG) .build(); + assertThat(config.getNamespaceString(), equalTo(TEST_NAMESPACE)); assertThat(config, not(nullValue())); } @@ -111,6 +116,7 @@ public void remoteLockAndTimestampConfigIsValid() { .lock(DEFAULT_SERVER_LIST) .timestamp(DEFAULT_SERVER_LIST) .build(); + assertThat(config.getNamespaceString(), equalTo(TEST_NAMESPACE)); assertThat(config, not(nullValue())); } @@ -211,11 +217,12 @@ public void absentNamespaceRequiresMatchingKvsNamespaceAndTimelockClient() { @Test public void namespaceAcceptsEmptyKvsNamespaceAndTimelockClient() { - ImmutableAtlasDbConfig.builder() + AtlasDbConfig config = ImmutableAtlasDbConfig.builder() .namespace("a client") .keyValueService(KVS_CONFIG_WITHOUT_NAMESPACE) .timelock(TIMELOCK_CONFIG_WITH_EMPTY_CLIENT) .build(); + assertThat(config.getNamespaceString(), equalTo("a client")); } @Test @@ -223,10 +230,11 @@ public void inMemoryConfigCanHaveEmptyNamespace() { InMemoryAtlasDbConfig kvsConfig = new InMemoryAtlasDbConfig(); assertFalse("This test assumes the InMemoryAtlasDbConfig has no namespace by default", kvsConfig.namespace().isPresent()); - ImmutableAtlasDbConfig.builder() + ImmutableAtlasDbConfig config = ImmutableAtlasDbConfig.builder() .namespace(Optional.empty()) .keyValueService(kvsConfig) .build(); + assertThat(config.getNamespaceString(), equalTo(AtlasDbConfig.UNSPECIFIED_NAMESPACE)); } @Test @@ -234,10 +242,11 @@ public void inMemoryConfigWorksWithNonTestNamespace() { InMemoryAtlasDbConfig kvsConfig = new InMemoryAtlasDbConfig(); assertFalse("This test assumes the InMemoryAtlasDbConfig has no namespace by default", kvsConfig.namespace().isPresent()); - ImmutableAtlasDbConfig.builder() + AtlasDbConfig config = ImmutableAtlasDbConfig.builder() .namespace("clive") .keyValueService(kvsConfig) .build(); + assertThat(config.getNamespaceString(), equalTo("clive")); } @Test @@ -261,16 +270,17 @@ public void inMemoryKeyspaceAndTimelockClientCanBeDifferent() { InMemoryAtlasDbConfig kvsConfig = new InMemoryAtlasDbConfig(); assertFalse("This test assumes the InMemoryAtlasDbConfig has no namespace by default", kvsConfig.namespace().isPresent()); - ImmutableAtlasDbConfig.builder() + ImmutableAtlasDbConfig config = ImmutableAtlasDbConfig.builder() .keyValueService(kvsConfig) .timelock(TIMELOCK_CONFIG_WITH_OTHER_CLIENT) .build(); + assertThat(config.getNamespaceString(), equalTo(OTHER_CLIENT)); } @Test public void namespaceAndTimelockClientShouldMatch() { assertThatThrownBy(() -> ImmutableAtlasDbConfig.builder() - .namespace("client") + .namespace(TEST_NAMESPACE) .keyValueService(KVS_CONFIG_WITHOUT_NAMESPACE) .timelock(TIMELOCK_CONFIG_WITH_OTHER_CLIENT) .build()) @@ -282,7 +292,7 @@ public void namespaceAndTimelockClientShouldMatch() { @Test public void namespaceAndKvsNamespaceShouldMatch() { assertThatThrownBy(() -> ImmutableAtlasDbConfig.builder() - .namespace("client") + .namespace(TEST_NAMESPACE) .keyValueService(KVS_CONFIG_WITH_OTHER_NAMESPACE) .timelock(TIMELOCK_CONFIG_WITH_EMPTY_CLIENT) .build()) @@ -299,6 +309,7 @@ public void addingFallbackSslAddsItToLeaderBlock() { .build(); AtlasDbConfig withSsl = AtlasDbConfigs.addFallbackSslConfigurationToAtlasDbConfig(withoutSsl, SSL_CONFIG); assertThat(withSsl.leader().get().sslConfiguration(), is(SSL_CONFIG)); + assertThat(withoutSsl.getNamespaceString(), equalTo(TEST_NAMESPACE)); } @Test @@ -310,6 +321,7 @@ public void addingFallbackSslAddsItToLockBlock() { .build(); AtlasDbConfig withSsl = AtlasDbConfigs.addFallbackSslConfigurationToAtlasDbConfig(withoutSsl, SSL_CONFIG); assertThat(withSsl.lock().get().sslConfiguration(), is(SSL_CONFIG)); + assertThat(withoutSsl.getNamespaceString(), equalTo(TEST_NAMESPACE)); } @Test diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java index c7764bfa828..c44d5202edd 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java @@ -28,6 +28,7 @@ import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.timestamp.TimestampService; @@ -51,7 +52,8 @@ public KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional unused, - boolean initializeAsync) { + boolean initializeAsync, + QosClient unusedQosClient) { if (initializeAsync) { log.warn("Asynchronous initialization not implemented, will initialize synchronousy."); } diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java index 5bb5a1dca5f..39bdab46bca 100644 --- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java +++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java @@ -193,6 +193,7 @@ public void setup() throws JsonProcessingException { runtimeConfig = mock(AtlasDbRuntimeConfig.class); when(runtimeConfig.timestampClient()).thenReturn(ImmutableTimestampClientConfig.of(false)); + when(runtimeConfig.getQosServiceConfiguration()).thenReturn(Optional.empty()); environment = mock(Consumer.class); diff --git a/atlasdb-config/versions.lock b/atlasdb-config/versions.lock index b09d8a436c3..0aa54b6da2d 100644 --- a/atlasdb-config/versions.lock +++ b/atlasdb-config/versions.lock @@ -58,10 +58,12 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -187,11 +189,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -206,7 +210,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -242,6 +249,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -377,7 +417,10 @@ ] }, "com.palantir.remoting-api:service-config": { - "locked": "1.4.0" + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", @@ -405,16 +448,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -422,7 +482,23 @@ ] }, "com.palantir.remoting3:keystores": { - "locked": "3.5.1" + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", @@ -432,9 +508,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -511,10 +595,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -545,7 +639,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -575,7 +670,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -607,6 +703,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -616,9 +718,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -703,10 +808,12 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -832,11 +939,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -851,7 +960,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -887,6 +999,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1022,7 +1167,10 @@ ] }, "com.palantir.remoting-api:service-config": { - "locked": "1.4.0" + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", @@ -1050,16 +1198,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1067,7 +1232,23 @@ ] }, "com.palantir.remoting3:keystores": { - "locked": "3.5.1" + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", @@ -1077,9 +1258,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1156,10 +1345,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1190,7 +1389,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1220,7 +1420,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1252,6 +1453,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "requested": "2.0.6" @@ -1265,9 +1472,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-console-distribution/versions.lock b/atlasdb-console-distribution/versions.lock index bbb7b770537..39c61470f1b 100644 --- a/atlasdb-console-distribution/versions.lock +++ b/atlasdb-console-distribution/versions.lock @@ -75,12 +75,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -233,11 +235,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -256,7 +260,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -310,6 +317,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -548,7 +588,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -588,16 +629,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -608,7 +666,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -620,9 +692,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -703,10 +783,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -770,7 +860,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -842,7 +933,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "jline:jline": { @@ -944,6 +1036,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -977,11 +1075,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-console/versions.lock b/atlasdb-console/versions.lock index 191f1b0934e..57f1a4685e9 100644 --- a/atlasdb-console/versions.lock +++ b/atlasdb-console/versions.lock @@ -58,11 +58,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -194,11 +196,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -213,7 +217,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -249,6 +256,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -412,7 +452,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -444,16 +485,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -463,7 +521,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -474,9 +546,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -555,10 +635,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -592,7 +682,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -632,7 +723,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "jline:jline": { @@ -675,6 +767,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -690,9 +788,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -777,11 +878,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -913,11 +1016,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -932,7 +1037,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -968,6 +1076,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1131,7 +1272,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1163,16 +1305,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1182,7 +1341,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1193,9 +1366,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1274,10 +1455,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1311,7 +1502,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1351,7 +1543,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "jline:jline": { @@ -1394,6 +1587,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1409,9 +1608,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-container-test-utils/versions.lock b/atlasdb-container-test-utils/versions.lock index 44e27289969..81497e40764 100644 --- a/atlasdb-container-test-utils/versions.lock +++ b/atlasdb-container-test-utils/versions.lock @@ -47,14 +47,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", "com.palantir.remoting3:keystores", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -75,7 +79,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -134,9 +139,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -149,7 +157,11 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-processors", "com.palantir.docker.compose:docker-compose-rule-core", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -187,6 +199,39 @@ "com.palantir.docker.compose:docker-compose-rule-core" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -291,11 +336,24 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-cassandra", + "com.palantir.remoting-api:service-config", "com.palantir.remoting3:keystores" ] }, @@ -305,16 +363,53 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-cassandra" + "com.palantir.atlasdb:atlasdb-cassandra", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -322,9 +417,17 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -334,6 +437,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -342,6 +446,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -391,6 +501,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -425,7 +556,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.netty:netty-buffer": { @@ -472,7 +604,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -573,6 +708,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -600,9 +741,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.docker.compose:docker-compose-rule-core", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -670,14 +816,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", "com.palantir.remoting3:keystores", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -698,7 +848,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -757,9 +908,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -772,7 +926,11 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-processors", "com.palantir.docker.compose:docker-compose-rule-core", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -810,6 +968,39 @@ "com.palantir.docker.compose:docker-compose-rule-core" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -914,11 +1105,24 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-cassandra", + "com.palantir.remoting-api:service-config", "com.palantir.remoting3:keystores" ] }, @@ -928,16 +1132,53 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-cassandra" + "com.palantir.atlasdb:atlasdb-cassandra", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -945,9 +1186,17 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -957,6 +1206,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -965,6 +1215,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -1014,6 +1270,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -1048,7 +1325,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.netty:netty-buffer": { @@ -1095,7 +1373,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1196,6 +1477,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -1223,9 +1510,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.docker.compose:docker-compose-rule-core", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java index 1f0a3e3a770..f25bc8dd431 100644 --- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java +++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java @@ -26,6 +26,7 @@ import com.palantir.atlasdb.config.AtlasDbConfig; import com.palantir.atlasdb.config.AtlasDbRuntimeConfig; import com.palantir.atlasdb.factory.ServiceDiscoveringAtlasSupplier; +import com.palantir.atlasdb.qos.FakeQosClient; import com.palantir.atlasdb.table.description.Schema; @Value.Immutable @@ -41,7 +42,8 @@ public ServiceDiscoveringAtlasSupplier atlasDbSupplier() { atlasDbConfig().keyValueService(), atlasDbConfig().leader(), atlasDbConfig().namespace(), - atlasDbConfig().initializeAsync()); + atlasDbConfig().initializeAsync(), + FakeQosClient.getDefault()); } @Value.Default diff --git a/atlasdb-dagger/versions.lock b/atlasdb-dagger/versions.lock index 10cc1b7ea33..c08d86379f5 100644 --- a/atlasdb-dagger/versions.lock +++ b/atlasdb-dagger/versions.lock @@ -58,11 +58,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -194,11 +196,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -216,7 +220,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -252,6 +259,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -415,7 +455,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -447,16 +488,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -466,7 +524,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -477,9 +549,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -558,10 +638,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -592,7 +682,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -633,7 +724,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -665,6 +757,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -680,9 +778,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -767,11 +868,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -903,11 +1006,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -925,7 +1030,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -961,6 +1069,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1124,7 +1265,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1156,16 +1298,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1175,7 +1334,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1186,9 +1359,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1267,10 +1448,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1301,7 +1492,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1342,7 +1534,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1374,6 +1567,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1389,9 +1588,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-dbkvs-hikari/versions.lock b/atlasdb-dbkvs-hikari/versions.lock index 3759c780934..1904f55d4a2 100644 --- a/atlasdb-dbkvs-hikari/versions.lock +++ b/atlasdb-dbkvs-hikari/versions.lock @@ -67,7 +67,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -282,7 +282,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/atlasdb-dbkvs-tests/versions.lock b/atlasdb-dbkvs-tests/versions.lock index e366e30b5be..02ce6f69129 100644 --- a/atlasdb-dbkvs-tests/versions.lock +++ b/atlasdb-dbkvs-tests/versions.lock @@ -42,11 +42,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -54,7 +56,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -80,7 +84,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -151,10 +156,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -166,6 +173,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -215,6 +226,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -381,10 +425,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -409,22 +461,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -432,9 +520,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -456,6 +552,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -506,10 +608,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -553,6 +665,7 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -573,7 +686,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -639,6 +753,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mockito:mockito-core": { "locked": "1.10.17", "transitive": [ @@ -667,11 +787,15 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -737,11 +861,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -749,7 +875,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -775,7 +903,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -846,10 +975,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -861,6 +992,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -910,6 +1045,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1076,10 +1244,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -1104,22 +1280,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -1127,9 +1339,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1151,6 +1371,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -1201,10 +1427,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1248,6 +1484,7 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1268,7 +1505,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1334,6 +1572,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mockito:mockito-core": { "locked": "1.10.17", "transitive": [ @@ -1362,11 +1606,15 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java index 50f030ff499..3e603cd41aa 100644 --- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java +++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java @@ -28,6 +28,7 @@ import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs; import com.palantir.atlasdb.keyvalue.dbkvs.timestamp.InDbTimestampBoundStore; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.timestamp.PersistentTimestampServiceImpl; @@ -50,6 +51,7 @@ public String getType() { * @param leaderConfig unused. * @param namespace unused. * @param initializeAsync unused. Async initialization has not been implemented and is not propagated. + * @param unusedQosClient unused. * @return The requested KeyValueService instance */ @Override @@ -57,7 +59,8 @@ public KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional namespace, - boolean initializeAsync) { + boolean initializeAsync, + QosClient unusedQosClient) { if (initializeAsync) { log.warn("Asynchronous initialization not implemented, will initialize synchronousy."); } diff --git a/atlasdb-dbkvs/versions.lock b/atlasdb-dbkvs/versions.lock index eceae7a7992..cfc9b96f6ee 100644 --- a/atlasdb-dbkvs/versions.lock +++ b/atlasdb-dbkvs/versions.lock @@ -36,11 +36,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -48,7 +50,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -74,7 +78,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -143,10 +148,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -158,6 +165,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -201,6 +212,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -340,10 +384,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -367,22 +419,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -390,9 +478,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -414,6 +510,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -463,6 +565,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -497,7 +620,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -516,7 +640,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -551,6 +676,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -566,11 +697,15 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -630,11 +765,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -642,7 +779,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -668,7 +807,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -737,10 +877,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -752,6 +894,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -795,6 +941,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -934,10 +1113,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -961,22 +1148,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -984,9 +1207,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1008,6 +1239,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -1057,6 +1294,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -1091,7 +1349,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -1110,7 +1369,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1145,6 +1405,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -1160,11 +1426,15 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-dropwizard-bundle/versions.lock b/atlasdb-dropwizard-bundle/versions.lock index 8fe21e8f9d4..7f17af60938 100644 --- a/atlasdb-dropwizard-bundle/versions.lock +++ b/atlasdb-dropwizard-bundle/versions.lock @@ -73,11 +73,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -238,11 +240,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -260,7 +264,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -304,6 +311,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -521,7 +561,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -554,16 +595,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -574,7 +632,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -586,9 +658,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -675,10 +755,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -741,7 +831,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard.metrics:metrics-healthchecks": { @@ -944,6 +1035,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -1264,6 +1356,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1299,9 +1397,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -1411,11 +1512,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1576,11 +1679,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1598,7 +1703,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1642,6 +1750,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1859,7 +2000,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1892,16 +2034,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1912,7 +2071,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1924,9 +2097,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -2013,10 +2194,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -2079,7 +2270,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard.metrics:metrics-healthchecks": { @@ -2282,6 +2474,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -2602,6 +2795,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -2637,9 +2836,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-ete-tests/versions.lock b/atlasdb-ete-tests/versions.lock index 314d6dc4ac8..e37cc82561d 100644 --- a/atlasdb-ete-tests/versions.lock +++ b/atlasdb-ete-tests/versions.lock @@ -73,11 +73,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -241,11 +243,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -263,7 +267,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -307,6 +314,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -546,7 +586,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -579,16 +620,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -599,7 +657,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -611,9 +683,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -700,10 +780,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -780,6 +870,7 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dropwizard-bundle", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", @@ -996,6 +1087,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -1322,6 +1414,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1357,9 +1455,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -1470,12 +1571,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1647,11 +1750,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1670,7 +1775,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1726,6 +1834,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1993,7 +2134,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -2033,16 +2175,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -2053,7 +2212,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -2065,9 +2238,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -2154,10 +2335,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -2243,6 +2434,7 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-dropwizard-bundle", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", @@ -2459,6 +2651,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -2793,6 +2986,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -2834,11 +3033,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-feign/versions.lock b/atlasdb-feign/versions.lock index 11498799ff7..288e7c979cb 100644 --- a/atlasdb-feign/versions.lock +++ b/atlasdb-feign/versions.lock @@ -69,7 +69,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling" @@ -256,7 +256,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling" diff --git a/atlasdb-hikari/versions.lock b/atlasdb-hikari/versions.lock index fe5d0c21196..f84982347b4 100644 --- a/atlasdb-hikari/versions.lock +++ b/atlasdb-hikari/versions.lock @@ -29,13 +29,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -56,7 +61,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -94,9 +100,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -105,6 +114,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -130,6 +144,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -194,10 +241,24 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -206,19 +267,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -227,6 +338,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -235,6 +347,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -284,6 +402,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -303,7 +442,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -318,7 +458,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -345,6 +488,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -354,8 +503,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -402,13 +556,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -429,7 +588,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -467,9 +627,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -478,6 +641,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -503,6 +671,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -567,10 +768,24 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -579,19 +794,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -600,6 +865,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -608,6 +874,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -657,6 +929,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -676,7 +969,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -691,7 +985,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -718,6 +1015,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -727,8 +1030,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java index ef197e1472d..4e073b19422 100644 --- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java +++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java @@ -35,6 +35,7 @@ import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.schema.AtlasSchema; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; @@ -100,6 +101,7 @@ public String getType() { * @param leaderConfig unused. * @param unused unused. * @param initializeAsync unused. Async initialization has not been implemented and is not propagated. + * @param unusedQosClient unused. * @return The requested KeyValueService instance */ @Override @@ -107,7 +109,8 @@ public InMemoryKeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional unused, - boolean initializeAsync) { + boolean initializeAsync, + QosClient unusedQosClient) { if (initializeAsync) { log.warn("Asynchronous initialization not implemented, will initialize synchronousy."); } diff --git a/atlasdb-impl-shared/versions.lock b/atlasdb-impl-shared/versions.lock index 4c35df7c893..b96fd0d299f 100644 --- a/atlasdb-impl-shared/versions.lock +++ b/atlasdb-impl-shared/versions.lock @@ -36,16 +36,20 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -67,7 +71,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -126,10 +131,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -140,6 +147,10 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.common:streams", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -171,6 +182,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -252,10 +296,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -267,28 +319,72 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1" }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -308,6 +404,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -357,6 +459,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -372,7 +495,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -391,7 +515,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -418,6 +543,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -427,9 +558,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -488,16 +623,20 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -519,7 +658,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -578,10 +718,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -592,6 +734,10 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.common:streams", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -623,6 +769,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -704,10 +883,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -719,28 +906,72 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1" }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -760,6 +991,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -809,6 +1046,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -824,7 +1082,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -843,7 +1102,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -870,6 +1130,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -879,9 +1145,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java index 3048625f745..6ee9cbbe6f9 100644 --- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java +++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java @@ -26,6 +26,7 @@ import com.palantir.atlasdb.config.LeaderConfig; import com.palantir.atlasdb.keyvalue.api.KeyValueService; import com.palantir.atlasdb.keyvalue.api.TableReference; +import com.palantir.atlasdb.qos.QosClient; import com.palantir.atlasdb.spi.AtlasDbFactory; import com.palantir.atlasdb.spi.KeyValueServiceConfig; import com.palantir.atlasdb.versions.AtlasDbVersion; @@ -48,6 +49,7 @@ public String getType() { * @param leaderConfig unused. * @param unused unused. * @param initializeAsync unused. Async initialization has not been implemented and is not propagated. + * @param unusedQosClient unused. * @return The requested KeyValueService instance */ @Override @@ -55,7 +57,8 @@ public KeyValueService createRawKeyValueService( KeyValueServiceConfig config, Optional leaderConfig, Optional unused, - boolean initializeAsync) { + boolean initializeAsync, + QosClient unusedQosClient) { if (initializeAsync) { log.warn("Asynchronous initialization not implemented, will initialize synchronousy."); } diff --git a/atlasdb-jdbc/versions.lock b/atlasdb-jdbc/versions.lock index 0787a240b67..86dfb48995a 100644 --- a/atlasdb-jdbc/versions.lock +++ b/atlasdb-jdbc/versions.lock @@ -29,13 +29,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -56,7 +61,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -93,9 +99,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -104,6 +113,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -129,6 +143,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -185,10 +232,24 @@ "com.palantir.atlasdb:timestamp-impl": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -197,19 +258,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -218,6 +329,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -226,6 +338,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -275,6 +393,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -290,7 +429,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -305,7 +445,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -330,6 +473,12 @@ "locked": "3.6.4", "requested": "3.6.4" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -339,8 +488,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -386,13 +540,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -413,7 +572,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -450,9 +610,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -461,6 +624,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -486,6 +654,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -542,10 +743,24 @@ "com.palantir.atlasdb:timestamp-impl": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -554,19 +769,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -575,6 +840,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.atlasdb:timestamp-impl", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -583,6 +849,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -632,6 +904,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -647,7 +940,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -662,7 +956,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -687,6 +984,12 @@ "locked": "3.6.4", "requested": "3.6.4" }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -696,8 +999,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/atlasdb-jepsen-tests/versions.lock b/atlasdb-jepsen-tests/versions.lock index 34eb1038f40..76e4805d7be 100644 --- a/atlasdb-jepsen-tests/versions.lock +++ b/atlasdb-jepsen-tests/versions.lock @@ -58,11 +58,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -193,11 +195,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -212,7 +216,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -248,6 +255,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -403,7 +443,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -435,16 +476,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -454,7 +512,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -465,9 +537,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -546,10 +626,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -580,7 +670,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -614,7 +705,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -652,6 +744,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -667,9 +765,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -754,11 +855,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -889,11 +992,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -908,7 +1013,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -944,6 +1052,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1099,7 +1240,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1131,16 +1273,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1150,7 +1309,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1161,9 +1334,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1242,10 +1423,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1276,7 +1467,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1310,7 +1502,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1348,6 +1541,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1363,9 +1562,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-lock-api/versions.lock b/atlasdb-lock-api/versions.lock index 29c774b3c6e..01fd191d85a 100644 --- a/atlasdb-lock-api/versions.lock +++ b/atlasdb-lock-api/versions.lock @@ -13,15 +13,65 @@ "com.fasterxml.jackson.core:jackson-core": { "locked": "2.6.7", "transitive": [ - "com.fasterxml.jackson.core:jackson-databind" + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" ] }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.6.7", "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:lock-api", - "com.palantir.remoting-api:ssl-config" + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" ] }, "com.google.code.findbugs:annotations": { @@ -35,15 +85,58 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils" ] }, "com.google.guava:guava": { "locked": "18.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.atlasdb:atlasdb-api": { @@ -72,24 +165,134 @@ "com.palantir.atlasdb:lock-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:lock-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" ] }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -104,7 +307,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:lock-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -119,10 +325,22 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "io.dropwizard.metrics:metrics-core" ] } @@ -141,15 +359,65 @@ "com.fasterxml.jackson.core:jackson-core": { "locked": "2.6.7", "transitive": [ - "com.fasterxml.jackson.core:jackson-databind" + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" ] }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.6.7", "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:lock-api", - "com.palantir.remoting-api:ssl-config" + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" ] }, "com.google.code.findbugs:annotations": { @@ -163,15 +431,58 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils" ] }, "com.google.guava:guava": { "locked": "18.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.atlasdb:atlasdb-api": { @@ -200,24 +511,134 @@ "com.palantir.atlasdb:lock-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:lock-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" ] }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -232,7 +653,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:lock-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -247,10 +671,22 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "io.dropwizard.metrics:metrics-core" ] } diff --git a/atlasdb-perf/versions.lock b/atlasdb-perf/versions.lock index 123ea13a25a..455166b31cc 100644 --- a/atlasdb-perf/versions.lock +++ b/atlasdb-perf/versions.lock @@ -76,12 +76,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -241,11 +243,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -271,7 +275,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -333,6 +340,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -574,7 +614,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -614,16 +655,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -634,7 +692,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -646,9 +718,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -729,10 +809,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -795,7 +885,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -869,7 +960,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -987,6 +1079,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1035,12 +1133,15 @@ "locked": "1.7.5", "transitive": [ "ch.qos.logback:logback-classic", + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.docker.compose:docker-compose-rule-core", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -1148,12 +1249,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1313,11 +1416,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1343,7 +1448,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1405,6 +1513,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1646,7 +1787,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1686,16 +1828,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1706,7 +1865,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1718,9 +1891,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1801,10 +1982,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1867,7 +2058,8 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", - "com.palantir.atlasdb:atlasdb-dbkvs-hikari" + "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1941,7 +2133,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -2059,6 +2252,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -2107,12 +2306,15 @@ "locked": "1.7.5", "transitive": [ "ch.qos.logback:logback-classic", + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.docker.compose:docker-compose-rule-core", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-service-server/versions.lock b/atlasdb-service-server/versions.lock index de7fe68c480..c702208f854 100644 --- a/atlasdb-service-server/versions.lock +++ b/atlasdb-service-server/versions.lock @@ -61,11 +61,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -212,11 +214,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -231,7 +235,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -268,6 +275,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -431,7 +471,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -463,16 +504,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -482,7 +540,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -493,9 +565,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -580,10 +660,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -622,6 +712,7 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", "io.dropwizard.metrics:metrics-json", @@ -800,6 +891,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -1064,6 +1156,12 @@ "org.hibernate:hibernate-validator" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1097,9 +1195,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -1207,11 +1308,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1369,11 +1472,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1391,7 +1496,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1434,6 +1542,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1632,7 +1773,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1665,16 +1807,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1685,7 +1844,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1697,9 +1870,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1786,10 +1967,20 @@ "io.dropwizard.metrics:metrics-servlets" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1841,6 +2032,7 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", "io.dropwizard.metrics:metrics-json", @@ -2051,6 +2243,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -2353,6 +2546,12 @@ "com.palantir.atlasdb:atlasdb-cassandra" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -2388,9 +2587,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-service/versions.lock b/atlasdb-service/versions.lock index f2fb03a87b7..04382781b73 100644 --- a/atlasdb-service/versions.lock +++ b/atlasdb-service/versions.lock @@ -58,11 +58,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -193,11 +195,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -212,7 +216,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -248,6 +255,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -403,7 +443,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -435,16 +476,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -454,7 +512,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -465,9 +537,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -546,10 +626,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -580,7 +670,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -618,7 +709,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -650,6 +742,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -665,9 +763,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -752,11 +853,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -887,11 +990,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -906,7 +1011,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -942,6 +1050,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1097,7 +1238,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1129,16 +1271,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1148,7 +1307,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1159,9 +1332,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1240,10 +1421,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1274,7 +1465,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "io.dropwizard:dropwizard-jackson": { @@ -1312,7 +1504,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1344,6 +1537,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1359,9 +1558,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/atlasdb-tests-shared/versions.lock b/atlasdb-tests-shared/versions.lock index ef054e837ae..e3a2ddd4b6a 100644 --- a/atlasdb-tests-shared/versions.lock +++ b/atlasdb-tests-shared/versions.lock @@ -42,10 +42,12 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -53,7 +55,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -79,7 +83,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -142,10 +147,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -157,6 +164,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -191,6 +202,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -299,10 +343,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -323,22 +375,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -346,9 +434,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -369,6 +465,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -418,10 +520,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -446,6 +558,7 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -466,7 +579,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -516,6 +630,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mockito:mockito-core": { "locked": "1.10.17" }, @@ -535,10 +655,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -603,10 +727,12 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", @@ -614,7 +740,9 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -640,7 +768,8 @@ "com.palantir.remoting2:jackson-support", "com.palantir.remoting2:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -703,10 +832,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -718,6 +849,10 @@ "com.palantir.common:streams", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -752,6 +887,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -860,10 +1028,18 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -884,22 +1060,58 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-impl-shared" ] }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ @@ -907,9 +1119,17 @@ "com.palantir.atlasdb:atlasdb-impl-shared", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -930,6 +1150,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -979,10 +1205,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1007,6 +1243,7 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1027,7 +1264,8 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1077,6 +1315,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mockito:mockito-core": { "locked": "1.10.17" }, @@ -1096,10 +1340,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/commons-api/versions.lock b/commons-api/versions.lock index 9e5ecb0e204..cb8e5d28f0e 100644 --- a/commons-api/versions.lock +++ b/commons-api/versions.lock @@ -15,7 +15,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -86,7 +86,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/commons-db/versions.lock b/commons-db/versions.lock index 98e2c28ebf6..28820468814 100644 --- a/commons-db/versions.lock +++ b/commons-db/versions.lock @@ -66,7 +66,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -249,7 +249,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/examples/profile-client/versions.lock b/examples/profile-client/versions.lock index 2d959034068..191643f2e13 100644 --- a/examples/profile-client/versions.lock +++ b/examples/profile-client/versions.lock @@ -28,12 +28,17 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -54,7 +59,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -90,9 +96,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -101,6 +110,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -127,6 +141,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb.examples:profile-client-protobufs": { "project": true }, @@ -170,10 +217,24 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -182,19 +243,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -202,6 +313,7 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -210,6 +322,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -259,6 +377,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -274,7 +413,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -289,7 +429,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -310,6 +453,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -319,8 +468,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -365,12 +519,17 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -391,7 +550,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -427,9 +587,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -438,6 +601,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -464,6 +632,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb.examples:profile-client-protobufs": { "project": true }, @@ -507,10 +708,24 @@ "com.palantir.atlasdb:atlasdb-api" ] }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -519,19 +734,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -539,6 +804,7 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -547,6 +813,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -596,6 +868,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -611,7 +904,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -626,7 +920,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -647,6 +944,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -656,8 +959,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/leader-election-api/versions.lock b/leader-election-api/versions.lock index b243d1058fc..504ebcf700e 100644 --- a/leader-election-api/versions.lock +++ b/leader-election-api/versions.lock @@ -15,7 +15,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -95,7 +95,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/leader-election-impl/versions.lock b/leader-election-impl/versions.lock index 2b8512fdb83..9bd02370488 100644 --- a/leader-election-impl/versions.lock +++ b/leader-election-impl/versions.lock @@ -74,7 +74,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -253,7 +253,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/lock-api/versions.lock b/lock-api/versions.lock index 7c9ca509376..8cb259f83df 100644 --- a/lock-api/versions.lock +++ b/lock-api/versions.lock @@ -26,7 +26,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -110,7 +110,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/lock-impl/versions.lock b/lock-impl/versions.lock index cb4224caf85..d2f60de7988 100644 --- a/lock-impl/versions.lock +++ b/lock-impl/versions.lock @@ -76,7 +76,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -250,7 +250,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/qos-service-api/build.gradle b/qos-service-api/build.gradle index 07167e06541..60b3ef8dbf4 100644 --- a/qos-service-api/build.gradle +++ b/qos-service-api/build.gradle @@ -12,6 +12,10 @@ libsDirName = file('build/artifacts') dependencies { compile group: 'javax.ws.rs', name: 'javax.ws.rs-api' compile group: 'com.palantir.safe-logging', name: 'safe-logging' - + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind' + compile (group: 'com.palantir.remoting3', name: 'jaxrs-clients') { + exclude (module:'okhttp') + exclude (module:'jsr305') + } } diff --git a/qos-service-api/versions.lock b/qos-service-api/versions.lock index 31734bc1dbe..c28acec7822 100644 --- a/qos-service-api/versions.lock +++ b/qos-service-api/versions.lock @@ -1,24 +1,504 @@ { "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.core:jackson-databind" + ] + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" + ] + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, "com.google.code.findbugs:annotations": { "locked": "2.0.3" }, + "com.google.guava:guava": { + "locked": "18.0", + "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, + "com.palantir.remoting-api:ssl-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1" + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { - "locked": "0.1.3" + "locked": "0.1.3", + "transitive": [ + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "io.dropwizard.metrics:metrics-core": { + "locked": "3.2.3", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] }, "javax.ws.rs:javax.ws.rs-api": { - "locked": "2.0.1" + "locked": "2.0.1", + "transitive": [ + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.5", + "transitive": [ + "com.netflix.feign:feign-slf4j", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", + "io.dropwizard.metrics:metrics-core" + ] } }, "runtime": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.core:jackson-databind" + ] + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner" + ] + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.6.7", + "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", + "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", + "com.palantir.remoting-api:tracing", + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-guava": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" + ] + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support" + ] + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.6.7", + "transitive": [ + "com.palantir.remoting3:jackson-support", + "com.palantir.remoting3:tracing" + ] + }, "com.google.code.findbugs:annotations": { "locked": "2.0.3" }, + "com.google.guava:guava": { + "locked": "18.0", + "transitive": [ + "com.fasterxml.jackson.datatype:jackson-datatype-guava", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", + "com.palantir.remoting3:tracing" + ] + }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, + "com.palantir.remoting-api:ssl-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, + "com.palantir.remoting-api:tracing": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:jackson-support": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1" + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:tracing": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:tracing-okhttp3" + ] + }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { - "locked": "0.1.3" + "locked": "0.1.3", + "transitive": [ + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:tracing" + ] + }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "io.dropwizard.metrics:metrics-core": { + "locked": "3.2.3", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] }, "javax.ws.rs:javax.ws.rs-api": { - "locked": "2.0.1" + "locked": "2.0.1", + "transitive": [ + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.5", + "transitive": [ + "com.netflix.feign:feign-slf4j", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", + "io.dropwizard.metrics:metrics-core" + ] } } } \ No newline at end of file diff --git a/qos-service-impl/versions.lock b/qos-service-impl/versions.lock index 10b51c23b95..6a64bcca0d2 100644 --- a/qos-service-impl/versions.lock +++ b/qos-service-impl/versions.lock @@ -30,10 +30,15 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", + "com.palantir.atlasdb:qos-service-api", "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -54,7 +59,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -113,6 +119,10 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -125,6 +135,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:qos-service-api": { "project": true }, @@ -134,6 +177,19 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, + "com.palantir.remoting-api:ssl-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, "com.palantir.remoting-api:tracing": { "locked": "1.4.0", "transitive": [ @@ -143,26 +199,69 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1" }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -177,6 +276,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -223,9 +328,16 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.5", "transitive": [ + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -256,6 +368,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.remoting-api:errors", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.core:jersey-client", "org.glassfish.jersey.core:jersey-common", "org.glassfish.jersey.core:jersey-server" @@ -356,6 +469,12 @@ "org.glassfish.hk2:hk2-locator" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -365,8 +484,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.21", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -407,10 +530,15 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", + "com.palantir.atlasdb:qos-service-api", "com.palantir.remoting-api:errors", + "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -431,7 +559,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -490,6 +619,10 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -502,6 +635,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:qos-service-api": { "project": true }, @@ -511,6 +677,19 @@ "com.palantir.remoting3:error-handling" ] }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, + "com.palantir.remoting-api:ssl-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" + ] + }, "com.palantir.remoting-api:tracing": { "locked": "1.4.0", "transitive": [ @@ -520,26 +699,69 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1" }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -554,6 +776,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -600,9 +828,16 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "io.dropwizard.metrics:metrics-core": { "locked": "3.2.5", "transitive": [ + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -633,6 +868,7 @@ "com.palantir.atlasdb:qos-service-api", "com.palantir.remoting-api:errors", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.core:jersey-client", "org.glassfish.jersey.core:jersey-common", "org.glassfish.jersey.core:jersey-server" @@ -733,6 +969,12 @@ "org.glassfish.hk2:hk2-locator" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -742,8 +984,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.21", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/timelock-agent/versions.lock b/timelock-agent/versions.lock index df54fc2627d..c0d9ba1ab60 100644 --- a/timelock-agent/versions.lock +++ b/timelock-agent/versions.lock @@ -40,11 +40,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -167,11 +169,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -185,7 +189,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -219,6 +226,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -392,7 +432,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -424,16 +465,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -443,7 +501,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -455,9 +527,17 @@ "com.palantir.atlasdb:lock-impl", "com.palantir.atlasdb:timelock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -538,10 +618,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -572,7 +662,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -594,7 +685,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -625,6 +717,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -640,9 +738,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -708,11 +809,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -835,11 +938,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -853,7 +958,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -887,6 +995,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1060,7 +1201,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1092,16 +1234,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1111,7 +1270,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1123,9 +1296,17 @@ "com.palantir.atlasdb:lock-impl", "com.palantir.atlasdb:timelock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1206,10 +1387,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1240,7 +1431,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -1262,7 +1454,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1293,6 +1486,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1308,9 +1507,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/timelock-impl/versions.lock b/timelock-impl/versions.lock index bb76246dc74..0fbedb1ed1c 100644 --- a/timelock-impl/versions.lock +++ b/timelock-impl/versions.lock @@ -40,11 +40,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -166,11 +168,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -184,7 +188,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -218,6 +225,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -380,7 +420,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -412,16 +453,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -431,7 +489,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -442,9 +514,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -524,10 +604,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -558,7 +648,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -580,7 +671,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -611,6 +703,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -626,9 +724,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -694,11 +795,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -820,11 +923,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -838,7 +943,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -872,6 +980,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1034,7 +1175,8 @@ "com.palantir.remoting-api:service-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1066,16 +1208,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1085,7 +1244,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1096,9 +1269,17 @@ "com.palantir.atlasdb:leader-election-impl", "com.palantir.atlasdb:lock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1178,10 +1359,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -1212,7 +1403,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -1234,7 +1426,8 @@ "com.palantir.atlasdb:timestamp-api", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", - "com.palantir.remoting3:error-handling" + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "joda-time:joda-time": { @@ -1265,6 +1458,12 @@ "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1280,9 +1479,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/timelock-server-distribution/versions.lock b/timelock-server-distribution/versions.lock index 607cdeead4d..d3a8d68d280 100644 --- a/timelock-server-distribution/versions.lock +++ b/timelock-server-distribution/versions.lock @@ -85,12 +85,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -262,11 +264,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -286,7 +290,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -341,6 +348,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -603,7 +643,8 @@ "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-config", - "com.palantir.atlasdb:timelock-agent" + "com.palantir.atlasdb:timelock-agent", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -644,16 +685,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -665,7 +723,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -679,9 +751,17 @@ "com.palantir.atlasdb:timelock-impl", "com.palantir.atlasdb:timelock-server", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -764,10 +844,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -834,6 +924,7 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", @@ -1070,6 +1161,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -1415,6 +1507,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "requested": "2.0.6", @@ -1455,11 +1553,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/timelock-server/versions.lock b/timelock-server/versions.lock index c4fa9747da3..7fe9e23ab90 100644 --- a/timelock-server/versions.lock +++ b/timelock-server/versions.lock @@ -68,11 +68,13 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -223,11 +225,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -243,7 +247,10 @@ "com.palantir.config.crypto:encrypted-config-value-module", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -280,6 +287,39 @@ "com.palantir.remoting3:jersey-servers" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -460,7 +500,8 @@ "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-config", - "com.palantir.atlasdb:timelock-agent" + "com.palantir.atlasdb:timelock-agent", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -492,16 +533,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -511,7 +569,21 @@ "com.palantir.remoting3:keystores": { "locked": "3.5.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -523,9 +595,17 @@ "com.palantir.atlasdb:lock-impl", "com.palantir.atlasdb:timelock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -606,10 +686,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -648,6 +738,7 @@ "locked": "3.2.3", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", @@ -847,6 +938,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -1140,6 +1232,12 @@ "org.hibernate:hibernate-validator" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -1173,9 +1271,12 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", @@ -1290,12 +1391,14 @@ "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", "com.fasterxml.jackson.module:jackson-module-afterburner", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", "com.palantir.atlasdb:atlasdb-config", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", "com.palantir.atlasdb:atlasdb-persistent-lock-api", "com.palantir.atlasdb:lock-api", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", "com.palantir.config.crypto:encrypted-config-value", "com.palantir.config.crypto:encrypted-config-value-module", @@ -1466,11 +1569,13 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "io.dropwizard:dropwizard-util", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] @@ -1490,7 +1595,10 @@ "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -1545,6 +1653,39 @@ "com.mchange:c3p0" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -1791,7 +1932,8 @@ "locked": "1.4.0", "transitive": [ "com.palantir.atlasdb:atlasdb-config", - "com.palantir.atlasdb:timelock-agent" + "com.palantir.atlasdb:timelock-agent", + "com.palantir.remoting3:http-clients" ] }, "com.palantir.remoting-api:ssl-config": { @@ -1831,16 +1973,33 @@ "com.palantir.remoting3:error-handling": { "locked": "3.5.1", "transitive": [ - "com.palantir.remoting3:jersey-servers" + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" ] }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, "com.palantir.remoting3:jersey-servers": { "locked": "3.5.1", "transitive": [ @@ -1851,7 +2010,21 @@ "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-cassandra", - "com.palantir.atlasdb:atlasdb-config" + "com.palantir.atlasdb:atlasdb-config", + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" ] }, "com.palantir.remoting3:tracing": { @@ -1864,9 +2037,17 @@ "com.palantir.atlasdb:lock-impl", "com.palantir.atlasdb:timelock-impl", "com.palantir.remoting3:jersey-servers", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -1948,10 +2129,20 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.squareup.okhttp3:okhttp": { "locked": "3.8.1", "transitive": [ - "com.palantir.atlasdb:atlasdb-feign" + "com.netflix.feign:feign-okhttp", + "com.palantir.atlasdb:atlasdb-feign", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" ] }, "com.squareup.okio:okio": { @@ -2018,6 +2209,7 @@ "transitive": [ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:atlasdb-dbkvs-hikari", + "com.palantir.remoting3:okhttp-clients", "com.palantir.tritium:tritium-metrics", "io.dropwizard.metrics:metrics-jersey2", "io.dropwizard.metrics:metrics-jetty9", @@ -2249,6 +2441,7 @@ "com.palantir.remoting-api:errors", "com.palantir.remoting2:error-handling", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "org.glassfish.jersey.containers:jersey-container-servlet", "org.glassfish.jersey.containers:jersey-container-servlet-core", "org.glassfish.jersey.core:jersey-client", @@ -2594,6 +2787,12 @@ "com.palantir.atlasdb:atlasdb-jdbc" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mortbay.jetty.alpn:jetty-alpn-agent": { "locked": "2.0.6", "transitive": [ @@ -2633,11 +2832,14 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:commons-proxy", "com.palantir.remoting2:error-handling", "com.palantir.remoting2:tracing", "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", diff --git a/timestamp-client/versions.lock b/timestamp-client/versions.lock index 7c9ca509376..8cb259f83df 100644 --- a/timestamp-client/versions.lock +++ b/timestamp-client/versions.lock @@ -26,7 +26,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] @@ -110,7 +110,7 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons" ] diff --git a/timestamp-impl/versions.lock b/timestamp-impl/versions.lock index f31cf95efa5..b3046ba678b 100644 --- a/timestamp-impl/versions.lock +++ b/timestamp-impl/versions.lock @@ -29,13 +29,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -56,7 +61,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -92,9 +98,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -103,6 +112,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -128,6 +142,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -173,10 +220,24 @@ "com.palantir.atlasdb:timestamp-client": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -185,19 +246,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -205,6 +316,7 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -213,6 +325,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -262,6 +380,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -277,7 +416,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -292,7 +432,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -313,6 +456,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -322,8 +471,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", @@ -369,13 +523,18 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-afterburner", + "com.netflix.feign:feign-jackson", "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-client", + "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-client", + "com.palantir.remoting-api:errors", "com.palantir.remoting-api:ssl-config", "com.palantir.remoting-api:tracing", "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { @@ -396,7 +555,8 @@ "locked": "2.6.7", "transitive": [ "com.palantir.remoting3:jackson-support", - "com.palantir.remoting3:tracing" + "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens" ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { @@ -432,9 +592,12 @@ ] }, "com.google.code.findbugs:jsr305": { - "locked": "1.3.9", + "locked": "3.0.1", "transitive": [ "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:refresh-utils", "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir" ] }, @@ -443,6 +606,11 @@ "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:keystores", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:refresh-utils", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -468,6 +636,39 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "com.netflix.feign:feign-core": { + "locked": "8.17.0", + "transitive": [ + "com.netflix.feign:feign-jackson", + "com.netflix.feign:feign-jaxrs", + "com.netflix.feign:feign-okhttp", + "com.netflix.feign:feign-slf4j" + ] + }, + "com.netflix.feign:feign-jackson": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-jaxrs": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-okhttp": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.netflix.feign:feign-slf4j": { + "locked": "8.17.0", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.atlasdb:atlasdb-api": { "project": true, "transitive": [ @@ -513,10 +714,24 @@ "com.palantir.atlasdb:timestamp-client": { "project": true }, + "com.palantir.remoting-api:errors": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:error-handling" + ] + }, + "com.palantir.remoting-api:service-config": { + "locked": "1.4.0", + "transitive": [ + "com.palantir.remoting3:http-clients" + ] + }, "com.palantir.remoting-api:ssl-config": { "locked": "1.4.0", "transitive": [ - "com.palantir.atlasdb:atlasdb-api" + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.remoting-api:service-config", + "com.palantir.remoting3:keystores" ] }, "com.palantir.remoting-api:tracing": { @@ -525,19 +740,69 @@ "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:error-handling": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.palantir.remoting3:http-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.remoting3:jackson-support": { "locked": "3.5.1", "transitive": [ + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", "com.palantir.remoting3:tracing" ] }, + "com.palantir.remoting3:jaxrs-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.atlasdb:atlasdb-api", + "com.palantir.atlasdb:qos-service-api" + ] + }, + "com.palantir.remoting3:keystores": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:http-clients", + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:okhttp-clients": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, + "com.palantir.remoting3:refresh-utils": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients" + ] + }, "com.palantir.remoting3:tracing": { "locked": "3.5.1", "transitive": [ "com.palantir.atlasdb:atlasdb-client", + "com.palantir.remoting3:tracing-okhttp3", "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.remoting3:tracing-okhttp3": { + "locked": "3.5.1", + "transitive": [ + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients" + ] + }, "com.palantir.safe-logging:safe-logging": { "locked": "0.1.3", "transitive": [ @@ -545,6 +810,7 @@ "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", "com.palantir.remoting3:tracing", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", @@ -553,6 +819,12 @@ "com.palantir.tritium:tritium-tracing" ] }, + "com.palantir.tokens:auth-tokens": { + "locked": "3.0.0", + "transitive": [ + "com.palantir.remoting-api:service-config" + ] + }, "com.palantir.tritium:tritium-api": { "locked": "0.8.3", "transitive": [ @@ -602,6 +874,27 @@ "com.palantir.tritium:tritium-lib" ] }, + "com.squareup.okhttp3:logging-interceptor": { + "locked": "3.8.1", + "transitive": [ + "com.palantir.remoting3:okhttp-clients" + ] + }, + "com.squareup.okhttp3:okhttp": { + "locked": "3.8.1", + "transitive": [ + "com.netflix.feign:feign-okhttp", + "com.palantir.remoting3:okhttp-clients", + "com.palantir.remoting3:tracing-okhttp3", + "com.squareup.okhttp3:logging-interceptor" + ] + }, + "com.squareup.okio:okio": { + "locked": "1.13.0", + "transitive": [ + "com.squareup.okhttp3:okhttp" + ] + }, "com.squareup:javapoet": { "locked": "1.9.0", "transitive": [ @@ -617,7 +910,8 @@ "io.dropwizard.metrics:metrics-core": { "locked": "3.2.3", "transitive": [ - "com.palantir.atlasdb:atlasdb-commons" + "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:okhttp-clients" ] }, "javax.validation:validation-api": { @@ -632,7 +926,10 @@ "com.palantir.atlasdb:atlasdb-api", "com.palantir.atlasdb:atlasdb-commons", "com.palantir.atlasdb:qos-service-api", - "com.palantir.atlasdb:timestamp-api" + "com.palantir.atlasdb:timestamp-api", + "com.palantir.remoting-api:errors", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients" ] }, "net.jpountz.lz4:lz4": { @@ -653,6 +950,12 @@ "com.palantir.atlasdb:atlasdb-client" ] }, + "org.jvnet:animal-sniffer-annotation": { + "locked": "1.0", + "transitive": [ + "com.netflix.feign:feign-core" + ] + }, "org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir": { "locked": "1.1.2", "transitive": [ @@ -662,8 +965,13 @@ "org.slf4j:slf4j-api": { "locked": "1.7.5", "transitive": [ + "com.netflix.feign:feign-slf4j", "com.palantir.atlasdb:atlasdb-commons", + "com.palantir.remoting3:error-handling", + "com.palantir.remoting3:jaxrs-clients", + "com.palantir.remoting3:okhttp-clients", "com.palantir.remoting3:tracing", + "com.palantir.tokens:auth-tokens", "com.palantir.tritium:tritium-core", "com.palantir.tritium:tritium-lib", "com.palantir.tritium:tritium-metrics", diff --git a/versions.props b/versions.props index 1c91ac75e2d..d93b9af5a74 100644 --- a/versions.props +++ b/versions.props @@ -4,7 +4,7 @@ com.github.rholder:guava-retrying = 2.0.0 com.github.stefanbirkner:system-rules = 1.16.0 com.github.tomakehurst:wiremock = 1.57 com.google.code.findbugs:annotations = 2.0.3 -com.google.code.findbugs:jsr305 = 1.3.9 +com.google.code.findbugs:jsr305 = 3.0.1 com.google.dagger:dagger = 2.0.2 com.google.dagger:dagger-compiler = 2.0.2 com.google.guava:* = 18.0