Upgrade dialogue to get rid of apache-hc4 constraint (#4859)

* Upgrade dialogue to pick up apache hc5

* bring back serde

* Add generated changelog entries

atlasdb-conjure/build.gradle

@@ -5,7 +5,6 @@ dependencies {
   compile project(':atlasdb-remoting-api')
 
   implementation 'com.palantir.refreshable:refreshable'
-  implementation 'com.palantir.dialogue:dialogue-apache-hc4-client'
   implementation 'com.palantir.dialogue:dialogue-clients'
   implementation 'com.palantir.dialogue:dialogue-serde'
   implementation 'com.palantir.conjure.java.runtime:conjure-java-jaxrs-client'

changelog/@unreleased/pr-4859.v2.yml

@@ -0,0 +1,5 @@
+type: feature
+feature:
+  description: Upgrade dialogue to get rid of hc4 constraint
+  links:
+  - https://github.com/palantir/atlasdb/pull/4859

versions.lock

@@ -26,7 +26,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.11.0 (1 constraints: b
 com.fasterxml.jackson.module:jackson-module-afterburner:2.11.0 (8 constraints: 418fb713)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.0 (2 constraints: d12e2968)
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0 (1 constraints: af0e575e)
-com.github.ben-manes.caffeine:caffeine:2.8.3 (12 constraints: c9b90852)
+com.github.ben-manes.caffeine:caffeine:2.8.4 (12 constraints: d1b9425d)
 com.github.jbellis:jamm:0.3.0 (1 constraints: 910f6588)
 com.github.jnr:jffi:1.2.16 (1 constraints: 200ae4bc)
 com.github.jnr:jnr-constants:0.9.9 (1 constraints: f60a26ce)
@@ -45,13 +45,13 @@ com.google.auto.service:auto-service-annotations:1.0-rc6 (1 constraints: 741058a
 com.google.code.findbugs:annotations:3.0.1 (2 constraints: 2417bf42)
 com.google.code.findbugs:findbugs-annotations:3.0.1 (1 constraints: 0605fb35)
 com.google.code.findbugs:jFormatString:3.0.0 (1 constraints: f01022b8)
-com.google.code.findbugs:jsr305:3.0.2 (30 constraints: 7bd78607)
+com.google.code.findbugs:jsr305:3.0.2 (30 constraints: 7cd7d00a)
 com.google.dagger:dagger:2.19 (4 constraints: b02d6658)
 com.google.dagger:dagger-compiler:2.17 (1 constraints: de04fc30)
 com.google.dagger:dagger-producers:2.17 (2 constraints: 341a0932)
 com.google.dagger:dagger-spi:2.17 (1 constraints: 220e6240)
 com.google.errorprone:error_prone_annotation:2.3.3 (3 constraints: 34381160)
-com.google.errorprone:error_prone_annotations:2.3.4 (17 constraints: 5b11493c)
+com.google.errorprone:error_prone_annotations:2.4.0 (17 constraints: 4c11362c)
 com.google.errorprone:error_prone_check_api:2.3.3 (2 constraints: 5225e9bd)
 com.google.errorprone:error_prone_core:2.3.3 (1 constraints: a8121509)
 com.google.errorprone:error_prone_refaster:2.3.3 (2 constraints: 131960b3)
@@ -60,7 +60,7 @@ com.google.errorprone:javac:9+181-r4173-1 (4 constraints: 3352a10d)
 com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc)
 com.google.googlejavaformat:google-java-format:1.5 (2 constraints: ea210c4d)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:29.0-jre (55 constraints: 359cc624)
+com.google.guava:guava:29.0-jre (55 constraints: 369c9829)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
 com.google.protobuf:protobuf-java:3.10.0 (2 constraints: 29162de8)
@@ -83,24 +83,24 @@ com.palantir.cassandra:cassandra-thrift:2.2.13-1.6.0 (2 constraints: 3f176da3)
 com.palantir.common:streams:1.9.1 (1 constraints: 0d050c36)
 com.palantir.config.crypto:encrypted-config-value:2.1.0 (1 constraints: 7e179e3b)
 com.palantir.config.crypto:encrypted-config-value-module:2.1.0 (1 constraints: 0505f835)
-com.palantir.conjure.java:conjure-lib:5.17.0 (5 constraints: 5354f50d)
-com.palantir.conjure.java:conjure-undertow-lib:5.17.0 (1 constraints: 3f05563b)
-com.palantir.conjure.java.api:errors:2.13.0 (5 constraints: 215fbf41)
-com.palantir.conjure.java.api:service-config:2.13.0 (5 constraints: 324d0398)
-com.palantir.conjure.java.api:ssl-config:2.13.0 (3 constraints: a92a318a)
-com.palantir.conjure.java.runtime:client-config:5.9.1 (6 constraints: c66570a3)
-com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:5.9.1 (7 constraints: 0382b982)
-com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:5.9.1 (1 constraints: 11052036)
-com.palantir.conjure.java.runtime:conjure-java-jersey-server:5.9.1 (1 constraints: 11052036)
-com.palantir.conjure.java.runtime:keystores:5.9.1 (4 constraints: 1e4211a7)
-com.palantir.conjure.java.runtime:okhttp-clients:5.9.1 (1 constraints: 9518c185)
-com.palantir.conjure.java.runtime:refresh-utils:5.9.1 (2 constraints: a51d3f14)
-com.palantir.dialogue:dialogue-apache-hc4-client:1.45.0 (2 constraints: f0159ef4)
-com.palantir.dialogue:dialogue-blocking-channels:1.45.0 (1 constraints: fd137f82)
-com.palantir.dialogue:dialogue-clients:1.45.0 (1 constraints: 3c05443b)
-com.palantir.dialogue:dialogue-core:1.45.0 (2 constraints: b1244500)
-com.palantir.dialogue:dialogue-serde:1.45.0 (2 constraints: f0159ef4)
-com.palantir.dialogue:dialogue-target:1.45.0 (7 constraints: 70769e49)
+com.palantir.conjure.java:conjure-lib:5.19.0 (5 constraints: 5954e510)
+com.palantir.conjure.java:conjure-undertow-lib:5.19.0 (1 constraints: 3f05563b)
+com.palantir.conjure.java.api:errors:2.14.0 (5 constraints: 265ff243)
+com.palantir.conjure.java.api:service-config:2.14.0 (5 constraints: 374d9f99)
+com.palantir.conjure.java.api:ssl-config:2.14.0 (3 constraints: ab2a6c8a)
+com.palantir.conjure.java.runtime:client-config:5.10.0 (6 constraints: 8a664542)
+com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:5.10.0 (7 constraints: 9f8296f2)
+com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:5.10.0 (1 constraints: 11052036)
+com.palantir.conjure.java.runtime:conjure-java-jersey-server:5.10.0 (1 constraints: 11052036)
+com.palantir.conjure.java.runtime:keystores:5.10.0 (4 constraints: 9342274d)
+com.palantir.conjure.java.runtime:okhttp-clients:5.10.0 (1 constraints: bc18669e)
+com.palantir.conjure.java.runtime:refresh-utils:5.10.0 (2 constraints: cc1df431)
+com.palantir.dialogue:dialogue-apache-hc5-client:1.61.0 (1 constraints: b31037be)
+com.palantir.dialogue:dialogue-blocking-channels:1.61.0 (1 constraints: fc138d82)
+com.palantir.dialogue:dialogue-clients:1.61.0 (1 constraints: 3a05403b)
+com.palantir.dialogue:dialogue-core:1.61.0 (2 constraints: ae241f00)
+com.palantir.dialogue:dialogue-serde:1.61.0 (2 constraints: ec1536f4)
+com.palantir.dialogue:dialogue-target:1.61.0 (7 constraints: 61762040)
 com.palantir.docker.compose:docker-compose-rule-core:1.3.0 (2 constraints: 781b0875)
 com.palantir.docker.compose:docker-compose-rule-events-api-objects:1.3.0 (1 constraints: be15b3d2)
 com.palantir.docker.compose:docker-compose-rule-junit4:1.3.0 (2 constraints: 85178f4b)
@@ -110,21 +110,21 @@ com.palantir.refreshable:refreshable:1.0.0 (3 constraints: 6029acf0)
 com.palantir.remoting2:error-handling:2.6.3 (2 constraints: 3f15c2ba)
 com.palantir.remoting2:jackson-support:2.6.3 (2 constraints: 571dfe30)
 com.palantir.ri:resource-identifier:1.1.0 (3 constraints: 982fa133)
-com.palantir.safe-logging:preconditions:1.13.0 (25 constraints: 63a77c00)
-com.palantir.safe-logging:safe-logging:1.13.0 (22 constraints: 3c6ede62)
-com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (2 constraints: f622cc4a)
+com.palantir.safe-logging:preconditions:1.13.0 (25 constraints: 64a73703)
+com.palantir.safe-logging:safe-logging:1.13.0 (22 constraints: 3d6edc65)
+com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (2 constraints: f722094b)
 com.palantir.tokens:auth-tokens:3.6.1 (5 constraints: 545bf017)
-com.palantir.tracing:tracing:4.4.0 (7 constraints: 7668bfbd)
+com.palantir.tracing:tracing:4.4.0 (9 constraints: e48ba772)
 com.palantir.tracing:tracing-api:4.4.0 (4 constraints: d03a3918)
 com.palantir.tracing:tracing-jersey:4.4.0 (1 constraints: 101943a2)
 com.palantir.tracing:tracing-okhttp3:4.4.0 (2 constraints: 0e2d8179)
 com.palantir.tritium:tritium-api:0.16.10 (5 constraints: fb4dcc46)
 com.palantir.tritium:tritium-caffeine:0.16.10 (1 constraints: 41053d3b)
 com.palantir.tritium:tritium-core:0.16.10 (4 constraints: da3e810a)
 com.palantir.tritium:tritium-lib:0.16.10 (1 constraints: 41053d3b)
-com.palantir.tritium:tritium-metrics:0.16.10 (7 constraints: c57166b1)
+com.palantir.tritium:tritium-metrics:0.16.10 (7 constraints: ef712ef5)
 com.palantir.tritium:tritium-proxy:0.16.10 (1 constraints: b00e2668)
-com.palantir.tritium:tritium-registry:0.16.10 (11 constraints: 7cc049e0)
+com.palantir.tritium:tritium-registry:0.16.10 (11 constraints: f8c0543c)
 com.palantir.tritium:tritium-slf4j:0.16.10 (1 constraints: b00e2668)
 com.palantir.tritium:tritium-tracing:0.16.10 (1 constraints: b00e2668)
 com.papertrail:profiler:1.0.2 (1 constraints: e21051b8)
@@ -135,10 +135,10 @@ com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.thinkaurelius.thrift:thrift-server:0.3.7 (1 constraints: 980f6c88)
 com.zaxxer:HikariCP:3.4.1 (1 constraints: 0a050736)
 commons-cli:commons-cli:1.1 (1 constraints: 320f7469)
-commons-codec:commons-codec:1.11 (2 constraints: 241fc287)
+commons-codec:commons-codec:1.13 (3 constraints: 0232e1fa)
 commons-dbutils:commons-dbutils:1.3 (1 constraints: a8041d2c)
 commons-io:commons-io:2.6 (1 constraints: 64156da7)
-commons-logging:commons-logging:1.2 (1 constraints: c20f9771)
+commons-logging:commons-logging:1.1.1 (1 constraints: 2010a591)
 de.jflex:jflex:1.6.0 (1 constraints: 09050236)
 io.airlift:airline:0.8 (1 constraints: 8506e354)
 io.dropwizard:dropwizard-configuration:2.0.2 (1 constraints: 3e0d2d1f)
@@ -156,7 +156,7 @@ io.dropwizard:dropwizard-util:2.0.2 (5 constraints: ca496b97)
 io.dropwizard:dropwizard-validation:2.0.2 (5 constraints: 7649918e)
 io.dropwizard.logback:logback-throttling-appender:1.1.0 (1 constraints: 7a0ece4f)
 io.dropwizard.metrics:metrics-annotation:3.2.6 (2 constraints: 451f04ba)
-io.dropwizard.metrics:metrics-core:3.2.6 (21 constraints: 89592449)
+io.dropwizard.metrics:metrics-core:3.2.6 (21 constraints: 8a59c04b)
 io.dropwizard.metrics:metrics-healthchecks:3.2.6 (2 constraints: 2a1e8c46)
 io.dropwizard.metrics:metrics-jersey2:3.2.6 (1 constraints: 2a0e1640)
 io.dropwizard.metrics:metrics-jetty9:3.2.6 (1 constraints: c80d3430)
@@ -176,7 +176,7 @@ io.netty:netty-handler:4.1.49.Final (2 constraints: be221a43)
 io.netty:netty-handler-proxy:4.1.49.Final (1 constraints: 5c077061)
 io.netty:netty-resolver:4.1.49.Final (2 constraints: 581a0d32)
 io.netty:netty-transport:4.1.49.Final (5 constraints: 414339c4)
-io.undertow:undertow-core:2.1.1.Final (1 constraints: a91530ca)
+io.undertow:undertow-core:2.1.3.Final (1 constraints: ab153eca)
 it.unimi.dsi:fastutil:6.5.7 (1 constraints: 6d0e414b)
 jakarta.activation:jakarta.activation-api:1.2.1 (4 constraints: 714513b4)
 jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: ef360e4a)
@@ -209,8 +209,11 @@ org.apache.commons:commons-lang3:3.9 (11 constraints: 48a8c3cb)
 org.apache.commons:commons-math3:3.2 (2 constraints: 90196ff8)
 org.apache.commons:commons-pool2:2.4.2 (1 constraints: 0a050336)
 org.apache.commons:commons-text:1.8 (1 constraints: b4102e9b)
-org.apache.httpcomponents:httpclient:4.5.12 (2 constraints: 3a20244b)
-org.apache.httpcomponents:httpcore:4.4.13 (3 constraints: 913094d1)
+org.apache.httpcomponents:httpclient:4.2.5 (1 constraints: 3c0ca8f8)
+org.apache.httpcomponents:httpcore:4.2.4 (2 constraints: 611ce6cf)
+org.apache.httpcomponents.client5:httpclient5:5.0.1 (1 constraints: ca13906e)
+org.apache.httpcomponents.core5:httpcore5:5.0.1 (3 constraints: 57394c0b)
+org.apache.httpcomponents.core5:httpcore5-h2:5.0.1 (1 constraints: 3a13043c)
 org.apache.thrift:libthrift:0.9.2 (3 constraints: 6d318be9)
 org.assertj:assertj-core:3.15.0 (5 constraints: e24d366f)
 org.awaitility:awaitility:3.1.3 (1 constraints: 09050036)
@@ -300,7 +303,7 @@ org.rocksdb:rocksdbjni:6.4.6 (1 constraints: 12051b36)
 org.slf4j:jcl-over-slf4j:1.7.30 (3 constraints: 432fe5ed)
 org.slf4j:jul-to-slf4j:1.7.30 (1 constraints: b30e965e)
 org.slf4j:log4j-over-slf4j:1.7.30 (3 constraints: 432fe5ed)
-org.slf4j:slf4j-api:1.7.30 (58 constraints: c67dd2dc)
+org.slf4j:slf4j-api:1.7.30 (59 constraints: 39912b66)
 org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308)
 org.wildfly.common:wildfly-common:1.5.2.Final (4 constraints: e736f88b)
 org.xerial:sqlite-jdbc:3.30.1 (1 constraints: 39053e3b)
@@ -322,7 +325,7 @@ com.google.truth:truth:1.0 (4 constraints: 853fa23d)
 com.google.truth.extensions:truth-java8-extension:0.37 (1 constraints: ef11ffe8)
 com.h2database:h2:1.4.190 (1 constraints: 7105af40)
 com.palantir.baseline:baseline-refaster-testing:2.17.0 (1 constraints: 3c05443b)
-com.palantir.conjure.java.api:test-utils:2.13.0 (1 constraints: 0d051036)
+com.palantir.conjure.java.api:test-utils:2.14.0 (1 constraints: 0d051036)
 com.palantir.remoting2:jersey-servers:2.6.3 (1 constraints: 0d050a36)
 com.palantir.remoting2:tracing:2.6.3 (1 constraints: 3310819c)
 com.palantir.safe-logging:preconditions-assertj:1.13.0 (1 constraints: 36052f3b)

versions.props

@@ -21,7 +21,7 @@ com.palantir.conjure:conjure = 4.10.1
 com.palantir.conjure.java.api:* = 2.9.0
 com.palantir.conjure.java:* = 5.17.0
 com.palantir.conjure.java.runtime:* = 5.9.1
-com.palantir.dialogue:* = 1.45.0
+com.palantir.dialogue:* = 1.61.0
 com.palantir.docker.compose:docker-compose-rule* = 1.3.0
 com.palantir.docker.proxy:docker-proxy-rule = 0.8.1
 com.palantir.refreshable:refreshable = 1.0.0