From 73b7e8f72f76feed7ba12fdb59e854904519cb0c Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 3 May 2022 10:43:44 +0000 Subject: [PATCH 1/2] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a598d8c3c..b34510000 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.24.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.96.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.125.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.14.0' From dbc8615084b98a2e46b420f8be8b597b528ab5b2 Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Tue, 3 May 2022 10:44:55 -0400 Subject: [PATCH 2/2] fix --- .../com/palantir/dialogue/hc5/ApacheHttpClientChannels.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientChannels.java b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientChannels.java index 641432165..dc421077d 100644 --- a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientChannels.java +++ b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientChannels.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.io.Closer; import com.google.common.net.HostAndPort; -import com.google.common.primitives.Ints; import com.palantir.conjure.java.api.config.service.BasicCredentials; import com.palantir.conjure.java.client.config.CipherSuites; import com.palantir.conjure.java.client.config.ClientConfiguration; @@ -466,8 +465,8 @@ public CloseableClient build() { Timeout socketTimeout = getSocketTimeout(conf, name); - Timeout connectTimeout = Timeout.ofMilliseconds( - Ints.checkedCast(conf.connectTimeout().toMillis())); + Timeout connectTimeout = + Timeout.ofMilliseconds(conf.connectTimeout().toMillis()); Timeout handshakeTimeout = getHandshakeTimeout(connectTimeout, socketTimeout, name);