From f15cf2e26a8ac12faedeefff17aebe847810b77b Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 14 Aug 2023 18:34:00 -0700
Subject: [PATCH 01/53] Excavator:  Update conjure plugins and dependencies
 (#2678)

---
 versions.lock  | 2 +-
 versions.props | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions.lock b/versions.lock
index ddb9514ab2..a2b5b7b724 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,7 +24,7 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.16.0 (3 constraints: 62252350)
+com.palantir.conjure.java:conjure-lib:7.17.0 (3 constraints: 63258350)
 com.palantir.conjure.java.api:errors:2.35.0 (3 constraints: 3225144a)
 com.palantir.conjure.java.api:service-config:2.35.0 (3 constraints: a42895e2)
 com.palantir.conjure.java.api:ssl-config:2.35.0 (2 constraints: ff178486)
diff --git a/versions.props b/versions.props
index 551229c318..e6be0cb779 100644
--- a/versions.props
+++ b/versions.props
@@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.2-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:* = 7.16.0
-com.palantir.conjure.java:conjure-lib = 7.16.0
+com.palantir.conjure.java:* = 7.17.0
+com.palantir.conjure.java:conjure-lib = 7.17.0
 com.palantir.conjure.java.api:* = 2.35.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.90.0

From ac2ecd23e581f38a15ed109f7070dbf975b28d7b Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 22 Aug 2023 02:08:49 -0700
Subject: [PATCH 02/53] Excavator:  Upgrade dependencies (#2679)

---
 versions.lock  | 10 +++++-----
 versions.props |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/versions.lock b/versions.lock
index a2b5b7b724..a6afa168c4 100644
--- a/versions.lock
+++ b/versions.lock
@@ -102,8 +102,8 @@ io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.12 (1 constraints: 080f065e)
-net.bytebuddy:byte-buddy:1.14.5 (2 constraints: c116a74f)
-net.bytebuddy:byte-buddy-agent:1.14.5 (1 constraints: 450b43de)
+net.bytebuddy:byte-buddy:1.14.6 (2 constraints: c216a84f)
+net.bytebuddy:byte-buddy-agent:1.14.6 (1 constraints: 460b44de)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
 org.apache.commons:commons-lang3:3.13.0 (1 constraints: 39053e3b)
@@ -122,13 +122,13 @@ org.jboss.xnio:xnio-nio:3.8.7.Final (1 constraints: c80dcb30)
 org.jmock:jmock:2.12.0 (1 constraints: 3705353b)
 org.jmock:jmock-testjar:2.12.0 (1 constraints: a507a272)
 org.junit.jupiter:junit-jupiter:5.10.0 (1 constraints: 3805413b)
-org.junit.jupiter:junit-jupiter-api:5.10.0 (5 constraints: ed435769)
+org.junit.jupiter:junit-jupiter-api:5.10.0 (5 constraints: 124450ad)
 org.junit.jupiter:junit-jupiter-engine:5.10.0 (1 constraints: 330efd49)
 org.junit.jupiter:junit-jupiter-params:5.10.0 (2 constraints: 6a131c5b)
 org.junit.platform:junit-platform-commons:1.10.0 (2 constraints: 2b211983)
 org.junit.platform:junit-platform-engine:1.10.0 (1 constraints: d210e4c4)
-org.mockito:mockito-core:5.4.0 (2 constraints: ce135265)
-org.mockito:mockito-junit-jupiter:5.4.0 (1 constraints: 0b051036)
+org.mockito:mockito-core:5.5.0 (2 constraints: d0138265)
+org.mockito:mockito-junit-jupiter:5.5.0 (1 constraints: 0c051336)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
 org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
diff --git a/versions.props b/versions.props
index e6be0cb779..053ddc3c41 100644
--- a/versions.props
+++ b/versions.props
@@ -19,7 +19,7 @@ org.assertj:assertj-core = 3.24.2
 org.immutables:value = 2.9.3
 org.jmock:jmock = 2.12.0
 org.junit.*:* = 5.10.0
-org.mockito:* = 5.4.0
+org.mockito:* = 5.5.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
 io.undertow:* = 2.2.24.Final

From 7f157a4ea635ec2b72096907f4372f410932b56d Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 22 Aug 2023 11:02:19 -0700
Subject: [PATCH 03/53] Excavator:  Upgrade dependencies (#2680)

---
 versions.lock  | 8 ++++----
 versions.props | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions.lock b/versions.lock
index a6afa168c4..b7cef8fa8f 100644
--- a/versions.lock
+++ b/versions.lock
@@ -18,7 +18,7 @@ com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: ee2386a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: eaf9bd29)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:32.1.2-jre (15 constraints: b907650e)
+com.google.guava:guava:32.1.2-jre (15 constraints: 1a089ccd)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
@@ -34,12 +34,12 @@ com.palantir.dialogue:dialogue-core:3.90.0 (2 constraints: 3d19d8ed)
 com.palantir.dialogue:dialogue-futures:3.90.0 (3 constraints: cb3374bd)
 com.palantir.dialogue:dialogue-serde:3.90.0 (1 constraints: 3e05553b)
 com.palantir.dialogue:dialogue-target:3.90.0 (5 constraints: 074d285c)
-com.palantir.refreshable:refreshable:2.2.0 (1 constraints: 0605fb35)
+com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
-com.palantir.safe-logging:logger:3.6.0 (12 constraints: 7fb8c805)
+com.palantir.safe-logging:logger:3.6.0 (12 constraints: 53b8606a)
 com.palantir.safe-logging:logger-slf4j:3.6.0 (1 constraints: 040e6542)
 com.palantir.safe-logging:logger-spi:3.6.0 (2 constraints: 171e6d7b)
-com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: df1d7b97)
+com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: b31df9a9)
 com.palantir.safe-logging:safe-logging:3.6.0 (17 constraints: 6c0cf595)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
 com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 47482351)
diff --git a/versions.props b/versions.props
index 053ddc3c41..00bc81b3fa 100644
--- a/versions.props
+++ b/versions.props
@@ -29,7 +29,7 @@ io.undertow:* = 2.2.24.Final
 # here to enable existing test coverage.
 io.undertow:undertow-servlet-jakarta = 2.2.20.Final
 # dependency-upgrader:ON
-com.palantir.refreshable:refreshable = 2.2.0
+com.palantir.refreshable:refreshable = 2.3.0
 org.hibernate.validator:* = 6.2.0.Final
 org.checkerframework:checker-qual = 3.37.0
 

From f012948aa0604d4b686a62056e3075a9d4a0d769 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:26:41 -0700
Subject: [PATCH 04/53] Excavator:  Update conjure plugins and dependencies
 (#2681)

---
 versions.lock  | 20 ++++++++++----------
 versions.props |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/versions.lock b/versions.lock
index b7cef8fa8f..84191be861 100644
--- a/versions.lock
+++ b/versions.lock
@@ -14,7 +14,7 @@ com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.15.2 (1 cons
 com.fasterxml.jackson.module:jackson-module-afterburner:2.15.2 (1 constraints: 3905393b)
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (2 constraints: e430cfb3)
 com.fasterxml.jackson.module:jackson-module-scala_2.12:2.15.2 (1 constraints: 3905393b)
-com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: ee2386a4)
+com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: eaf9bd29)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
@@ -24,16 +24,16 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.17.0 (3 constraints: 63258350)
+com.palantir.conjure.java:conjure-lib:7.17.0 (3 constraints: 69252251)
 com.palantir.conjure.java.api:errors:2.35.0 (3 constraints: 3225144a)
 com.palantir.conjure.java.api:service-config:2.35.0 (3 constraints: a42895e2)
 com.palantir.conjure.java.api:ssl-config:2.35.0 (2 constraints: ff178486)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.90.0 (1 constraints: 3e05553b)
-com.palantir.dialogue:dialogue-blocking-channels:3.90.0 (2 constraints: d72335b3)
-com.palantir.dialogue:dialogue-core:3.90.0 (2 constraints: 3d19d8ed)
-com.palantir.dialogue:dialogue-futures:3.90.0 (3 constraints: cb3374bd)
-com.palantir.dialogue:dialogue-serde:3.90.0 (1 constraints: 3e05553b)
-com.palantir.dialogue:dialogue-target:3.90.0 (5 constraints: 074d285c)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.91.0 (1 constraints: 3f05583b)
+com.palantir.dialogue:dialogue-blocking-channels:3.91.0 (2 constraints: d92369b3)
+com.palantir.dialogue:dialogue-core:3.91.0 (2 constraints: 3f1918ee)
+com.palantir.dialogue:dialogue-futures:3.91.0 (3 constraints: ce3306be)
+com.palantir.dialogue:dialogue-serde:3.91.0 (1 constraints: 3f05583b)
+com.palantir.dialogue:dialogue-target:3.91.0 (5 constraints: 0c4d245e)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
 com.palantir.safe-logging:logger:3.6.0 (12 constraints: 53b8606a)
@@ -49,8 +49,8 @@ com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.74.0 (2 constraints: 371f74bd)
 com.palantir.tritium:tritium-core:0.74.0 (1 constraints: 431050a2)
-com.palantir.tritium:tritium-metrics:0.74.0 (5 constraints: fa4ca157)
-com.palantir.tritium:tritium-registry:0.74.0 (6 constraints: 3c5d81cf)
+com.palantir.tritium:tritium-metrics:0.74.0 (5 constraints: 024df559)
+com.palantir.tritium:tritium-registry:0.74.0 (6 constraints: 445d45d3)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index 00bc81b3fa..c6e0f6f0c6 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.17.0
 com.palantir.conjure.java:conjure-lib = 7.17.0
 com.palantir.conjure.java.api:* = 2.35.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.90.0
+com.palantir.dialogue:* = 3.91.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From 779e75c145d7655e2af9d87eaa1e5277980bc968 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:05:32 -0700
Subject: [PATCH 05/53] Excavator:  Upgrade dependencies (#2682)

---
 versions.lock  | 8 ++++----
 versions.props | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions.lock b/versions.lock
index 84191be861..1f68b22570 100644
--- a/versions.lock
+++ b/versions.lock
@@ -47,10 +47,10 @@ com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
-com.palantir.tritium:tritium-api:0.74.0 (2 constraints: 371f74bd)
-com.palantir.tritium:tritium-core:0.74.0 (1 constraints: 431050a2)
-com.palantir.tritium:tritium-metrics:0.74.0 (5 constraints: 024df559)
-com.palantir.tritium:tritium-registry:0.74.0 (6 constraints: 445d45d3)
+com.palantir.tritium:tritium-api:0.75.0 (2 constraints: 391fa8bd)
+com.palantir.tritium:tritium-core:0.75.0 (1 constraints: 441053a2)
+com.palantir.tritium:tritium-metrics:0.75.0 (5 constraints: 034dc75a)
+com.palantir.tritium:tritium-registry:0.75.0 (6 constraints: 465d48d4)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index c6e0f6f0c6..9f6aa538d5 100644
--- a/versions.props
+++ b/versions.props
@@ -12,7 +12,7 @@ com.palantir.dialogue:* = 3.91.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
-com.palantir.tritium:* = 0.74.0
+com.palantir.tritium:* = 0.75.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2

From cd69e3fb460865c690626b8eb6a975aa2a6ec1ce Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:40:04 -0700
Subject: [PATCH 06/53] Excavator:  Upgrade buildscript dependencies (#2683)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4dfd1697a1..4ffb392402 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,9 +14,9 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:5.13.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
-        classpath 'com.palantir.metricschema:gradle-metric-schema:0.22.0'
+        classpath 'com.palantir.metricschema:gradle-metric-schema:0.23.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.13.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.15.0'
     }
 }
 

From 28e17652056c200a7ce0ed0a15423184180c72a4 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 29 Aug 2023 14:00:19 -0700
Subject: [PATCH 07/53] Excavator:  Update gradle-jdks infrastructure plugins
 (#2684)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4ffb392402..d9f091e453 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.33.0'
-        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.10.0'
+        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.35.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'

From b78379b02d6b09aa2ea6a5f4a2ef5590af03b12e Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 29 Aug 2023 19:46:29 -0700
Subject: [PATCH 08/53] Excavator:  Update conjure plugins and dependencies
 (#2685)

---
 versions.lock  | 8 ++++----
 versions.props | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/versions.lock b/versions.lock
index 1f68b22570..304573c1f3 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,7 +1,7 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (9 constraints: 42b6b164)
-com.fasterxml.jackson.core:jackson-core:2.15.2 (13 constraints: 0526d599)
+com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 63c62861)
+com.fasterxml.jackson.core:jackson-core:2.15.2 (14 constraints: 2636773c)
 com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d58ca97a)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 2e20bb05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: 3905393b)
@@ -24,7 +24,7 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.17.0 (3 constraints: 69252251)
+com.palantir.conjure.java:conjure-lib:7.18.0 (3 constraints: 6a258251)
 com.palantir.conjure.java.api:errors:2.35.0 (3 constraints: 3225144a)
 com.palantir.conjure.java.api:service-config:2.35.0 (3 constraints: a42895e2)
 com.palantir.conjure.java.api:ssl-config:2.35.0 (2 constraints: ff178486)
@@ -40,7 +40,7 @@ com.palantir.safe-logging:logger:3.6.0 (12 constraints: 53b8606a)
 com.palantir.safe-logging:logger-slf4j:3.6.0 (1 constraints: 040e6542)
 com.palantir.safe-logging:logger-spi:3.6.0 (2 constraints: 171e6d7b)
 com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: b31df9a9)
-com.palantir.safe-logging:safe-logging:3.6.0 (17 constraints: 6c0cf595)
+com.palantir.safe-logging:safe-logging:3.6.0 (18 constraints: 5c1c22db)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
 com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 47482351)
 com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
diff --git a/versions.props b/versions.props
index 9f6aa538d5..2be3ea214d 100644
--- a/versions.props
+++ b/versions.props
@@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.2-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:* = 7.17.0
-com.palantir.conjure.java:conjure-lib = 7.17.0
+com.palantir.conjure.java:* = 7.18.0
+com.palantir.conjure.java:conjure-lib = 7.18.0
 com.palantir.conjure.java.api:* = 2.35.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.91.0

From 6c6c8d12d96b7005dad7844009d1b2a182df9ec5 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Wed, 30 Aug 2023 19:01:19 -0700
Subject: [PATCH 09/53] Excavator:  Update conjure plugins and dependencies
 (#2686)

---
 versions.lock  | 2 +-
 versions.props | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions.lock b/versions.lock
index 304573c1f3..de5ba67c36 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,7 +24,7 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.18.0 (3 constraints: 6a258251)
+com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6b25e251)
 com.palantir.conjure.java.api:errors:2.35.0 (3 constraints: 3225144a)
 com.palantir.conjure.java.api:service-config:2.35.0 (3 constraints: a42895e2)
 com.palantir.conjure.java.api:ssl-config:2.35.0 (2 constraints: ff178486)
diff --git a/versions.props b/versions.props
index 2be3ea214d..aacf2308bd 100644
--- a/versions.props
+++ b/versions.props
@@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.2-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:* = 7.18.0
-com.palantir.conjure.java:conjure-lib = 7.18.0
+com.palantir.conjure.java:* = 7.19.0
+com.palantir.conjure.java:conjure-lib = 7.19.0
 com.palantir.conjure.java.api:* = 2.35.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.91.0

From 22aba96bfa9acc5beda3333d786fd0a8dc56039a Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:14:07 -0700
Subject: [PATCH 10/53] Excavator:  Upgrade dependencies (#2687)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index de5ba67c36..e77092059f 100644
--- a/versions.lock
+++ b/versions.lock
@@ -68,7 +68,7 @@ joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
 org.apache.httpcomponents.core5:httpcore5:5.2.2 (3 constraints: a038a439)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
-org.checkerframework:checker-qual:3.37.0 (3 constraints: bb1f2d54)
+org.checkerframework:checker-qual:3.38.0 (3 constraints: bc1f8054)
 org.glassfish:jakarta.el:4.0.2 (1 constraints: fe135865)
 org.glassfish.hk2:hk2-api:3.0.3 (1 constraints: 6b0c570c)
 org.glassfish.hk2:hk2-locator:3.0.3 (1 constraints: 4110d5ad)
diff --git a/versions.props b/versions.props
index aacf2308bd..6224e8d089 100644
--- a/versions.props
+++ b/versions.props
@@ -31,7 +31,7 @@ io.undertow:undertow-servlet-jakarta = 2.2.20.Final
 # dependency-upgrader:ON
 com.palantir.refreshable:refreshable = 2.3.0
 org.hibernate.validator:* = 6.2.0.Final
-org.checkerframework:checker-qual = 3.37.0
+org.checkerframework:checker-qual = 3.38.0
 
 org.apache.httpcomponents.client5:* = 5.2.1
 

From 5f41004ae08c321f3e1ec7604aae58e8ca4078c2 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:01:11 -0700
Subject: [PATCH 11/53] Excavator:  Format Java files (#2688)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d9f091e453..5c87ef79e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.33.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.35.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.36.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:5.13.0'

From 91f9f1bc01ef3666d13e89ab68118939950c75fd Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Wed, 6 Sep 2023 11:25:58 -0700
Subject: [PATCH 12/53] Excavator:  Upgrade dependencies (#2689)

---
 versions.lock  | 8 ++++----
 versions.props | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions.lock b/versions.lock
index e77092059f..00a12ddb49 100644
--- a/versions.lock
+++ b/versions.lock
@@ -47,10 +47,10 @@ com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
-com.palantir.tritium:tritium-api:0.75.0 (2 constraints: 391fa8bd)
-com.palantir.tritium:tritium-core:0.75.0 (1 constraints: 441053a2)
-com.palantir.tritium:tritium-metrics:0.75.0 (5 constraints: 034dc75a)
-com.palantir.tritium:tritium-registry:0.75.0 (6 constraints: 465d48d4)
+com.palantir.tritium:tritium-api:0.76.0 (2 constraints: 3b1fdcbd)
+com.palantir.tritium:tritium-core:0.76.0 (1 constraints: 451056a2)
+com.palantir.tritium:tritium-metrics:0.76.0 (5 constraints: 044d995b)
+com.palantir.tritium:tritium-registry:0.76.0 (6 constraints: 485d4bd5)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index 6224e8d089..e99ee4776a 100644
--- a/versions.props
+++ b/versions.props
@@ -12,7 +12,7 @@ com.palantir.dialogue:* = 3.91.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
-com.palantir.tritium:* = 0.75.0
+com.palantir.tritium:* = 0.76.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2

From 9f00b5ff062a93bbc9809a2a730ec4ea6b42c3ad Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 12 Sep 2023 15:10:44 -0700
Subject: [PATCH 13/53] Excavator:  Upgrade dependencies (#2690)

---
 versions.lock  | 18 +++++++++---------
 versions.props |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/versions.lock b/versions.lock
index 00a12ddb49..90b10b2bb2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -2,7 +2,7 @@
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
 com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 63c62861)
 com.fasterxml.jackson.core:jackson-core:2.15.2 (14 constraints: 2636773c)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d58ca97a)
+com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d78c6d7c)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 2e20bb05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: 3905393b)
 com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.2 (1 constraints: 3905393b)
@@ -18,16 +18,16 @@ com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: eaf9bd29)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:32.1.2-jre (15 constraints: 1a089ccd)
+com.google.guava:guava:32.1.2-jre (15 constraints: ef09535e)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
 com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6b25e251)
-com.palantir.conjure.java.api:errors:2.35.0 (3 constraints: 3225144a)
-com.palantir.conjure.java.api:service-config:2.35.0 (3 constraints: a42895e2)
-com.palantir.conjure.java.api:ssl-config:2.35.0 (2 constraints: ff178486)
+com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3325744a)
+com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a528ffe2)
+com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
 com.palantir.dialogue:dialogue-apache-hc5-client:3.91.0 (1 constraints: 3f05583b)
 com.palantir.dialogue:dialogue-blocking-channels:3.91.0 (2 constraints: d92369b3)
 com.palantir.dialogue:dialogue-core:3.91.0 (2 constraints: 3f1918ee)
@@ -36,13 +36,13 @@ com.palantir.dialogue:dialogue-serde:3.91.0 (1 constraints: 3f05583b)
 com.palantir.dialogue:dialogue-target:3.91.0 (5 constraints: 0c4d245e)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
-com.palantir.safe-logging:logger:3.6.0 (12 constraints: 53b8606a)
+com.palantir.safe-logging:logger:3.6.0 (12 constraints: 55b8fc6d)
 com.palantir.safe-logging:logger-slf4j:3.6.0 (1 constraints: 040e6542)
 com.palantir.safe-logging:logger-spi:3.6.0 (2 constraints: 171e6d7b)
-com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: b31df9a9)
-com.palantir.safe-logging:safe-logging:3.6.0 (18 constraints: 5c1c22db)
+com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: b91d73b9)
+com.palantir.safe-logging:safe-logging:3.6.0 (18 constraints: 601ccce5)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
-com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 47482351)
+com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 48488351)
 com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
diff --git a/versions.props b/versions.props
index e99ee4776a..1820b9b557 100644
--- a/versions.props
+++ b/versions.props
@@ -6,7 +6,7 @@ com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
 com.palantir.conjure.java:* = 7.19.0
 com.palantir.conjure.java:conjure-lib = 7.19.0
-com.palantir.conjure.java.api:* = 2.35.0
+com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.91.0
 com.palantir.safe-logging:* = 3.6.0

From 0002c70a0499ba85fa58254eda53e28fae621877 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 14 Sep 2023 08:53:53 -0700
Subject: [PATCH 14/53] Excavator:  Format Java files (#2691)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5c87ef79e0..a7c652d288 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.33.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.36.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.38.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:5.13.0'

From 836decb527a940b42be62bed3d3592bc0435d6d5 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:44:35 -0700
Subject: [PATCH 15/53] Excavator:  Test libraries using the latest Java LTS
 (#2692)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a7c652d288..dcaaa24925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ apply plugin: 'com.palantir.jdks.latest'
 
 javaVersions {
     libraryTarget = 11
-    runtime = 17
+    runtime = 21
 }
 
 version gitVersion()

From 8ac510d18fdf293074c4517472c93648aa3ab609 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Sun, 17 Sep 2023 18:04:21 -0700
Subject: [PATCH 16/53] Excavator:  Upgrade dependencies (#2693)

---
 versions.lock  | 19 ++++++++++---------
 versions.props |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/versions.lock b/versions.lock
index 90b10b2bb2..2b80ca2cdb 100644
--- a/versions.lock
+++ b/versions.lock
@@ -34,23 +34,24 @@ com.palantir.dialogue:dialogue-core:3.91.0 (2 constraints: 3f1918ee)
 com.palantir.dialogue:dialogue-futures:3.91.0 (3 constraints: ce3306be)
 com.palantir.dialogue:dialogue-serde:3.91.0 (1 constraints: 3f05583b)
 com.palantir.dialogue:dialogue-target:3.91.0 (5 constraints: 0c4d245e)
+com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
-com.palantir.safe-logging:logger:3.6.0 (12 constraints: 55b8fc6d)
+com.palantir.safe-logging:logger:3.6.0 (13 constraints: 9dc69a31)
 com.palantir.safe-logging:logger-slf4j:3.6.0 (1 constraints: 040e6542)
 com.palantir.safe-logging:logger-spi:3.6.0 (2 constraints: 171e6d7b)
-com.palantir.safe-logging:preconditions:3.6.0 (18 constraints: b91d73b9)
-com.palantir.safe-logging:safe-logging:3.6.0 (18 constraints: 601ccce5)
+com.palantir.safe-logging:preconditions:3.6.0 (19 constraints: 012cb786)
+com.palantir.safe-logging:safe-logging:3.6.0 (19 constraints: a82ad682)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
 com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 48488351)
 com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
-com.palantir.tritium:tritium-api:0.76.0 (2 constraints: 3b1fdcbd)
-com.palantir.tritium:tritium-core:0.76.0 (1 constraints: 451056a2)
-com.palantir.tritium:tritium-metrics:0.76.0 (5 constraints: 044d995b)
-com.palantir.tritium:tritium-registry:0.76.0 (6 constraints: 485d4bd5)
+com.palantir.tritium:tritium-api:0.77.0 (2 constraints: 3d1f10be)
+com.palantir.tritium:tritium-core:0.77.0 (1 constraints: 461059a2)
+com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 054d6b5c)
+com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 4a5d4ed6)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
@@ -85,11 +86,13 @@ org.hibernate.validator:hibernate-validator:7.0.1.Final (1 constraints: 1816f4e3
 org.immutables:value:2.9.3 (1 constraints: 10051336)
 org.javassist:javassist:3.28.0-GA (1 constraints: 2d1120f1)
 org.jboss.logging:jboss-logging:3.4.1.Final (4 constraints: a24557a8)
+org.jboss.threads:jboss-threads:3.5.0.Final (3 constraints: b52a2fe5)
 org.jetbrains:annotations:24.0.1 (2 constraints: fc20bc6d)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
 org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (1 constraints: 0d10f991)
 org.scala-lang:scala-library:2.12.17 (1 constraints: 3c16782c)
 org.slf4j:slf4j-api:1.7.36 (8 constraints: 4e7ba54e)
+org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1)
 
 [Test dependencies]
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2 (1 constraints: 3905393b)
@@ -116,7 +119,6 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.0.6 (1 constraints: 0b050
 org.hamcrest:hamcrest:2.1 (2 constraints: 8512932d)
 org.hamcrest:hamcrest-core:2.1 (2 constraints: 88126e10)
 org.hamcrest:hamcrest-library:2.1 (1 constraints: 1507415c)
-org.jboss.threads:jboss-threads:3.1.0.Final (2 constraints: 561a9b42)
 org.jboss.xnio:xnio-api:3.8.7.Final (2 constraints: 771a3146)
 org.jboss.xnio:xnio-nio:3.8.7.Final (1 constraints: c80dcb30)
 org.jmock:jmock:2.12.0 (1 constraints: 3705353b)
@@ -134,5 +136,4 @@ org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
 org.reactivestreams:reactive-streams:1.0.3 (1 constraints: 1f0c60f9)
 org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308)
-org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1)
 org.yaml:snakeyaml:2.0 (1 constraints: 3a178910)
diff --git a/versions.props b/versions.props
index 1820b9b557..ce08df9d3c 100644
--- a/versions.props
+++ b/versions.props
@@ -12,7 +12,7 @@ com.palantir.dialogue:* = 3.91.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
-com.palantir.tritium:* = 0.76.0
+com.palantir.tritium:* = 0.77.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2

From a35c3b38e27afad0295732fbbe56240d1ee4d3de Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 18 Sep 2023 10:47:28 -0700
Subject: [PATCH 17/53] Excavator:  Update conjure plugins and dependencies
 (#2694)

---
 versions.lock  | 22 +++++++++++-----------
 versions.props |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/versions.lock b/versions.lock
index 2b80ca2cdb..e2e9926891 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,16 +24,16 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6b25e251)
-com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3325744a)
-com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a528ffe2)
+com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6f254c52)
+com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3425774a)
+com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
 com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.91.0 (1 constraints: 3f05583b)
-com.palantir.dialogue:dialogue-blocking-channels:3.91.0 (2 constraints: d92369b3)
-com.palantir.dialogue:dialogue-core:3.91.0 (2 constraints: 3f1918ee)
-com.palantir.dialogue:dialogue-futures:3.91.0 (3 constraints: ce3306be)
-com.palantir.dialogue:dialogue-serde:3.91.0 (1 constraints: 3f05583b)
-com.palantir.dialogue:dialogue-target:3.91.0 (5 constraints: 0c4d245e)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.93.0 (1 constraints: 41055e3b)
+com.palantir.dialogue:dialogue-blocking-channels:3.93.0 (2 constraints: dd23d1b3)
+com.palantir.dialogue:dialogue-core:3.93.0 (2 constraints: 431998ee)
+com.palantir.dialogue:dialogue-futures:3.93.0 (3 constraints: d4332abf)
+com.palantir.dialogue:dialogue-serde:3.93.0 (1 constraints: 41055e3b)
+com.palantir.dialogue:dialogue-target:3.93.0 (5 constraints: 164d1c62)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -50,8 +50,8 @@ com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.77.0 (2 constraints: 3d1f10be)
 com.palantir.tritium:tritium-core:0.77.0 (1 constraints: 461059a2)
-com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 054d6b5c)
-com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 4a5d4ed6)
+com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 0d4dbf5e)
+com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 525d12da)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index ce08df9d3c..870a4a64c2 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.19.0
 com.palantir.conjure.java:conjure-lib = 7.19.0
 com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.91.0
+com.palantir.dialogue:* = 3.93.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From e8ebe95c4448558b34ab24bc5a2cef52b88dac2a Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 2 Oct 2023 15:02:44 -0700
Subject: [PATCH 18/53] Excavator:  Upgrade dependencies (#2695)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index e2e9926891..960f1261d7 100644
--- a/versions.lock
+++ b/versions.lock
@@ -69,7 +69,7 @@ joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
 org.apache.httpcomponents.core5:httpcore5:5.2.2 (3 constraints: a038a439)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
-org.checkerframework:checker-qual:3.38.0 (3 constraints: bc1f8054)
+org.checkerframework:checker-qual:3.39.0 (3 constraints: bd1fd354)
 org.glassfish:jakarta.el:4.0.2 (1 constraints: fe135865)
 org.glassfish.hk2:hk2-api:3.0.3 (1 constraints: 6b0c570c)
 org.glassfish.hk2:hk2-locator:3.0.3 (1 constraints: 4110d5ad)
diff --git a/versions.props b/versions.props
index 870a4a64c2..095ba3e433 100644
--- a/versions.props
+++ b/versions.props
@@ -31,7 +31,7 @@ io.undertow:undertow-servlet-jakarta = 2.2.20.Final
 # dependency-upgrader:ON
 com.palantir.refreshable:refreshable = 2.3.0
 org.hibernate.validator:* = 6.2.0.Final
-org.checkerframework:checker-qual = 3.38.0
+org.checkerframework:checker-qual = 3.39.0
 
 org.apache.httpcomponents.client5:* = 5.2.1
 

From da7847a8516cf92284becc0a4881420043b3f5f2 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 3 Oct 2023 11:35:27 -0700
Subject: [PATCH 19/53] Excavator:  Upgrade dependencies (#2696)

---
 versions.lock  | 20 ++++++++++----------
 versions.props |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/versions.lock b/versions.lock
index 960f1261d7..90c9d9ca16 100644
--- a/versions.lock
+++ b/versions.lock
@@ -28,12 +28,12 @@ com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6f254c52)
 com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3425774a)
 com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
 com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.93.0 (1 constraints: 41055e3b)
-com.palantir.dialogue:dialogue-blocking-channels:3.93.0 (2 constraints: dd23d1b3)
-com.palantir.dialogue:dialogue-core:3.93.0 (2 constraints: 431998ee)
-com.palantir.dialogue:dialogue-futures:3.93.0 (3 constraints: d4332abf)
-com.palantir.dialogue:dialogue-serde:3.93.0 (1 constraints: 41055e3b)
-com.palantir.dialogue:dialogue-target:3.93.0 (5 constraints: 164d1c62)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.94.0 (1 constraints: 4205613b)
+com.palantir.dialogue:dialogue-blocking-channels:3.94.0 (2 constraints: df2305b4)
+com.palantir.dialogue:dialogue-core:3.94.0 (2 constraints: 4519d8ee)
+com.palantir.dialogue:dialogue-futures:3.94.0 (3 constraints: d733bcbf)
+com.palantir.dialogue:dialogue-serde:3.94.0 (1 constraints: 4205613b)
+com.palantir.dialogue:dialogue-target:3.94.0 (5 constraints: 1b4d1864)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -50,15 +50,15 @@ com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.77.0 (2 constraints: 3d1f10be)
 com.palantir.tritium:tritium-core:0.77.0 (1 constraints: 461059a2)
-com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 0d4dbf5e)
-com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 525d12da)
+com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 114de95f)
+com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 565df4db)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.sun.activation:jakarta.activation:2.0.1 (1 constraints: 8c0f4591)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
-io.dropwizard.metrics:metrics-core:4.2.19 (6 constraints: 6c59a37b)
+io.dropwizard.metrics:metrics-core:4.2.20 (6 constraints: 54598e6e)
 jakarta.annotation:jakarta.annotation-api:2.0.0 (4 constraints: f0361843)
 jakarta.el:jakarta.el-api:4.0.0 (2 constraints: e81e979a)
 jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 82605b36)
@@ -67,7 +67,7 @@ jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (8 constraints: 868cd469)
 jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (2 constraints: 3a33edc3)
 joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
-org.apache.httpcomponents.core5:httpcore5:5.2.2 (3 constraints: a038a439)
+org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: a1380c3a)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
 org.checkerframework:checker-qual:3.39.0 (3 constraints: bd1fd354)
 org.glassfish:jakarta.el:4.0.2 (1 constraints: fe135865)
diff --git a/versions.props b/versions.props
index 095ba3e433..7d58d8a7bb 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.19.0
 com.palantir.conjure.java:conjure-lib = 7.19.0
 com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.93.0
+com.palantir.dialogue:* = 3.94.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From 44c19ccf31b43e36c49187833237a1188cc690f7 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 5 Oct 2023 03:56:11 -0700
Subject: [PATCH 20/53] Excavator:  Upgrade buildscript dependencies (#2697)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dcaaa24925..bc7ace4aeb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.23.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.15.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.16.0'
     }
 }
 

From f09a580854d010df07e5c6cc20de4121eb1adc19 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 6 Oct 2023 12:04:36 -0700
Subject: [PATCH 21/53] Excavator:  Upgrade dependencies (#2698)

---
 versions.lock  | 10 +++++-----
 versions.props |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions.lock b/versions.lock
index 90c9d9ca16..8c75740892 100644
--- a/versions.lock
+++ b/versions.lock
@@ -83,7 +83,7 @@ org.glassfish.jersey.ext:jersey-bean-validation:3.0.6 (1 constraints: 0b050036)
 org.glassfish.jersey.inject:jersey-hk2:3.0.6 (1 constraints: 0b050036)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3e103aa2)
 org.hibernate.validator:hibernate-validator:7.0.1.Final (1 constraints: 1816f4e3)
-org.immutables:value:2.9.3 (1 constraints: 10051336)
+org.immutables:value:2.10.0 (1 constraints: 35052f3b)
 org.javassist:javassist:3.28.0-GA (1 constraints: 2d1120f1)
 org.jboss.logging:jboss-logging:3.4.1.Final (4 constraints: a24557a8)
 org.jboss.threads:jboss-threads:3.5.0.Final (3 constraints: b52a2fe5)
@@ -105,8 +105,8 @@ io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.12 (1 constraints: 080f065e)
-net.bytebuddy:byte-buddy:1.14.6 (2 constraints: c216a84f)
-net.bytebuddy:byte-buddy-agent:1.14.6 (1 constraints: 460b44de)
+net.bytebuddy:byte-buddy:1.14.8 (2 constraints: c416aa4f)
+net.bytebuddy:byte-buddy-agent:1.14.8 (1 constraints: 480b46de)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
 org.apache.commons:commons-lang3:3.13.0 (1 constraints: 39053e3b)
@@ -129,8 +129,8 @@ org.junit.jupiter:junit-jupiter-engine:5.10.0 (1 constraints: 330efd49)
 org.junit.jupiter:junit-jupiter-params:5.10.0 (2 constraints: 6a131c5b)
 org.junit.platform:junit-platform-commons:1.10.0 (2 constraints: 2b211983)
 org.junit.platform:junit-platform-engine:1.10.0 (1 constraints: d210e4c4)
-org.mockito:mockito-core:5.5.0 (2 constraints: d0138265)
-org.mockito:mockito-junit-jupiter:5.5.0 (1 constraints: 0c051336)
+org.mockito:mockito-core:5.6.0 (2 constraints: d213b265)
+org.mockito:mockito-junit-jupiter:5.6.0 (1 constraints: 0d051636)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
 org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
diff --git a/versions.props b/versions.props
index 7d58d8a7bb..ccbab4250a 100644
--- a/versions.props
+++ b/versions.props
@@ -16,10 +16,10 @@ com.palantir.tritium:* = 0.77.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2
-org.immutables:value = 2.9.3
+org.immutables:value = 2.10.0
 org.jmock:jmock = 2.12.0
 org.junit.*:* = 5.10.0
-org.mockito:* = 5.5.0
+org.mockito:* = 5.6.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
 io.undertow:* = 2.2.24.Final

From 696c79e10ef7ca3de62a0bd198af44bff090b6ad Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 10 Oct 2023 19:28:43 -0700
Subject: [PATCH 22/53] Excavator:  Upgrade dependencies (#2699)

---
 versions.lock  | 6 +++---
 versions.props | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/versions.lock b/versions.lock
index 8c75740892..23dd449863 100644
--- a/versions.lock
+++ b/versions.lock
@@ -16,9 +16,9 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (
 com.fasterxml.jackson.module:jackson-module-scala_2.12:2.15.2 (1 constraints: 3905393b)
 com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
-com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: eaf9bd29)
+com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: e5f9191d)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:32.1.2-jre (15 constraints: ef09535e)
+com.google.guava:guava:32.1.3-jre (15 constraints: f0093c61)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
@@ -69,7 +69,7 @@ joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
 org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: a1380c3a)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
-org.checkerframework:checker-qual:3.39.0 (3 constraints: bd1fd354)
+org.checkerframework:checker-qual:3.39.0 (3 constraints: c11fdf54)
 org.glassfish:jakarta.el:4.0.2 (1 constraints: fe135865)
 org.glassfish.hk2:hk2-api:3.0.3 (1 constraints: 6b0c570c)
 org.glassfish.hk2:hk2-locator:3.0.3 (1 constraints: 4110d5ad)
diff --git a/versions.props b/versions.props
index ccbab4250a..93713cd302 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
 com.fasterxml.jackson.core:jackson-databind = 2.15.2
 com.github.ben-manes.caffeine:caffeine = 3.1.8
 com.google.code.findbugs:jsr305 = 3.0.2
-com.google.guava:guava = 32.1.2-jre
+com.google.guava:guava = 32.1.3-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
 com.palantir.conjure.java:* = 7.19.0

From 28fe769df2cf5530b255d690539e550167fcdff8 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 12 Oct 2023 08:04:08 -0700
Subject: [PATCH 23/53] Excavator:  Upgrade Undertow Server (#2700)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index 23dd449863..e74e4d1a52 100644
--- a/versions.lock
+++ b/versions.lock
@@ -101,7 +101,7 @@ com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
 com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b)
-io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
+io.undertow:undertow-core:2.2.27.Final (2 constraints: a9199aeb)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.12 (1 constraints: 080f065e)
diff --git a/versions.props b/versions.props
index 93713cd302..7ba1206cbf 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ org.junit.*:* = 5.10.0
 org.mockito:* = 5.6.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
-io.undertow:* = 2.2.24.Final
+io.undertow:* = 2.2.27.Final
 # dependency-upgrader:OFF
 # Last version of undertow with both Jakarta+Javax support before 'undertow-servlet' was
 # updated to jakarta only. This should NEVER be done in production code, it is only used

From 4116fe7a62e11d22d63474c53e06c7e73726cad0 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Sun, 15 Oct 2023 07:27:41 -0700
Subject: [PATCH 24/53] Excavator:  Upgrades Baseline to the latest version
 (#2647)

---
 build.gradle                                                   | 2 +-
 .../conjure/java/client/config/ClientConfiguration.java        | 2 ++
 .../java/server/jersey/AuthHeaderParamConverterProvider.java   | 2 ++
 .../java/server/jersey/BearerTokenParamConverterProvider.java  | 2 ++
 .../java/server/jersey/AuthHeaderParamConverterProvider.java   | 2 ++
 .../java/server/jersey/BearerTokenParamConverterProvider.java  | 2 ++
 .../server/undertest/ServerUnderTestApplication.java           | 3 +--
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index bc7ace4aeb..a5be6af9d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.38.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:5.13.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.25.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.23.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
diff --git a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java
index b76487eca8..f5c97be3a3 100644
--- a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java
+++ b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java
@@ -23,6 +23,7 @@
 import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
 import com.palantir.conjure.java.api.config.service.ServiceConfiguration;
 import com.palantir.conjure.java.api.config.service.UserAgent;
+import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
@@ -38,6 +39,7 @@
  * A context-independent (i.e., does not depend on configuration files or on-disk entities like JKS keystores)
  * instantiation of a {@link ServiceConfiguration}.
  */
+@DoNotLog
 @Value.Immutable
 @ImmutablesStyle
 public interface ClientConfiguration {
diff --git a/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java b/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
index 6069c40399..d9aafcbf97 100644
--- a/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
+++ b/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
@@ -16,6 +16,7 @@
 
 package com.palantir.conjure.java.server.jersey;
 
+import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tokens.auth.AuthHeader;
 import jakarta.ws.rs.HeaderParam;
@@ -81,6 +82,7 @@ public AuthHeader fromString(final String value) {
             }
         }
 
+        @DoNotLog
         @Override
         public String toString(final AuthHeader value) {
             Preconditions.checkArgument(value != null);
diff --git a/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java b/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
index 57461997d9..d52711b172 100644
--- a/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
+++ b/conjure-java-jersey-jakarta-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
@@ -16,6 +16,7 @@
 
 package com.palantir.conjure.java.server.jersey;
 
+import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tokens.auth.BearerToken;
 import jakarta.ws.rs.CookieParam;
@@ -80,6 +81,7 @@ public BearerToken fromString(final String value) {
             }
         }
 
+        @DoNotLog
         @Override
         public String toString(final BearerToken value) {
             Preconditions.checkArgument(value != null);
diff --git a/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java b/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
index e682f40569..74e429cece 100644
--- a/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
+++ b/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/AuthHeaderParamConverterProvider.java
@@ -16,6 +16,7 @@
 
 package com.palantir.conjure.java.server.jersey;
 
+import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tokens.auth.AuthHeader;
 import java.lang.annotation.Annotation;
@@ -81,6 +82,7 @@ public AuthHeader fromString(final String value) {
             }
         }
 
+        @DoNotLog
         @Override
         public String toString(final AuthHeader value) {
             Preconditions.checkArgument(value != null);
diff --git a/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java b/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
index 3c009616e0..427e70afe7 100644
--- a/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
+++ b/conjure-java-jersey-server/src/main/java/com/palantir/conjure/java/server/jersey/BearerTokenParamConverterProvider.java
@@ -16,6 +16,7 @@
 
 package com.palantir.conjure.java.server.jersey;
 
+import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tokens.auth.BearerToken;
 import java.lang.annotation.Annotation;
@@ -80,6 +81,7 @@ public BearerToken fromString(final String value) {
             }
         }
 
+        @DoNotLog
         @Override
         public String toString(final BearerToken value) {
             Preconditions.checkArgument(value != null);
diff --git a/conjure-java-server-verifier/src/test/java/com/palantir/verification/server/undertest/ServerUnderTestApplication.java b/conjure-java-server-verifier/src/test/java/com/palantir/verification/server/undertest/ServerUnderTestApplication.java
index 0a425eb996..ffe29f8c04 100644
--- a/conjure-java-server-verifier/src/test/java/com/palantir/verification/server/undertest/ServerUnderTestApplication.java
+++ b/conjure-java-server-verifier/src/test/java/com/palantir/verification/server/undertest/ServerUnderTestApplication.java
@@ -17,7 +17,6 @@
 package com.palantir.verification.server.undertest;
 
 import com.google.common.base.Preconditions;
-import com.google.common.io.ByteStreams;
 import com.google.common.reflect.AbstractInvocationHandler;
 import com.google.common.reflect.Reflection;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
@@ -48,7 +47,7 @@ protected Object handleInvocation(Object _proxy, Method method, Object[] args) {
             Preconditions.checkArgument(args.length == 1, "Expected single argument. Method: %s", method);
             if (args[0] instanceof BinaryAliasExample) {
                 return (StreamingOutput) output ->
-                        ByteStreams.copy(((BinaryAliasExample) args[0]).get().getInputStream(), output);
+                        ((BinaryAliasExample) args[0]).get().getInputStream().transferTo(output);
             } else {
                 return args[0];
             }

From 80452c485fd3a22b85d229c9bf0741156caaf92f Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 16 Oct 2023 07:22:30 -0700
Subject: [PATCH 25/53] Excavator:  Update conjure plugins and dependencies
 (#2703)

---
 versions.lock  | 16 ++++++++--------
 versions.props |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/versions.lock b/versions.lock
index e74e4d1a52..aec226cd52 100644
--- a/versions.lock
+++ b/versions.lock
@@ -18,7 +18,7 @@ com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: e5f9191d)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:32.1.3-jre (15 constraints: f0093c61)
+com.google.guava:guava:32.1.3-jre (15 constraints: f6093b6b)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
@@ -28,12 +28,12 @@ com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6f254c52)
 com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3425774a)
 com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
 com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.94.0 (1 constraints: 4205613b)
-com.palantir.dialogue:dialogue-blocking-channels:3.94.0 (2 constraints: df2305b4)
-com.palantir.dialogue:dialogue-core:3.94.0 (2 constraints: 4519d8ee)
-com.palantir.dialogue:dialogue-futures:3.94.0 (3 constraints: d733bcbf)
-com.palantir.dialogue:dialogue-serde:3.94.0 (1 constraints: 4205613b)
-com.palantir.dialogue:dialogue-target:3.94.0 (5 constraints: 1b4d1864)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.95.0 (1 constraints: 4305643b)
+com.palantir.dialogue:dialogue-blocking-channels:3.95.0 (2 constraints: e12339b4)
+com.palantir.dialogue:dialogue-core:3.95.0 (2 constraints: 471918ef)
+com.palantir.dialogue:dialogue-futures:3.95.0 (3 constraints: da334ec0)
+com.palantir.dialogue:dialogue-serde:3.95.0 (1 constraints: 4305643b)
+com.palantir.dialogue:dialogue-target:3.95.0 (5 constraints: 204d1466)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -58,7 +58,7 @@ com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.sun.activation:jakarta.activation:2.0.1 (1 constraints: 8c0f4591)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
-io.dropwizard.metrics:metrics-core:4.2.20 (6 constraints: 54598e6e)
+io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 57593170)
 jakarta.annotation:jakarta.annotation-api:2.0.0 (4 constraints: f0361843)
 jakarta.el:jakarta.el-api:4.0.0 (2 constraints: e81e979a)
 jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 82605b36)
diff --git a/versions.props b/versions.props
index 7ba1206cbf..9b87773466 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.19.0
 com.palantir.conjure.java:conjure-lib = 7.19.0
 com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.94.0
+com.palantir.dialogue:* = 3.95.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From bc09667d9506c585728f2b1fca240771085c4742 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:47:22 -0700
Subject: [PATCH 26/53] Excavator:  Upgrade dependencies (#2705)

---
 versions.lock  | 12 ++++++------
 versions.props |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions.lock b/versions.lock
index aec226cd52..b293726d91 100644
--- a/versions.lock
+++ b/versions.lock
@@ -28,12 +28,12 @@ com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6f254c52)
 com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3425774a)
 com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
 com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.95.0 (1 constraints: 4305643b)
-com.palantir.dialogue:dialogue-blocking-channels:3.95.0 (2 constraints: e12339b4)
-com.palantir.dialogue:dialogue-core:3.95.0 (2 constraints: 471918ef)
-com.palantir.dialogue:dialogue-futures:3.95.0 (3 constraints: da334ec0)
-com.palantir.dialogue:dialogue-serde:3.95.0 (1 constraints: 4305643b)
-com.palantir.dialogue:dialogue-target:3.95.0 (5 constraints: 204d1466)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.96.0 (1 constraints: 4405673b)
+com.palantir.dialogue:dialogue-blocking-channels:3.96.0 (2 constraints: e3236db4)
+com.palantir.dialogue:dialogue-core:3.96.0 (2 constraints: 491958ef)
+com.palantir.dialogue:dialogue-futures:3.96.0 (3 constraints: dd33e0c0)
+com.palantir.dialogue:dialogue-serde:3.96.0 (1 constraints: 4405673b)
+com.palantir.dialogue:dialogue-target:3.96.0 (5 constraints: 254d1068)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
diff --git a/versions.props b/versions.props
index 9b87773466..3fc7b577fe 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.19.0
 com.palantir.conjure.java:conjure-lib = 7.19.0
 com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.95.0
+com.palantir.dialogue:* = 3.96.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From 6ae3927909c2cd6eced20bf83dafb796400ded30 Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@palantir.com>
Date: Tue, 17 Oct 2023 15:31:20 -0400
Subject: [PATCH 27/53] Upgrade Jersey to the latest available release (#2707)

Upgrade Jersey to the latest available release
---
 conjure-java-jersey-server/build.gradle |  2 +-
 versions.lock                           | 50 ++++++++++++-------------
 versions.props                          |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/conjure-java-jersey-server/build.gradle b/conjure-java-jersey-server/build.gradle
index abe7dde572..3b57537d1d 100644
--- a/conjure-java-jersey-server/build.gradle
+++ b/conjure-java-jersey-server/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.palantir.external-publish-jar'
 apply plugin: 'com.palantir.metric-schema'
 
-def jerseyVersion = '2.34'
+def jerseyVersion = '2.40'
 
 versionsLock {
     disableJavaPluginDefaults()
diff --git a/versions.lock b/versions.lock
index b293726d91..b9f9536cb5 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,8 +1,8 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 63c62861)
+com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 62c62961)
 com.fasterxml.jackson.core:jackson-core:2.15.2 (14 constraints: 2636773c)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d78c6d7c)
+com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d68c6e7c)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 2e20bb05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: 3905393b)
 com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.2 (1 constraints: 3905393b)
@@ -12,7 +12,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 (1 constraints: 39
 com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.15.2 (1 constraints: f61afc42)
 com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.15.2 (1 constraints: 3905393b)
 com.fasterxml.jackson.module:jackson-module-afterburner:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (2 constraints: e430cfb3)
+com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (2 constraints: e330d0b3)
 com.fasterxml.jackson.module:jackson-module-scala_2.12:2.15.2 (1 constraints: 3905393b)
 com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
@@ -56,36 +56,36 @@ com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
-com.sun.activation:jakarta.activation:2.0.1 (1 constraints: 8c0f4591)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
 io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 57593170)
-jakarta.annotation:jakarta.annotation-api:2.0.0 (4 constraints: f0361843)
-jakarta.el:jakarta.el-api:4.0.0 (2 constraints: e81e979a)
+jakarta.activation:jakarta.activation-api:2.1.0 (1 constraints: 8c0f4791)
+jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: f4368043)
+jakarta.el:jakarta.el-api:5.0.1 (2 constraints: eb1eda9a)
 jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 82605b36)
-jakarta.validation:jakarta.validation-api:3.0.0 (2 constraints: f6242ee0)
-jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (8 constraints: 868cd469)
-jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (2 constraints: 3a33edc3)
+jakarta.validation:jakarta.validation-api:3.0.2 (2 constraints: fa24a2e0)
+jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (8 constraints: 8c8c036d)
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.0 (2 constraints: 3a33f1c3)
 joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
 org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: a1380c3a)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
 org.checkerframework:checker-qual:3.39.0 (3 constraints: c11fdf54)
-org.glassfish:jakarta.el:4.0.2 (1 constraints: fe135865)
-org.glassfish.hk2:hk2-api:3.0.3 (1 constraints: 6b0c570c)
-org.glassfish.hk2:hk2-locator:3.0.3 (1 constraints: 4110d5ad)
-org.glassfish.hk2:hk2-utils:3.0.3 (2 constraints: 1b17aa76)
+org.glassfish:jakarta.el:5.0.0-M1 (1 constraints: a814a4a2)
+org.glassfish.hk2:hk2-api:3.0.4 (1 constraints: 6c0c580c)
+org.glassfish.hk2:hk2-locator:3.0.4 (1 constraints: 4210d6ad)
+org.glassfish.hk2:hk2-utils:3.0.4 (2 constraints: 1d17d276)
 org.glassfish.hk2:osgi-resource-locator:1.0.3 (1 constraints: ef10e7c2)
-org.glassfish.hk2.external:aopalliance-repackaged:3.0.3 (2 constraints: 1b17aa76)
-org.glassfish.jersey.core:jersey-client:3.0.6 (1 constraints: 0211bfc3)
-org.glassfish.jersey.core:jersey-common:3.0.6 (6 constraints: ae75ae9b)
-org.glassfish.jersey.core:jersey-server:3.0.6 (4 constraints: 374500ac)
-org.glassfish.jersey.ext:jersey-bean-validation:3.0.6 (1 constraints: 0b050036)
-org.glassfish.jersey.inject:jersey-hk2:3.0.6 (1 constraints: 0b050036)
+org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 (2 constraints: 1d17d276)
+org.glassfish.jersey.core:jersey-client:3.1.3 (1 constraints: 0011bfc3)
+org.glassfish.jersey.core:jersey-common:3.1.3 (6 constraints: a2756495)
+org.glassfish.jersey.core:jersey-server:3.1.3 (4 constraints: 31452caa)
+org.glassfish.jersey.ext:jersey-bean-validation:3.1.3 (1 constraints: 09050036)
+org.glassfish.jersey.inject:jersey-hk2:3.1.3 (1 constraints: 09050036)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3e103aa2)
-org.hibernate.validator:hibernate-validator:7.0.1.Final (1 constraints: 1816f4e3)
+org.hibernate.validator:hibernate-validator:8.0.1.Final (1 constraints: 1916ffe3)
 org.immutables:value:2.10.0 (1 constraints: 35052f3b)
-org.javassist:javassist:3.28.0-GA (1 constraints: 2d1120f1)
-org.jboss.logging:jboss-logging:3.4.1.Final (4 constraints: a24557a8)
+org.javassist:javassist:3.29.2-GA (1 constraints: 30112ef1)
+org.jboss.logging:jboss-logging:3.5.0.Final (4 constraints: 0747c0c6)
 org.jboss.threads:jboss-threads:3.5.0.Final (3 constraints: b52a2fe5)
 org.jetbrains:annotations:24.0.1 (2 constraints: fc20bc6d)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
@@ -113,9 +113,9 @@ org.apache.commons:commons-lang3:3.13.0 (1 constraints: 39053e3b)
 org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac)
 org.assertj:assertj-core:3.24.2 (2 constraints: 9c1928df)
 org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: 0b050636)
-org.glassfish.jersey.containers:jersey-container-servlet-core:3.0.6 (1 constraints: 0b050036)
-org.glassfish.jersey.ext:jersey-entity-filtering:3.0.6 (1 constraints: bf1525d3)
-org.glassfish.jersey.media:jersey-media-json-jackson:3.0.6 (1 constraints: 0b050036)
+org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.3 (1 constraints: 09050036)
+org.glassfish.jersey.ext:jersey-entity-filtering:3.1.3 (1 constraints: bd1525d3)
+org.glassfish.jersey.media:jersey-media-json-jackson:3.1.3 (1 constraints: 09050036)
 org.hamcrest:hamcrest:2.1 (2 constraints: 8512932d)
 org.hamcrest:hamcrest-core:2.1 (2 constraints: 88126e10)
 org.hamcrest:hamcrest-library:2.1 (1 constraints: 1507415c)
diff --git a/versions.props b/versions.props
index 3fc7b577fe..aaea9afbb8 100644
--- a/versions.props
+++ b/versions.props
@@ -39,7 +39,7 @@ org.apache.httpcomponents.client5:* = 5.2.1
 jakarta.servlet:jakarta.servlet-api = 5.0.0
 jakarta.ws.rs:jakarta.ws.rs-api = 3.1.0
 jakarta.annotation:jakarta.annotation-api = 2.0.0
-org.glassfish.jersey.*:* = 3.0.6
+org.glassfish.jersey.*:* = 3.1.3
 
 # for version locks on legacy javax versions
 javax.annotation:javax.annotation-api = 1.3.2

From f54c1d02e32e4e6dbdebacabbc4b22d898deb3cc Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:33:42 -0700
Subject: [PATCH 28/53] Excavator:  Upgrade Undertow Server (#2708)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index b9f9536cb5..688ebfa62a 100644
--- a/versions.lock
+++ b/versions.lock
@@ -101,7 +101,7 @@ com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
 com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b)
-io.undertow:undertow-core:2.2.27.Final (2 constraints: a9199aeb)
+io.undertow:undertow-core:2.2.28.Final (2 constraints: aa19d5eb)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.12 (1 constraints: 080f065e)
diff --git a/versions.props b/versions.props
index aaea9afbb8..de3af6c2fe 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ org.junit.*:* = 5.10.0
 org.mockito:* = 5.6.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
-io.undertow:* = 2.2.27.Final
+io.undertow:* = 2.2.28.Final
 # dependency-upgrader:OFF
 # Last version of undertow with both Jakarta+Javax support before 'undertow-servlet' was
 # updated to jakarta only. This should NEVER be done in production code, it is only used

From 47abf21bf67f20c2a25c1533fa8244b05b356e60 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 19 Oct 2023 22:43:36 -0700
Subject: [PATCH 29/53] Excavator:  Auto-label some excavator PRs (#2710)

---
 .excavator.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.excavator.yml b/.excavator.yml
index a947e38d5d..c1d8bf1af4 100644
--- a/.excavator.yml
+++ b/.excavator.yml
@@ -5,6 +5,7 @@ auto-label:
     versions-props/upgrade-all: [ "merge when ready" ]
     circleci/manage-circleci: [ "merge when ready" ]
   tags:
+    donotmerge: [ "do not merge" ]
     roomba: [ "merge when ready" ]
     automerge: [ "merge when ready" ]
     autorelease: [ "autorelease" ]

From bc96f43eb8f6b32f36ca5fe3c52ec9127e0ac2c1 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:13:01 -0700
Subject: [PATCH 30/53] Excavator:  Upgrade Jackson to the latest stable
 release (#2711)

---
 versions.lock  | 32 ++++++++++++++++----------------
 versions.props |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/versions.lock b/versions.lock
index 688ebfa62a..197634b6d7 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,19 +1,19 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.2 (10 constraints: 62c62961)
-com.fasterxml.jackson.core:jackson-core:2.15.2 (14 constraints: 2636773c)
-com.fasterxml.jackson.core:jackson-databind:2.15.2 (20 constraints: d68c6e7c)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (2 constraints: 2e20bb05)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.15.2 (1 constraints: f61afc42)
-com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.15.2 (1 constraints: 3905393b)
-com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2 (2 constraints: e330d0b3)
-com.fasterxml.jackson.module:jackson-module-scala_2.12:2.15.2 (1 constraints: 3905393b)
+com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 67c69468)
+com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 32361652)
+com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e28c8d9f)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.15.3 (1 constraints: f71afd42)
+com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.15.3 (1 constraints: 3905393b)
+com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.3 (2 constraints: e4300fb4)
+com.fasterxml.jackson.module:jackson-module-scala_2.12:2.15.3 (1 constraints: 3905393b)
 com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: e5f9191d)
@@ -95,7 +95,7 @@ org.slf4j:slf4j-api:1.7.36 (8 constraints: 4e7ba54e)
 org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1)
 
 [Test dependencies]
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2 (1 constraints: 3905393b)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3 (1 constraints: 3905393b)
 com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
 com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
 com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
@@ -136,4 +136,4 @@ org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
 org.reactivestreams:reactive-streams:1.0.3 (1 constraints: 1f0c60f9)
 org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308)
-org.yaml:snakeyaml:2.0 (1 constraints: 3a178910)
+org.yaml:snakeyaml:2.1 (1 constraints: 3b178a10)
diff --git a/versions.props b/versions.props
index de3af6c2fe..3d58a5e3af 100644
--- a/versions.props
+++ b/versions.props
@@ -1,4 +1,4 @@
-com.fasterxml.jackson.core:jackson-databind = 2.15.2
+com.fasterxml.jackson.core:jackson-databind = 2.15.3
 com.github.ben-manes.caffeine:caffeine = 3.1.8
 com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.3-jre

From a0732a7caa42bfc2eba7643964c1f3a1df9256be Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 20 Oct 2023 20:31:10 -0700
Subject: [PATCH 31/53] Excavator:  Update conjure plugins and dependencies
 (#2713)

---
 versions.lock  | 10 +++++-----
 versions.props |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions.lock b/versions.lock
index 197634b6d7..4f1b7e9af2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,8 +1,8 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 67c69468)
-com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 32361652)
-com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e28c8d9f)
+com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 68c65769)
+com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 33364552)
+com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e38cb4a0)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b)
 com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3905393b)
@@ -24,8 +24,8 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.19.0 (3 constraints: 6f254c52)
-com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3425774a)
+com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 67254d4f)
+com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3525a84a)
 com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
 com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
 com.palantir.dialogue:dialogue-apache-hc5-client:3.96.0 (1 constraints: 4405673b)
diff --git a/versions.props b/versions.props
index 3d58a5e3af..bd9df6a964 100644
--- a/versions.props
+++ b/versions.props
@@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.3-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:* = 7.19.0
-com.palantir.conjure.java:conjure-lib = 7.19.0
+com.palantir.conjure.java:* = 7.20.0
+com.palantir.conjure.java:conjure-lib = 7.20.0
 com.palantir.conjure.java.api:* = 2.36.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.96.0

From 2de466e8f80ed0ba6461b0a27195337ee515284b Mon Sep 17 00:00:00 2001
From: David Schlosnagle <davids@palantir.com>
Date: Sat, 21 Oct 2023 17:27:48 -0400
Subject: [PATCH 32/53] Replace deprecated mappingException (#2714)

Replace deprecated mappingException
---
 changelog/@unreleased/pr-2714.v2.yml          |  5 ++++
 .../java/serialization/PathDeserializer.java  | 27 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 changelog/@unreleased/pr-2714.v2.yml

diff --git a/changelog/@unreleased/pr-2714.v2.yml b/changelog/@unreleased/pr-2714.v2.yml
new file mode 100644
index 0000000000..7236abf1b3
--- /dev/null
+++ b/changelog/@unreleased/pr-2714.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Replace deprecated mappingException
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2714
diff --git a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/PathDeserializer.java b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/PathDeserializer.java
index 236fe86828..dcc2209a08 100644
--- a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/PathDeserializer.java
+++ b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/PathDeserializer.java
@@ -37,10 +37,15 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.google.errorprone.annotations.CompileTimeConstant;
+import com.palantir.logsafe.Arg;
+import com.palantir.logsafe.SafeLoggable;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 public final class PathDeserializer extends StdScalarDeserializer<Path> {
     private static final long serialVersionUID = 1;
@@ -58,6 +63,26 @@ public Path deserialize(JsonParser parser, DeserializationContext ctxt) throws I
             }
             // 16-Oct-2015: should we perhaps allow JSON Arrays (of Strings) as well?
         }
-        throw ctxt.mappingException(Path.class, token);
+        throw new SafeJsonMappingException(
+                "Could not deserialize path", parser, ctxt.wrongTokenException(parser, Path.class, token, null));
+    }
+
+    private static final class SafeJsonMappingException extends JsonMappingException implements SafeLoggable {
+        private final String logMessage;
+
+        SafeJsonMappingException(@CompileTimeConstant String message, JsonParser parser, JsonMappingException cause) {
+            super(parser, message, cause);
+            this.logMessage = message;
+        }
+
+        @Override
+        public String getLogMessage() {
+            return logMessage;
+        }
+
+        @Override
+        public List<Arg<?>> getArgs() {
+            return List.of();
+        }
     }
 }

From 89e1acfa9915fd2b9eda993c56ccb5e187087012 Mon Sep 17 00:00:00 2001
From: svc-autorelease <pd-foundry-infrastructure-notify@palantir.com>
Date: Sat, 21 Oct 2023 21:27:55 +0000
Subject: [PATCH 33/53] Autorelease 7.62.0

[skip ci]
---
 changelog/{@unreleased => 7.62.0}/pr-2714.v2.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog/{@unreleased => 7.62.0}/pr-2714.v2.yml (100%)

diff --git a/changelog/@unreleased/pr-2714.v2.yml b/changelog/7.62.0/pr-2714.v2.yml
similarity index 100%
rename from changelog/@unreleased/pr-2714.v2.yml
rename to changelog/7.62.0/pr-2714.v2.yml

From 4fdd8386ec9c373cf21abc3a2a1d2361ef4863ba Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 23 Oct 2023 06:19:44 -0700
Subject: [PATCH 34/53] Excavator:  Upgrade dependencies (#2715)

---
 .../client/config/ClientConfigurations.java   |  7 ++++++-
 versions.lock                                 | 20 +++++++++----------
 versions.props                                |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java
index 5fb492542a..27a216c87f 100644
--- a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java
+++ b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java
@@ -25,8 +25,10 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.logger.SafeLogger;
 import com.palantir.logsafe.logger.SafeLoggerFactory;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
@@ -200,7 +202,10 @@ public static ProxySelector createProxySelector(ProxyConfiguration proxyConfig)
                 // fall through
         }
 
-        throw new IllegalStateException("Failed to create ProxySelector for proxy configuration: " + proxyConfig);
+        throw new SafeIllegalStateException(
+                "Failed to create ProxySelector for proxy configuration",
+                SafeArg.of("type", proxyConfig.type()),
+                UnsafeArg.of("hostAndPort", proxyConfig.hostAndPort()));
     }
 
     @VisibleForTesting
diff --git a/versions.lock b/versions.lock
index 4f1b7e9af2..180460e313 100644
--- a/versions.lock
+++ b/versions.lock
@@ -2,7 +2,7 @@
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
 com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 68c65769)
 com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 33364552)
-com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e38cb4a0)
+com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e58c74a2)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b)
 com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3905393b)
@@ -18,16 +18,16 @@ com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4)
 com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d)
 com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: e5f9191d)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:32.1.3-jre (15 constraints: f6093b6b)
+com.google.guava:guava:32.1.3-jre (15 constraints: f909e26b)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
 com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 67254d4f)
-com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3525a84a)
-com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3)
-com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086)
+com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3725684b)
+com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: a92806e4)
+com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
 com.palantir.dialogue:dialogue-apache-hc5-client:3.96.0 (1 constraints: 4405673b)
 com.palantir.dialogue:dialogue-blocking-channels:3.96.0 (2 constraints: e3236db4)
 com.palantir.dialogue:dialogue-core:3.96.0 (2 constraints: 491958ef)
@@ -48,16 +48,16 @@ com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
-com.palantir.tritium:tritium-api:0.77.0 (2 constraints: 3d1f10be)
-com.palantir.tritium:tritium-core:0.77.0 (1 constraints: 461059a2)
-com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 114de95f)
-com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 565df4db)
+com.palantir.tritium:tritium-api:0.78.0 (2 constraints: 3f1f44be)
+com.palantir.tritium:tritium-core:0.78.0 (1 constraints: 47105ca2)
+com.palantir.tritium:tritium-metrics:0.78.0 (5 constraints: 124dbb60)
+com.palantir.tritium:tritium-registry:0.78.0 (6 constraints: 585df7dc)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
-io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 57593170)
+io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 4959dc6e)
 jakarta.activation:jakarta.activation-api:2.1.0 (1 constraints: 8c0f4791)
 jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: f4368043)
 jakarta.el:jakarta.el-api:5.0.1 (2 constraints: eb1eda9a)
diff --git a/versions.props b/versions.props
index bd9df6a964..7e501a0c03 100644
--- a/versions.props
+++ b/versions.props
@@ -6,13 +6,13 @@ com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
 com.palantir.conjure.java:* = 7.20.0
 com.palantir.conjure.java:conjure-lib = 7.20.0
-com.palantir.conjure.java.api:* = 2.36.0
+com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.96.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
-com.palantir.tritium:* = 0.77.0
+com.palantir.tritium:* = 0.78.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2

From 0683a893d0d68d5ae53dffb2b9884fad2a81b41a Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 23 Oct 2023 07:56:23 -0700
Subject: [PATCH 35/53] Excavator:  Update gradle-jdks infrastructure plugins
 (#2716)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a5be6af9d0..6461e73359 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.33.0'
-        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.11.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.34.0'
+        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.12.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.38.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'

From c3ddefb5d7bb255bdd7a296dec8377ee109384bf Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:10:47 -0700
Subject: [PATCH 36/53] Excavator:  Upgrade dependencies (#2717)

---
 versions.lock  | 26 +++++++++++++-------------
 versions.props |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/versions.lock b/versions.lock
index 180460e313..5d0ea34d0c 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,8 +1,8 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 68c65769)
-com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 33364552)
-com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e58c74a2)
+com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 69c6ec69)
+com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 34364652)
+com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e68c0da3)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b)
 com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3905393b)
@@ -25,15 +25,15 @@ com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 060
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
 com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 67254d4f)
-com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3725684b)
-com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: a92806e4)
+com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 39256e4b)
+com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: ad286ce4)
 com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.96.0 (1 constraints: 4405673b)
-com.palantir.dialogue:dialogue-blocking-channels:3.96.0 (2 constraints: e3236db4)
-com.palantir.dialogue:dialogue-core:3.96.0 (2 constraints: 491958ef)
-com.palantir.dialogue:dialogue-futures:3.96.0 (3 constraints: dd33e0c0)
-com.palantir.dialogue:dialogue-serde:3.96.0 (1 constraints: 4405673b)
-com.palantir.dialogue:dialogue-target:3.96.0 (5 constraints: 254d1068)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.97.0 (1 constraints: 45056a3b)
+com.palantir.dialogue:dialogue-blocking-channels:3.97.0 (2 constraints: e523a1b4)
+com.palantir.dialogue:dialogue-core:3.97.0 (2 constraints: 4b1998ef)
+com.palantir.dialogue:dialogue-futures:3.97.0 (3 constraints: e03372c1)
+com.palantir.dialogue:dialogue-serde:3.97.0 (1 constraints: 45056a3b)
+com.palantir.dialogue:dialogue-target:3.97.0 (5 constraints: 2a4d0c6a)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -50,8 +50,8 @@ com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.78.0 (2 constraints: 3f1f44be)
 com.palantir.tritium:tritium-core:0.78.0 (1 constraints: 47105ca2)
-com.palantir.tritium:tritium-metrics:0.78.0 (5 constraints: 124dbb60)
-com.palantir.tritium:tritium-registry:0.78.0 (6 constraints: 585df7dc)
+com.palantir.tritium:tritium-metrics:0.78.0 (5 constraints: 164de561)
+com.palantir.tritium:tritium-registry:0.78.0 (6 constraints: 5c5dd9de)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index 7e501a0c03..240408b8d0 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.20.0
 com.palantir.conjure.java:conjure-lib = 7.20.0
 com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.96.0
+com.palantir.dialogue:* = 3.97.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From aaaa44703191a4b2cfa794fac33277d10bd295fe Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:52:37 -0700
Subject: [PATCH 37/53] Excavator:  Upgrade buildscript dependencies (#2718)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6461e73359..6dd5059585 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:5.25.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
-        classpath 'com.palantir.metricschema:gradle-metric-schema:0.23.0'
+        classpath 'com.palantir.metricschema:gradle-metric-schema:0.24.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.16.0'
     }

From 74e7846296e17340f2de9fb50063dd08ee14b6ff Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@palantir.com>
Date: Tue, 24 Oct 2023 09:28:40 -0400
Subject: [PATCH 38/53] Replace ReflectiveStreamReadConstraints now that we
 require 2.15.x (#2719)

Replace ReflectiveStreamReadConstraints now that we require 2.15.x
---
 .../java/serialization/ObjectMappers.java     | 11 ++-
 .../ReflectiveStreamReadConstraints.java      | 76 -------------------
 2 files changed, 9 insertions(+), 78 deletions(-)
 delete mode 100644 conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ReflectiveStreamReadConstraints.java

diff --git a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java
index 8916acefd2..7dd441e3ce 100644
--- a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java
+++ b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java
@@ -17,6 +17,7 @@
 package com.palantir.conjure.java.serialization;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.core.TSFBuilder;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -243,12 +244,18 @@ public static CBORFactory cborFactory() {
 
     /** Configures provided JsonFactory with Conjure default settings. */
     private static <F extends JsonFactory, B extends TSFBuilder<F, B>> B withDefaults(B builder) {
-        return ReflectiveStreamReadConstraints.withDefaultConstraints(builder
+        return builder
                 // Interning introduces excessive contention https://github.com/FasterXML/jackson-core/issues/946
                 .disable(JsonFactory.Feature.INTERN_FIELD_NAMES)
                 // Canonicalization can be helpful to avoid string re-allocation, however we expect unbounded
                 // key space due to use of maps keyed by random identifiers, which cause heavy heap churn.
                 // See this discussion: https://github.com/FasterXML/jackson-benchmarks/pull/6
-                .disable(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES));
+                .disable(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES)
+                .streamReadConstraints(StreamReadConstraints.builder()
+                        // 50mb up from the default 20mb as a more permissive value to begin with, which we can ratchet
+                        // down over time. This allows us to decouple the initial risk of adopting string length limits
+                        // from the risk introduced by taking a dependency upgrade.
+                        .maxStringLength(50_000_000)
+                        .build());
     }
 }
diff --git a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ReflectiveStreamReadConstraints.java b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ReflectiveStreamReadConstraints.java
deleted file mode 100644
index f7fc25febe..0000000000
--- a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ReflectiveStreamReadConstraints.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * (c) Copyright 2023 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.conjure.java.serialization;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.TSFBuilder;
-import com.palantir.logsafe.logger.SafeLogger;
-import com.palantir.logsafe.logger.SafeLoggerFactory;
-import java.lang.reflect.Method;
-
-/**
- * This class exists to ensure default values match our expectations in cases where jackson is
- * upgraded transitively prior to a CJR release which expects 2.15.0+. After this library upgrades, the
- * reflection may be replaced by the following:
- *<pre>{@code
- * return builder.streamReadConstraints(StreamReadConstraints.builder()
- *         .maxStringLength(MAX_STRING_LENGTH)
- *         .build());
- * }</pre>
- */
-final class ReflectiveStreamReadConstraints {
-    private static final SafeLogger log = SafeLoggerFactory.get(ReflectiveStreamReadConstraints.class);
-
-    // 50mb up from the default 5mb as a more permissive value to begin with, which we can ratchet down over time.
-    // This allows us to decouple the initial risk of adopting string length limits from the risk introduced by taking
-    // a dependency upgrade.
-    private static final int MAX_STRING_LENGTH = 50_000_000;
-
-    @SuppressWarnings("unchecked")
-    static <F extends JsonFactory, B extends TSFBuilder<F, B>> B withDefaultConstraints(B builder) {
-        try {
-            // Use the same classloader which loaded the TSFBuilder
-            ClassLoader classLoader = builder.getClass().getClassLoader();
-            Class<?> streamReadConstraintsClass =
-                    Class.forName("com.fasterxml.jackson.core.StreamReadConstraints", true, classLoader);
-            Object constraints = createConjureDefaultStreamReadConstraints(streamReadConstraintsClass);
-            return (B) builder.getClass()
-                    .getMethod("streamReadConstraints", streamReadConstraintsClass)
-                    .invoke(builder, constraints);
-        } catch (ClassNotFoundException cnfe) {
-            // Log at debug in the expected case using jackson 2.14 which does not support limits.
-            log.debug("StreamReadConstraints class does not exist, nothing to do", cnfe);
-        } catch (ReflectiveOperationException e) {
-            log.warn("Failed to update StreamReadConstraints, upstream default values will be used", e);
-        }
-        return builder;
-    }
-
-    private static Object createConjureDefaultStreamReadConstraints(Class<?> streamReadConstraintsClass)
-            throws ReflectiveOperationException {
-        Method builderMethod = streamReadConstraintsClass.getMethod("builder");
-        Object streamReadConstraintsBuilder = builderMethod.invoke(null);
-        Class<?> streamReadConstraintsBuilderClass = streamReadConstraintsBuilder.getClass();
-        // Default to a max size of 50mb (up from the 5mb default)
-        streamReadConstraintsBuilderClass
-                .getMethod("maxStringLength", int.class)
-                .invoke(streamReadConstraintsBuilder, MAX_STRING_LENGTH);
-        return streamReadConstraintsBuilderClass.getMethod("build").invoke(streamReadConstraintsBuilder);
-    }
-
-    private ReflectiveStreamReadConstraints() {}
-}

From 9abe62f6584f20a0350e3a2b925e71643134cb4c Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 26 Oct 2023 10:54:27 -0700
Subject: [PATCH 39/53] Excavator:  Upgrade buildscript dependencies (#2720)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6dd5059585..396ac76621 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:5.25.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
-        classpath 'com.palantir.metricschema:gradle-metric-schema:0.24.0'
+        classpath 'com.palantir.metricschema:gradle-metric-schema:0.25.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.16.0'
     }

From d813ca398fe13dc6db1c3e8fbac66ef52ca3a714 Mon Sep 17 00:00:00 2001
From: walkerburgin <walkerburgin@gmail.com>
Date: Thu, 26 Oct 2023 16:21:55 -0700
Subject: [PATCH 40/53] Always load certificates from the same jar as the code
 (#2721)

---
 changelog/@unreleased/pr-2721.v2.yml                        | 5 +++++
 .../com/palantir/conjure/java/config/ssl/DefaultCas.java    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelog/@unreleased/pr-2721.v2.yml

diff --git a/changelog/@unreleased/pr-2721.v2.yml b/changelog/@unreleased/pr-2721.v2.yml
new file mode 100644
index 0000000000..f3bbb6221f
--- /dev/null
+++ b/changelog/@unreleased/pr-2721.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Always load certificates from the same jar as the code
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2721
diff --git a/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java b/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java
index 759876a76c..9733b8c0d5 100644
--- a/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java
+++ b/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java
@@ -41,7 +41,7 @@ final class DefaultCas {
     /**
      * This is managed by an excavator.
      */
-    private static final String CA_CERTIFICATES_CRT = "ca-certificates.crt";
+    private static final String CA_CERTIFICATES_CRT = "/ca-certificates.crt";
 
     private static final Supplier<Map<String, X509Certificate>> TRUSTED_CERTIFICATES =
             Suppliers.memoize(DefaultCas::getTrustedCertificates);
@@ -53,8 +53,8 @@ static Map<String, X509Certificate> getCertificates() {
     private static Map<String, X509Certificate> getTrustedCertificates() {
         ImmutableMap.Builder<String, X509Certificate> certificateMap = ImmutableMap.builder();
         try {
-            List<X509Certificate> caCertificates = KeyStores.readX509Certificates(
-                            new ByteArrayInputStream(Resources.toByteArray(Resources.getResource(CA_CERTIFICATES_CRT))))
+            List<X509Certificate> caCertificates = KeyStores.readX509Certificates(new ByteArrayInputStream(
+                            Resources.toByteArray(Resources.getResource(DefaultCas.class, CA_CERTIFICATES_CRT))))
                     .stream()
                     .map(cert -> (X509Certificate) cert)
                     .collect(Collectors.toList());

From 27908bf07d5e0059e2d2d288d3f623accb62074c Mon Sep 17 00:00:00 2001
From: svc-autorelease <pd-foundry-infrastructure-notify@palantir.com>
Date: Thu, 26 Oct 2023 23:22:02 +0000
Subject: [PATCH 41/53] Autorelease 7.65.0

[skip ci]
---
 changelog/{@unreleased => 7.65.0}/pr-2721.v2.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog/{@unreleased => 7.65.0}/pr-2721.v2.yml (100%)

diff --git a/changelog/@unreleased/pr-2721.v2.yml b/changelog/7.65.0/pr-2721.v2.yml
similarity index 100%
rename from changelog/@unreleased/pr-2721.v2.yml
rename to changelog/7.65.0/pr-2721.v2.yml

From 48ac89bcfc4ec747ed4f5fa2fc9ba7e77cda0983 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:42:38 -0700
Subject: [PATCH 42/53] Excavator:  Update Undertow Server Version Pins (#2722)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index 5d0ea34d0c..3ff8c8adc3 100644
--- a/versions.lock
+++ b/versions.lock
@@ -101,7 +101,7 @@ com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
 com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b)
-io.undertow:undertow-core:2.2.28.Final (2 constraints: aa19d5eb)
+io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.12 (1 constraints: 080f065e)
diff --git a/versions.props b/versions.props
index 240408b8d0..f89a7d39db 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ org.junit.*:* = 5.10.0
 org.mockito:* = 5.6.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
-io.undertow:* = 2.2.28.Final
+io.undertow:* = 2.2.24.Final
 # dependency-upgrader:OFF
 # Last version of undertow with both Jakarta+Javax support before 'undertow-servlet' was
 # updated to jakarta only. This should NEVER be done in production code, it is only used

From 7c0366de023a23e5812b1d6d63b9c1b201d8d587 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:12:17 -0700
Subject: [PATCH 43/53] Excavator:  Upgrade dependencies (#2723)

---
 versions.lock  | 22 +++++++++++-----------
 versions.props |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/versions.lock b/versions.lock
index 3ff8c8adc3..fc789d3435 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,16 +24,16 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 67254d4f)
+com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 5725a74d)
 com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 39256e4b)
 com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: ad286ce4)
 com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.97.0 (1 constraints: 45056a3b)
-com.palantir.dialogue:dialogue-blocking-channels:3.97.0 (2 constraints: e523a1b4)
-com.palantir.dialogue:dialogue-core:3.97.0 (2 constraints: 4b1998ef)
-com.palantir.dialogue:dialogue-futures:3.97.0 (3 constraints: e03372c1)
-com.palantir.dialogue:dialogue-serde:3.97.0 (1 constraints: 45056a3b)
-com.palantir.dialogue:dialogue-target:3.97.0 (5 constraints: 2a4d0c6a)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.98.0 (1 constraints: 46056d3b)
+com.palantir.dialogue:dialogue-blocking-channels:3.98.0 (2 constraints: e723d5b4)
+com.palantir.dialogue:dialogue-core:3.98.0 (2 constraints: 4d19d8ef)
+com.palantir.dialogue:dialogue-futures:3.98.0 (3 constraints: e33304c2)
+com.palantir.dialogue:dialogue-serde:3.98.0 (1 constraints: 46056d3b)
+com.palantir.dialogue:dialogue-target:3.98.0 (5 constraints: 2f4d086c)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -48,10 +48,10 @@ com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
 com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
-com.palantir.tritium:tritium-api:0.78.0 (2 constraints: 3f1f44be)
-com.palantir.tritium:tritium-core:0.78.0 (1 constraints: 47105ca2)
-com.palantir.tritium:tritium-metrics:0.78.0 (5 constraints: 164de561)
-com.palantir.tritium:tritium-registry:0.78.0 (6 constraints: 5c5dd9de)
+com.palantir.tritium:tritium-api:0.79.0 (2 constraints: 411f78be)
+com.palantir.tritium:tritium-core:0.79.0 (1 constraints: 48105fa2)
+com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 174db762)
+com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 5e5ddcdf)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index f89a7d39db..c139b021c2 100644
--- a/versions.props
+++ b/versions.props
@@ -8,11 +8,11 @@ com.palantir.conjure.java:* = 7.20.0
 com.palantir.conjure.java:conjure-lib = 7.20.0
 com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.97.0
+com.palantir.dialogue:* = 3.98.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
-com.palantir.tritium:* = 0.78.0
+com.palantir.tritium:* = 0.79.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2

From 27dad0d3336ce482c63b16ae0e0d7779b49c3f5b Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:10:06 -0700
Subject: [PATCH 44/53] Excavator:  Update conjure plugins and dependencies
 (#2724)

---
 versions.lock  | 4 ++--
 versions.props | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/versions.lock b/versions.lock
index fc789d3435..a75911d9ad 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,8 +24,8 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 5725a74d)
-com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 39256e4b)
+com.palantir.conjure.java:conjure-lib:7.21.0 (3 constraints: 5825074e)
+com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3b25d04b)
 com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: ad286ce4)
 com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
 com.palantir.dialogue:dialogue-apache-hc5-client:3.98.0 (1 constraints: 46056d3b)
diff --git a/versions.props b/versions.props
index c139b021c2..563b9bb66b 100644
--- a/versions.props
+++ b/versions.props
@@ -4,8 +4,8 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 32.1.3-jre
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:* = 7.20.0
-com.palantir.conjure.java:conjure-lib = 7.20.0
+com.palantir.conjure.java:* = 7.21.0
+com.palantir.conjure.java:conjure-lib = 7.21.0
 com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.98.0

From 53e7a91b1d3eada37669b636cb3944b3315aac8d Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:38:17 -0700
Subject: [PATCH 45/53] Excavator:  Upgrade dependencies (#2725)

---
 versions.lock  | 18 +++++++++---------
 versions.props |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/versions.lock b/versions.lock
index a75911d9ad..f63d86f581 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,16 +24,16 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
-com.palantir.conjure.java:conjure-lib:7.21.0 (3 constraints: 5825074e)
+com.palantir.conjure.java:conjure-lib:7.21.0 (3 constraints: 5a253c4e)
 com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3b25d04b)
 com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: ad286ce4)
 com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.98.0 (1 constraints: 46056d3b)
-com.palantir.dialogue:dialogue-blocking-channels:3.98.0 (2 constraints: e723d5b4)
-com.palantir.dialogue:dialogue-core:3.98.0 (2 constraints: 4d19d8ef)
-com.palantir.dialogue:dialogue-futures:3.98.0 (3 constraints: e33304c2)
-com.palantir.dialogue:dialogue-serde:3.98.0 (1 constraints: 46056d3b)
-com.palantir.dialogue:dialogue-target:3.98.0 (5 constraints: 2f4d086c)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.99.0 (1 constraints: 4705703b)
+com.palantir.dialogue:dialogue-blocking-channels:3.99.0 (2 constraints: e92309b5)
+com.palantir.dialogue:dialogue-core:3.99.0 (2 constraints: 4f1918f0)
+com.palantir.dialogue:dialogue-futures:3.99.0 (3 constraints: e63396c2)
+com.palantir.dialogue:dialogue-serde:3.99.0 (1 constraints: 4705703b)
+com.palantir.dialogue:dialogue-target:3.99.0 (5 constraints: 344d046e)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
@@ -50,8 +50,8 @@ com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.79.0 (2 constraints: 411f78be)
 com.palantir.tritium:tritium-core:0.79.0 (1 constraints: 48105fa2)
-com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 174db762)
-com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 5e5ddcdf)
+com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 1b4de163)
+com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 625dbee1)
 com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
diff --git a/versions.props b/versions.props
index 563b9bb66b..de8199706c 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.21.0
 com.palantir.conjure.java:conjure-lib = 7.21.0
 com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.98.0
+com.palantir.dialogue:* = 3.99.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From 58ced841c118ec16c3ee1d448bb288d85f4f5e51 Mon Sep 17 00:00:00 2001
From: Brandon Marc-Aurele <bmarcaur@gmail.com>
Date: Wed, 1 Nov 2023 12:48:30 -0400
Subject: [PATCH 46/53] Bump to OkHttp 4.X (#2709)

---
 build.gradle                                  |   6 -
 changelog/@unreleased/pr-2709.v2.yml          |   5 +
 .../java/okhttp/ForwardingOkHttpClient.java   | 188 ------------------
 .../conjure/java/okhttp/OkHttpClients.java    |   2 +-
 .../java/okhttp/Okhttp39HostnameVerifier.java |   5 +-
 .../java/okhttp/RemotingOkHttpCall.java       |   3 +-
 .../java/okhttp/RemotingOkHttpClient.java     |   8 +-
 .../java/okhttp/OkHttpClientsTest.java        |   8 +-
 versions.lock                                 |  15 +-
 versions.props                                |   4 +-
 10 files changed, 30 insertions(+), 214 deletions(-)
 create mode 100644 changelog/@unreleased/pr-2709.v2.yml
 delete mode 100644 okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ForwardingOkHttpClient.java

diff --git a/build.gradle b/build.gradle
index 396ac76621..3e471b43c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,12 +67,6 @@ allprojects {
                 version { strictly '2.4.0' }
                 because 'Retrofit 2.5.0 breaks with our path parameter routing logic'
             }
-
-            rootConfiguration 'com.squareup.okhttp3:okhttp', {
-                version { strictly '[3, 3.14.0[' }
-                because 'okhttp 3.14.0 removed UnrepeatableRequestBody which is relied on by an internal library'
-            }
-
         }
     }
 }
diff --git a/changelog/@unreleased/pr-2709.v2.yml b/changelog/@unreleased/pr-2709.v2.yml
new file mode 100644
index 0000000000..a92d54f40c
--- /dev/null
+++ b/changelog/@unreleased/pr-2709.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Bump to OkHttp 4.X
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2709
diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ForwardingOkHttpClient.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ForwardingOkHttpClient.java
deleted file mode 100644
index e10376a9ca..0000000000
--- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ForwardingOkHttpClient.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * (c) Copyright 2017 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.conjure.java.okhttp;
-
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.util.List;
-import javax.net.SocketFactory;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSocketFactory;
-import okhttp3.Authenticator;
-import okhttp3.Cache;
-import okhttp3.Call;
-import okhttp3.CertificatePinner;
-import okhttp3.ConnectionPool;
-import okhttp3.ConnectionSpec;
-import okhttp3.CookieJar;
-import okhttp3.Dispatcher;
-import okhttp3.Dns;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-
-/** A forwarding/delegating {@link okhttp3.OkHttpClient}. Sub-classes should override individual methods. */
-class ForwardingOkHttpClient extends OkHttpClient {
-
-    private final OkHttpClient delegate;
-
-    ForwardingOkHttpClient(OkHttpClient delegate) {
-        this.delegate = delegate;
-    }
-
-    protected OkHttpClient getDelegate() {
-        return delegate;
-    }
-
-    @Override
-    public int connectTimeoutMillis() {
-        return delegate.connectTimeoutMillis();
-    }
-
-    @Override
-    public int readTimeoutMillis() {
-        return delegate.readTimeoutMillis();
-    }
-
-    @Override
-    public int writeTimeoutMillis() {
-        return delegate.writeTimeoutMillis();
-    }
-
-    @Override
-    public int pingIntervalMillis() {
-        return delegate.pingIntervalMillis();
-    }
-
-    @Override
-    public Proxy proxy() {
-        return delegate.proxy();
-    }
-
-    @Override
-    public ProxySelector proxySelector() {
-        return delegate.proxySelector();
-    }
-
-    @Override
-    public CookieJar cookieJar() {
-        return delegate.cookieJar();
-    }
-
-    @Override
-    public Cache cache() {
-        return delegate.cache();
-    }
-
-    @Override
-    public Dns dns() {
-        return delegate.dns();
-    }
-
-    @Override
-    public SocketFactory socketFactory() {
-        return delegate.socketFactory();
-    }
-
-    @Override
-    public SSLSocketFactory sslSocketFactory() {
-        return delegate.sslSocketFactory();
-    }
-
-    @Override
-    public HostnameVerifier hostnameVerifier() {
-        return delegate.hostnameVerifier();
-    }
-
-    @Override
-    public CertificatePinner certificatePinner() {
-        return delegate.certificatePinner();
-    }
-
-    @Override
-    public Authenticator authenticator() {
-        return delegate.authenticator();
-    }
-
-    @Override
-    public Authenticator proxyAuthenticator() {
-        return delegate.proxyAuthenticator();
-    }
-
-    @Override
-    public ConnectionPool connectionPool() {
-        return delegate.connectionPool();
-    }
-
-    @Override
-    public boolean followSslRedirects() {
-        return delegate.followSslRedirects();
-    }
-
-    @Override
-    public boolean followRedirects() {
-        return delegate.followRedirects();
-    }
-
-    @Override
-    public boolean retryOnConnectionFailure() {
-        return delegate.retryOnConnectionFailure();
-    }
-
-    @Override
-    public Dispatcher dispatcher() {
-        return delegate.dispatcher();
-    }
-
-    @Override
-    public List<Protocol> protocols() {
-        return delegate.protocols();
-    }
-
-    @Override
-    public List<ConnectionSpec> connectionSpecs() {
-        return delegate.connectionSpecs();
-    }
-
-    @Override
-    public List<Interceptor> interceptors() {
-        return delegate.interceptors();
-    }
-
-    @Override
-    public List<Interceptor> networkInterceptors() {
-        return delegate.networkInterceptors();
-    }
-
-    @Override
-    public Call newCall(Request request) {
-        return delegate.newCall(request);
-    }
-
-    @Override
-    public WebSocket newWebSocket(Request request, WebSocketListener listener) {
-        return delegate.newWebSocket(request, listener);
-    }
-
-    @Override
-    public Builder newBuilder() {
-        return delegate.newBuilder();
-    }
-}
diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/OkHttpClients.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/OkHttpClients.java
index 2e2a75e47f..93b7145cee 100644
--- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/OkHttpClients.java
+++ b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/OkHttpClients.java
@@ -292,7 +292,7 @@ private static RemotingOkHttpClient createInternal(
                 .addMetrics("from", DispatcherMetricSet.class.getSimpleName(), dispatcherMetricSet);
 
         return new RemotingOkHttpClient(
-                client.build(),
+                client,
                 backoffStrategyFunction,
                 config.nodeSelectionStrategy(),
                 urlSelector,
diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/Okhttp39HostnameVerifier.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/Okhttp39HostnameVerifier.java
index 3c3b9d1d8e..36fa8687c7 100644
--- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/Okhttp39HostnameVerifier.java
+++ b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/Okhttp39HostnameVerifier.java
@@ -32,8 +32,6 @@
  */
 package com.palantir.conjure.java.okhttp;
 
-import static okhttp3.internal.Util.verifyAsIpAddress;
-
 import java.security.cert.Certificate;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
@@ -46,6 +44,7 @@
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 import javax.security.auth.x500.X500Principal;
+import okhttp3.internal.Util;
 
 /**
  * A HostnameVerifier consistent with <a href="http://www.ietf.org/rfc/rfc2818.txt">RFC 2818</a>.
@@ -79,7 +78,7 @@ public boolean verify(String host, SSLSession session) {
     }
 
     public boolean verify(String host, X509Certificate certificate) {
-        return verifyAsIpAddress(host) ? verifyIpAddress(host, certificate) : verifyHostname(host, certificate);
+        return Util.canParseAsIpAddress(host) ? verifyIpAddress(host, certificate) : verifyHostname(host, certificate);
     }
 
     /** Returns true if {@code certificate} matches {@code ipAddress}. */
diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java
index b08f020429..972afc1913 100644
--- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java
+++ b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java
@@ -51,7 +51,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import okhttp3.internal.http.UnrepeatableRequestBody;
 
 /**
  * An OkHttp {@link Call} implementation that handles standard retryable error status such as 308, 429, 503, and
@@ -586,7 +585,7 @@ private static void retryIfAllowed(Callback callback, Call call, Exception excep
     }
 
     private static boolean isStreamingBody(Call call) {
-        return call.request().body() instanceof UnrepeatableRequestBody;
+        return call.request().body() != null && call.request().body().isOneShot();
     }
 
     private static boolean shouldPropagateQos(ClientConfiguration.ServerQoS serverQoS) {
diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpClient.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpClient.java
index e51dcacb87..9102809aa0 100644
--- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpClient.java
+++ b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpClient.java
@@ -37,7 +37,7 @@
  * An {@link OkHttpClient} that executes {@link okhttp3.Call}s as {@link RemotingOkHttpCall}s in order to retry a class
  * of retryable error states.
  */
-final class RemotingOkHttpClient extends ForwardingOkHttpClient {
+final class RemotingOkHttpClient extends OkHttpClient {
     private static final SafeLogger log = SafeLoggerFactory.get(RemotingOkHttpClient.class);
 
     private static final int MAX_NUM_RELOCATIONS = 20;
@@ -53,7 +53,7 @@ final class RemotingOkHttpClient extends ForwardingOkHttpClient {
     private final ClientConfiguration.RetryOnSocketException retryOnSocketException;
 
     RemotingOkHttpClient(
-            OkHttpClient delegate,
+            OkHttpClient.Builder builder,
             Supplier<BackoffStrategy> backoffStrategy,
             NodeSelectionStrategy nodeSelectionStrategy,
             UrlSelector urls,
@@ -63,7 +63,7 @@ final class RemotingOkHttpClient extends ForwardingOkHttpClient {
             ClientConfiguration.ServerQoS serverQoS,
             ClientConfiguration.RetryOnTimeout retryOnTimeout,
             ClientConfiguration.RetryOnSocketException retryOnSocketException) {
-        super(delegate);
+        super(builder);
         this.backoffStrategyFactory = backoffStrategy;
         this.nodeSelectionStrategy = nodeSelectionStrategy;
         this.urls = urls;
@@ -93,7 +93,7 @@ public Builder newBuilder() {
     RemotingOkHttpCall newCallWithMutableState(
             Request request, BackoffStrategy backoffStrategy, int maxNumRelocations, Optional<Call> previousCall) {
         return new RemotingOkHttpCall(
-                getDelegate().newCall(request),
+                super.newCall(request),
                 previousCall,
                 backoffStrategy,
                 urls,
diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java
index ac55ccbd26..a2477a3206 100644
--- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java
+++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java
@@ -65,7 +65,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.internal.http.UnrepeatableRequestBody;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.SocketPolicy;
@@ -176,7 +175,7 @@ public void streamingRequestBodyIsNotRetried() throws IOException {
         assertThat(body.retried).hasValue(0);
     }
 
-    private static final class StreamingRequestBody extends RequestBody implements UnrepeatableRequestBody {
+    private static final class StreamingRequestBody extends RequestBody {
         private static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
 
         private final Source source;
@@ -203,6 +202,11 @@ public void writeTo(BufferedSink sink) throws IOException {
                 }
             }
         }
+
+        @Override
+        public boolean isOneShot() {
+            return true;
+        }
     }
 
     private static final class StreamReusedException extends IOException {
diff --git a/versions.lock b/versions.lock
index f63d86f581..9bd4bb04f8 100644
--- a/versions.lock
+++ b/versions.lock
@@ -52,8 +52,9 @@ com.palantir.tritium:tritium-api:0.79.0 (2 constraints: 411f78be)
 com.palantir.tritium:tritium-core:0.79.0 (1 constraints: 48105fa2)
 com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 1b4de163)
 com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 625dbee1)
-com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
-com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
+com.squareup.okhttp3:okhttp:4.12.0 (3 constraints: 292d9bf6)
+com.squareup.okio:okio:3.6.0 (1 constraints: 530c38fd)
+com.squareup.okio:okio-jvm:3.6.0 (1 constraints: 500ad3b9)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
@@ -87,7 +88,11 @@ org.immutables:value:2.10.0 (1 constraints: 35052f3b)
 org.javassist:javassist:3.29.2-GA (1 constraints: 30112ef1)
 org.jboss.logging:jboss-logging:3.5.0.Final (4 constraints: 0747c0c6)
 org.jboss.threads:jboss-threads:3.5.0.Final (3 constraints: b52a2fe5)
-org.jetbrains:annotations:24.0.1 (2 constraints: fc20bc6d)
+org.jetbrains:annotations:24.0.1 (3 constraints: da2fbd33)
+org.jetbrains.kotlin:kotlin-stdlib:1.9.10 (2 constraints: c2210fe1)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 (2 constraints: 3f1b4b83)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (3 constraints: eb27efa7)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
 org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (1 constraints: 0d10f991)
 org.scala-lang:scala-library:2.12.17 (1 constraints: 3c16782c)
@@ -98,13 +103,13 @@ org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3 (1 constraints: 3905393b)
 com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
 com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
-com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
+com.squareup.okhttp3:mockwebserver:4.12.0 (1 constraints: 3905413b)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b)
 io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
-junit:junit:4.12 (1 constraints: 080f065e)
+junit:junit:4.13.2 (1 constraints: 690fa77c)
 net.bytebuddy:byte-buddy:1.14.8 (2 constraints: c416aa4f)
 net.bytebuddy:byte-buddy-agent:1.14.8 (1 constraints: 480b46de)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
diff --git a/versions.props b/versions.props
index de8199706c..cab4942c2c 100644
--- a/versions.props
+++ b/versions.props
@@ -13,6 +13,7 @@ com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
 com.palantir.tritium:* = 0.79.0
+com.squareup.okhttp3:* = 4.12.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2
@@ -50,9 +51,6 @@ javax.inject:javax.inject = 1
 
 com.fasterxml.jackson.*:* = 2.13.1
 
-# Temporarily pausing until internal libraries stop relying on UnrepeatableRequestBody
-com.squareup.okhttp3:* = 3.13.1
-
 # We cannot upgrade retrofit2 to 2.5.0 because of https://github.com/palantir/conjure-java-runtime/issues/930
 com.squareup.retrofit2:* = 2.4.0
 

From 0c54a4ff1f624dc06e3fb72e2ce592e9ddd52ccd Mon Sep 17 00:00:00 2001
From: svc-autorelease <pd-foundry-infrastructure-notify@palantir.com>
Date: Wed, 1 Nov 2023 16:48:38 +0000
Subject: [PATCH 47/53] Autorelease 7.67.0

[skip ci]
---
 changelog/{@unreleased => 7.67.0}/pr-2709.v2.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog/{@unreleased => 7.67.0}/pr-2709.v2.yml (100%)

diff --git a/changelog/@unreleased/pr-2709.v2.yml b/changelog/7.67.0/pr-2709.v2.yml
similarity index 100%
rename from changelog/@unreleased/pr-2709.v2.yml
rename to changelog/7.67.0/pr-2709.v2.yml

From cbb4926615fb0c6a6d1b460766036cf6c056636c Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:07:01 -0700
Subject: [PATCH 48/53] Excavator:  Upgrade dependencies (#2726)

---
 versions.lock  | 2 +-
 versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.lock b/versions.lock
index 9bd4bb04f8..205f4e78fa 100644
--- a/versions.lock
+++ b/versions.lock
@@ -70,7 +70,7 @@ joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (2 constraints: d518b1c3)
 org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: a1380c3a)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
-org.checkerframework:checker-qual:3.39.0 (3 constraints: c11fdf54)
+org.checkerframework:checker-qual:3.40.0 (3 constraints: b91f4852)
 org.glassfish:jakarta.el:5.0.0-M1 (1 constraints: a814a4a2)
 org.glassfish.hk2:hk2-api:3.0.4 (1 constraints: 6c0c580c)
 org.glassfish.hk2:hk2-locator:3.0.4 (1 constraints: 4210d6ad)
diff --git a/versions.props b/versions.props
index cab4942c2c..1dd1740b1c 100644
--- a/versions.props
+++ b/versions.props
@@ -32,7 +32,7 @@ io.undertow:undertow-servlet-jakarta = 2.2.20.Final
 # dependency-upgrader:ON
 com.palantir.refreshable:refreshable = 2.3.0
 org.hibernate.validator:* = 6.2.0.Final
-org.checkerframework:checker-qual = 3.39.0
+org.checkerframework:checker-qual = 3.40.0
 
 org.apache.httpcomponents.client5:* = 5.2.1
 

From 3b3b39fa72c158117b4a9251adbeeb9f55ea0739 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Thu, 2 Nov 2023 13:54:59 -0700
Subject: [PATCH 49/53] Enable checkImplicitDependencies (#2727)

---
 build.gradle                                    |  2 +-
 client-config/build.gradle                      |  3 +++
 conjure-java-jackson-serialization/build.gradle |  5 +++++
 conjure-java-jaxrs-client/build.gradle          |  9 ++++++++-
 conjure-java-jersey-jakarta-server/build.gradle |  9 +++++++++
 conjure-java-jersey-server/build.gradle         | 14 ++++++++++++++
 conjure-java-legacy-clients/build.gradle        |  4 ++++
 conjure-java-retrofit2-client/build.gradle      | 10 ++++++++++
 conjure-scala-jaxrs-client/build.gradle         |  5 +++++
 keystores/build.gradle                          |  7 ++++++-
 okhttp-clients/build.gradle                     |  8 ++++++++
 undertow-jakarta-testing/build.gradle           | 10 +++++++++-
 versions.lock                                   | 10 +++++-----
 13 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3e471b43c0..5aa60fb887 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,7 +75,7 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'com.palantir.baseline-class-uniqueness'
 
-    tasks.check.dependsOn javadoc, checkUnusedDependencies
+    tasks.check.dependsOn javadoc, checkImplicitDependenciesMain, checkUnusedDependencies
 
     test {
         minHeapSize = "512m"
diff --git a/client-config/build.gradle b/client-config/build.gradle
index a2ab8a6080..a3990b95ff 100644
--- a/client-config/build.gradle
+++ b/client-config/build.gradle
@@ -7,7 +7,10 @@ dependencies {
     api 'com.palantir.tritium:tritium-registry'
     api 'com.google.errorprone:error_prone_annotations'
     api 'com.palantir.refreshable:refreshable'
+    implementation 'com.palantir.conjure.java.api:ssl-config'
+    implementation 'com.palantir.safe-logging:preconditions'
     implementation 'com.palantir.safe-logging:safe-logging'
+    implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.google.guava:guava'
     implementation project(":keystores")
 
diff --git a/conjure-java-jackson-serialization/build.gradle b/conjure-java-jackson-serialization/build.gradle
index 0360d8f9d8..c0915751e0 100644
--- a/conjure-java-jackson-serialization/build.gradle
+++ b/conjure-java-jackson-serialization/build.gradle
@@ -12,8 +12,13 @@ dependencies {
     api "com.fasterxml.jackson.datatype:jackson-datatype-joda"
     api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
     api "com.palantir.safe-logging:preconditions"
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.guava:guava'
     implementation "com.palantir.safe-logging:logger"
+    implementation 'com.palantir.safe-logging:safe-logging'
     implementation 'com.palantir.tritium:tritium-registry'
+    implementation 'io.dropwizard.metrics:metrics-core'
 
     testImplementation "org.assertj:assertj-core"
     testImplementation 'org.junit.jupiter:junit-jupiter'
diff --git a/conjure-java-jaxrs-client/build.gradle b/conjure-java-jaxrs-client/build.gradle
index cc153e04d5..7ebb83e45b 100644
--- a/conjure-java-jaxrs-client/build.gradle
+++ b/conjure-java-jaxrs-client/build.gradle
@@ -15,12 +15,19 @@ dependencies {
     api "com.palantir.dialogue:dialogue-target"
 
     implementation project(":conjure-java-annotations")
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'
+    implementation 'com.palantir.conjure.java.api:errors'
+    implementation 'com.palantir.conjure.java.api:service-config'
     implementation "com.palantir.dialogue:dialogue-apache-hc5-client"
     implementation "com.palantir.dialogue:dialogue-core"
     implementation "com.palantir.dialogue:dialogue-serde"
     implementation 'com.palantir.safe-logging:logger'
-
+    implementation 'com.palantir.safe-logging:safe-logging'
     implementation 'com.palantir.tritium:tritium-registry'
+    implementation 'io.dropwizard.metrics:metrics-core'
 
     implementation project(":conjure-java-jackson-serialization")
     implementation "com.google.guava:guava"
diff --git a/conjure-java-jersey-jakarta-server/build.gradle b/conjure-java-jersey-jakarta-server/build.gradle
index 16f009e8bb..0207f805a0 100644
--- a/conjure-java-jersey-jakarta-server/build.gradle
+++ b/conjure-java-jersey-jakarta-server/build.gradle
@@ -8,14 +8,23 @@ dependencies {
 
     implementation 'com.palantir.tritium:tritium-registry'
     implementation 'io.dropwizard.metrics:metrics-core'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'
     implementation "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider", {
         // activation-api should be a 'compileOnly' dependency where 'jakarta.activation' should be used at runtime
         exclude module: 'jakarta.activation-api'
     }
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.guava:guava'
     implementation "com.netflix.feign:feign-core"
     implementation "com.palantir.safe-logging:safe-logging"
     implementation 'com.palantir.tokens:auth-tokens'
     implementation "com.palantir.tracing:tracing-jersey-jakarta"
+    implementation 'jakarta.annotation:jakarta.annotation-api'
+    implementation 'jakarta.inject:jakarta.inject-api'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api'
+    implementation 'org.glassfish.jersey.core:jersey-common'
     implementation project(':conjure-java-jackson-serialization')
 
     runtimeOnly "org.glassfish.jersey.ext:jersey-bean-validation"
diff --git a/conjure-java-jersey-server/build.gradle b/conjure-java-jersey-server/build.gradle
index 3b57537d1d..5bc1c09eb6 100644
--- a/conjure-java-jersey-server/build.gradle
+++ b/conjure-java-jersey-server/build.gradle
@@ -20,15 +20,25 @@ dependencies {
     implementation 'javax.inject:javax.inject'
     implementation 'com.palantir.tritium:tritium-registry'
     implementation 'io.dropwizard.metrics:metrics-core'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider", {
         // activation-api should be a compileOnly dependency where javax.activation should be used at runtime
         exclude module: 'javax.activation-api'
     }
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.guava:guava'
     implementation "com.netflix.feign:feign-core"
     implementation "com.palantir.safe-logging:safe-logging"
     implementation "com.palantir.safe-logging:logger"
     implementation 'com.palantir.tokens:auth-tokens'
     implementation "com.palantir.tracing:tracing-jersey"
+    implementation 'org.glassfish.jersey.core:jersey-common', {
+        version {
+            strictly jerseyVersion
+        }
+    }
     implementation project(':conjure-java-jackson-serialization')
 
     runtimeOnly "org.glassfish.jersey.ext:jersey-bean-validation", {
@@ -51,3 +61,7 @@ configurations.all {
         exclude group: 'org.glassfish.hk2.external', module: 'jakarta.inject'
     }
 }
+
+checkImplicitDependencies {
+    ignore 'com.palantir.conjure.java.runtime', 'conjure-java-jersey-jakarta-server'
+}
diff --git a/conjure-java-legacy-clients/build.gradle b/conjure-java-legacy-clients/build.gradle
index 6d87f2e6e0..5aa9d1ba3f 100644
--- a/conjure-java-legacy-clients/build.gradle
+++ b/conjure-java-legacy-clients/build.gradle
@@ -6,6 +6,10 @@ dependencies {
     api "com.palantir.conjure.java.api:errors"
     implementation "com.google.guava:guava"
     implementation 'com.github.ben-manes.caffeine:caffeine'
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.errorprone:error_prone_annotations'
+    implementation 'com.palantir.safe-logging:safe-logging'
+    implementation 'io.dropwizard.metrics:metrics-core'
 
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
diff --git a/conjure-java-retrofit2-client/build.gradle b/conjure-java-retrofit2-client/build.gradle
index 196a0e7336..24314e7093 100644
--- a/conjure-java-retrofit2-client/build.gradle
+++ b/conjure-java-retrofit2-client/build.gradle
@@ -14,6 +14,16 @@ dependencies {
     api "com.squareup.retrofit2:retrofit"
 
     implementation project(":conjure-java-jackson-serialization")
+    implementation project(':conjure-java-legacy-clients')
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor'
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.guava:guava'
+    implementation 'com.palantir.conjure.java.api:errors'
+    implementation 'com.palantir.conjure.java.api:service-config'
+    implementation 'com.palantir.safe-logging:preconditions'
+    implementation 'com.palantir.safe-logging:safe-logging'
+    implementation 'com.squareup.okhttp3:okhttp'
     implementation "com.squareup.retrofit2:converter-jackson"
 
     testImplementation project(":keystores")
diff --git a/conjure-scala-jaxrs-client/build.gradle b/conjure-scala-jaxrs-client/build.gradle
index 5244388758..b24209e854 100644
--- a/conjure-scala-jaxrs-client/build.gradle
+++ b/conjure-scala-jaxrs-client/build.gradle
@@ -8,5 +8,10 @@ dependencies {
     api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile"
 
     implementation project(':conjure-java-jackson-serialization')
+    implementation project(':conjure-java-legacy-clients')
+    implementation project(':extras:refresh-utils')
     implementation 'com.fasterxml.jackson.module:jackson-module-scala_2.12'
+    implementation 'com.google.guava:guava'
+    implementation 'com.palantir.conjure.java.api:service-config'
+    implementation 'com.palantir.conjure.java.runtime:client-config'
 }
diff --git a/keystores/build.gradle b/keystores/build.gradle
index 2cb588fcad..e371df1c30 100644
--- a/keystores/build.gradle
+++ b/keystores/build.gradle
@@ -8,10 +8,15 @@ apply plugin: 'com.palantir.revapi'
 dependencies {
     api "com.fasterxml.jackson.core:jackson-databind"
     api "com.palantir.conjure.java.api:ssl-config"
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+    implementation "com.github.ben-manes.caffeine:caffeine"
+    implementation 'com.google.code.findbugs:jsr305'
+    implementation 'com.google.errorprone:error_prone_annotations'
     implementation "com.google.guava:guava"
     implementation 'com.palantir.safe-logging:logger'
     implementation "com.palantir.safe-logging:preconditions"
-    implementation "com.github.ben-manes.caffeine:caffeine"
+    implementation 'com.palantir.safe-logging:safe-logging'
+
 
     testImplementation project(":conjure-java-jackson-serialization")
     testImplementation "org.conscrypt:conscrypt-openjdk-uber"
diff --git a/okhttp-clients/build.gradle b/okhttp-clients/build.gradle
index 1f605fcc81..679a975709 100644
--- a/okhttp-clients/build.gradle
+++ b/okhttp-clients/build.gradle
@@ -9,14 +9,22 @@ dependencies {
     api project(':conjure-java-legacy-clients')
     api "com.palantir.conjure.java.api:errors"
     implementation project(':conjure-java-jackson-serialization')
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.google.guava:guava'
     implementation 'com.netflix.concurrency-limits:concurrency-limits-core'
+    implementation 'com.palantir.conjure.java.api:service-config'
     implementation 'com.palantir.safe-logging:logger'
     implementation 'com.palantir.safe-logging:preconditions'
+    implementation 'com.palantir.safe-logging:safe-logging'
+    implementation 'com.palantir.tracing:tracing'
+    implementation 'com.palantir.tracing:tracing-api'
     implementation 'com.palantir.tracing:tracing-okhttp3'
     implementation 'com.palantir.tritium:tritium-registry'
     implementation 'com.palantir.tritium:tritium-metrics'
     implementation 'io.dropwizard.metrics:metrics-core'
+    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'com.squareup.okio:okio-jvm'
 
     testImplementation project(":keystores")
     testImplementation 'com.palantir.safe-logging:preconditions-assertj'
diff --git a/undertow-jakarta-testing/build.gradle b/undertow-jakarta-testing/build.gradle
index ffbddd3d27..f34d7baf9f 100644
--- a/undertow-jakarta-testing/build.gradle
+++ b/undertow-jakarta-testing/build.gradle
@@ -16,9 +16,17 @@ dependencies {
     api 'jakarta.servlet:jakarta.servlet-api'
     api 'org.apache.httpcomponents.client5:httpclient5'
     implementation project(':conjure-java-jackson-serialization')
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.google.errorprone:error_prone_annotations'
     implementation 'com.palantir.safe-logging:preconditions'
-    implementation 'org.glassfish.jersey.core:jersey-server'
+    implementation 'com.palantir.safe-logging:safe-logging'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api'
+    implementation 'org.apache.httpcomponents.core5:httpcore5'
     implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core'
+    implementation 'org.glassfish.jersey.core:jersey-common'
+    implementation 'org.glassfish.jersey.core:jersey-server'
     implementation 'org.glassfish.jersey.media:jersey-media-json-jackson'
+    implementation 'org.jboss.xnio:xnio-api'
+    implementation 'org.junit.jupiter:junit-jupiter-api'
 
 }
diff --git a/versions.lock b/versions.lock
index 205f4e78fa..1e0425e805 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,7 +1,7 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 69c6ec69)
-com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 34364652)
+com.fasterxml.jackson.core:jackson-annotations:2.15.3 (11 constraints: a1cb712a)
+com.fasterxml.jackson.core:jackson-core:2.15.3 (15 constraints: 6c3b4d55)
 com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e68c0da3)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b)
@@ -45,14 +45,14 @@ com.palantir.safe-logging:safe-logging:3.6.0 (19 constraints: a82ad682)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
 com.palantir.tokens:auth-tokens:3.18.0 (5 constraints: 48488351)
 com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47)
-com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8)
+com.palantir.tracing:tracing-api:6.18.0 (6 constraints: f957c8cf)
 com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b)
 com.palantir.tritium:tritium-api:0.79.0 (2 constraints: 411f78be)
 com.palantir.tritium:tritium-core:0.79.0 (1 constraints: 48105fa2)
 com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 1b4de163)
 com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 625dbee1)
-com.squareup.okhttp3:okhttp:4.12.0 (3 constraints: 292d9bf6)
+com.squareup.okhttp3:okhttp:4.12.0 (4 constraints: 613279d8)
 com.squareup.okio:okio:3.6.0 (1 constraints: 530c38fd)
 com.squareup.okio:okio-jvm:3.6.0 (1 constraints: 500ad3b9)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
@@ -78,7 +78,7 @@ org.glassfish.hk2:hk2-utils:3.0.4 (2 constraints: 1d17d276)
 org.glassfish.hk2:osgi-resource-locator:1.0.3 (1 constraints: ef10e7c2)
 org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 (2 constraints: 1d17d276)
 org.glassfish.jersey.core:jersey-client:3.1.3 (1 constraints: 0011bfc3)
-org.glassfish.jersey.core:jersey-common:3.1.3 (6 constraints: a2756495)
+org.glassfish.jersey.core:jersey-common:3.1.3 (7 constraints: aa7a1d48)
 org.glassfish.jersey.core:jersey-server:3.1.3 (4 constraints: 31452caa)
 org.glassfish.jersey.ext:jersey-bean-validation:3.1.3 (1 constraints: 09050036)
 org.glassfish.jersey.inject:jersey-hk2:3.1.3 (1 constraints: 09050036)

From eec4406eec98cec74844e45c80326f0f084ae8bc Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:34:13 -0700
Subject: [PATCH 50/53] Excavator:  Upgrade dependencies (#2728)

---
 versions.lock  | 8 ++++----
 versions.props | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions.lock b/versions.lock
index 1e0425e805..7c6324171f 100644
--- a/versions.lock
+++ b/versions.lock
@@ -110,8 +110,8 @@ io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
 junit:junit:4.13.2 (1 constraints: 690fa77c)
-net.bytebuddy:byte-buddy:1.14.8 (2 constraints: c416aa4f)
-net.bytebuddy:byte-buddy-agent:1.14.8 (1 constraints: 480b46de)
+net.bytebuddy:byte-buddy:1.14.9 (2 constraints: c516ab4f)
+net.bytebuddy:byte-buddy-agent:1.14.9 (1 constraints: 490b47de)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
 org.apache.commons:commons-lang3:3.13.0 (1 constraints: 39053e3b)
@@ -134,8 +134,8 @@ org.junit.jupiter:junit-jupiter-engine:5.10.0 (1 constraints: 330efd49)
 org.junit.jupiter:junit-jupiter-params:5.10.0 (2 constraints: 6a131c5b)
 org.junit.platform:junit-platform-commons:1.10.0 (2 constraints: 2b211983)
 org.junit.platform:junit-platform-engine:1.10.0 (1 constraints: d210e4c4)
-org.mockito:mockito-core:5.6.0 (2 constraints: d213b265)
-org.mockito:mockito-junit-jupiter:5.6.0 (1 constraints: 0d051636)
+org.mockito:mockito-core:5.7.0 (2 constraints: d413e265)
+org.mockito:mockito-junit-jupiter:5.7.0 (1 constraints: 0e051936)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
 org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
diff --git a/versions.props b/versions.props
index 1dd1740b1c..3dc6fed65b 100644
--- a/versions.props
+++ b/versions.props
@@ -20,7 +20,7 @@ org.assertj:assertj-core = 3.24.2
 org.immutables:value = 2.10.0
 org.jmock:jmock = 2.12.0
 org.junit.*:* = 5.10.0
-org.mockito:* = 5.6.0
+org.mockito:* = 5.7.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
 io.undertow:* = 2.2.24.Final

From 7c1f03878ccc4670d4aa6da2ebd0822c2f03ab78 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 3 Nov 2023 10:24:16 -0700
Subject: [PATCH 51/53] Excavator:  Upgrade dependencies (#2729)

---
 versions.lock  | 12 ++++++------
 versions.props |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions.lock b/versions.lock
index 7c6324171f..ab119617fd 100644
--- a/versions.lock
+++ b/versions.lock
@@ -28,12 +28,12 @@ com.palantir.conjure.java:conjure-lib:7.21.0 (3 constraints: 5a253c4e)
 com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3b25d04b)
 com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: ad286ce4)
 com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.99.0 (1 constraints: 4705703b)
-com.palantir.dialogue:dialogue-blocking-channels:3.99.0 (2 constraints: e92309b5)
-com.palantir.dialogue:dialogue-core:3.99.0 (2 constraints: 4f1918f0)
-com.palantir.dialogue:dialogue-futures:3.99.0 (3 constraints: e63396c2)
-com.palantir.dialogue:dialogue-serde:3.99.0 (1 constraints: 4705703b)
-com.palantir.dialogue:dialogue-target:3.99.0 (5 constraints: 344d046e)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.100.0 (1 constraints: 66059d40)
+com.palantir.dialogue:dialogue-blocking-channels:3.100.0 (2 constraints: 272478f2)
+com.palantir.dialogue:dialogue-core:3.100.0 (2 constraints: 8d19ae15)
+com.palantir.dialogue:dialogue-futures:3.100.0 (3 constraints: 4334c73f)
+com.palantir.dialogue:dialogue-serde:3.100.0 (1 constraints: 66059d40)
+com.palantir.dialogue:dialogue-target:3.100.0 (5 constraints: cf4d7681)
 com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91)
 com.palantir.refreshable:refreshable:2.3.0 (1 constraints: 0705fe35)
 com.palantir.ri:resource-identifier:2.6.0 (3 constraints: aa2f1337)
diff --git a/versions.props b/versions.props
index 3dc6fed65b..7818005f22 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.palantir.conjure.java:* = 7.21.0
 com.palantir.conjure.java:conjure-lib = 7.21.0
 com.palantir.conjure.java.api:* = 2.38.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.99.0
+com.palantir.dialogue:* = 3.100.0
 com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0

From 7a3d3fdc7a29d1894f7f0cb2fa9593dd7877d34e Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Sun, 5 Nov 2023 10:53:27 -0800
Subject: [PATCH 52/53] Excavator:  Upgrade dependencies (#2730)

---
 versions.lock  | 12 ++++++------
 versions.props |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions.lock b/versions.lock
index ab119617fd..400747bfa9 100644
--- a/versions.lock
+++ b/versions.lock
@@ -128,12 +128,12 @@ org.jboss.xnio:xnio-api:3.8.7.Final (2 constraints: 771a3146)
 org.jboss.xnio:xnio-nio:3.8.7.Final (1 constraints: c80dcb30)
 org.jmock:jmock:2.12.0 (1 constraints: 3705353b)
 org.jmock:jmock-testjar:2.12.0 (1 constraints: a507a272)
-org.junit.jupiter:junit-jupiter:5.10.0 (1 constraints: 3805413b)
-org.junit.jupiter:junit-jupiter-api:5.10.0 (5 constraints: 124450ad)
-org.junit.jupiter:junit-jupiter-engine:5.10.0 (1 constraints: 330efd49)
-org.junit.jupiter:junit-jupiter-params:5.10.0 (2 constraints: 6a131c5b)
-org.junit.platform:junit-platform-commons:1.10.0 (2 constraints: 2b211983)
-org.junit.platform:junit-platform-engine:1.10.0 (1 constraints: d210e4c4)
+org.junit.jupiter:junit-jupiter:5.10.1 (1 constraints: 3905423b)
+org.junit.jupiter:junit-jupiter-api:5.10.1 (5 constraints: 164419af)
+org.junit.jupiter:junit-jupiter-engine:5.10.1 (1 constraints: 340efe49)
+org.junit.jupiter:junit-jupiter-params:5.10.1 (2 constraints: 6c13475b)
+org.junit.platform:junit-platform-commons:1.10.1 (2 constraints: 2d214d83)
+org.junit.platform:junit-platform-engine:1.10.1 (1 constraints: d310e5c4)
 org.mockito:mockito-core:5.7.0 (2 constraints: d413e265)
 org.mockito:mockito-junit-jupiter:5.7.0 (1 constraints: 0e051936)
 org.objenesis:objenesis:3.3 (1 constraints: b20a14bd)
diff --git a/versions.props b/versions.props
index 7818005f22..219166d696 100644
--- a/versions.props
+++ b/versions.props
@@ -19,7 +19,7 @@ org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2
 org.immutables:value = 2.10.0
 org.jmock:jmock = 2.12.0
-org.junit.*:* = 5.10.0
+org.junit.*:* = 5.10.1
 org.mockito:* = 5.7.0
 org.slf4j:* = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4

From afb4dfa04941913af1ba6355dc5a5c58f9f4baec Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Tue, 7 Nov 2023 03:27:20 -0800
Subject: [PATCH 53/53] Excavator:  Enforce that Jakarta dependency versions
 use the new 'jakarta' namespace, or replace it with an equivalent Java EE
 dependency instead (#2731)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5aa60fb887..a83385b87d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0'
+        classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.34.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.12.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'