Merge remote-tracking branch 'upstream/develop' into lsingh/external-…

…imports-log-safety

build.gradle

@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.3.0'
+        classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.4.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.28.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.6.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'

versions.lock

@@ -29,13 +29,13 @@ com.palantir.conjure.java.runtime:client-config:7.40.0 (7 constraints: 64954feb)
 com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:7.40.0 (1 constraints: 811cbaa4)
 com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:7.40.0 (6 constraints: 0976b4fc)
 com.palantir.conjure.java.runtime:keystores:7.40.0 (3 constraints: 162af65b)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.74.0 (2 constraints: 7c29b801)
-com.palantir.dialogue:dialogue-blocking-channels:3.74.0 (2 constraints: db2399b3)
-com.palantir.dialogue:dialogue-clients:3.74.0 (1 constraints: 4005593b)
-com.palantir.dialogue:dialogue-core:3.74.0 (3 constraints: 7d3d43e1)
-com.palantir.dialogue:dialogue-futures:3.74.0 (3 constraints: d13392be)
-com.palantir.dialogue:dialogue-serde:3.74.0 (3 constraints: bb2efaa2)
-com.palantir.dialogue:dialogue-target:3.74.0 (7 constraints: 8c767a5a)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.75.0 (2 constraints: 7d29bb01)
+com.palantir.dialogue:dialogue-blocking-channels:3.75.0 (2 constraints: dd23cdb3)
+com.palantir.dialogue:dialogue-clients:3.75.0 (1 constraints: 41055c3b)
+com.palantir.dialogue:dialogue-core:3.75.0 (3 constraints: 7f3d79e1)
+com.palantir.dialogue:dialogue-futures:3.75.0 (3 constraints: d43324bf)
+com.palantir.dialogue:dialogue-serde:3.75.0 (3 constraints: bd2e75a3)
+com.palantir.dialogue:dialogue-target:3.75.0 (7 constraints: 9276a95d)
 com.palantir.goethe:goethe:0.10.0 (1 constraints: 3305233b)
 com.palantir.human-readable-types:human-readable-types:1.6.0 (1 constraints: 09050236)
 com.palantir.refreshable:refreshable:2.2.0 (2 constraints: 642473b7)
@@ -53,19 +53,19 @@ com.palantir.tracing:tracing-api:6.15.0 (6 constraints: 1760c248)
 com.palantir.tracing:tracing-undertow:6.15.0 (1 constraints: 3e05563b)
 com.palantir.tritium:tritium-api:0.61.0 (2 constraints: 2f1fa2bc)
 com.palantir.tritium:tritium-core:0.61.0 (1 constraints: 3f1043a2)
-com.palantir.tritium:tritium-metrics:0.61.0 (5 constraints: 615c5428)
-com.palantir.tritium:tritium-registry:0.61.0 (10 constraints: 61c33051)
+com.palantir.tritium:tritium-metrics:0.61.0 (5 constraints: 655c7e29)
+com.palantir.tritium:tritium-registry:0.61.0 (10 constraints: 66c3fe53)
 com.squareup:javapoet:1.13.0 (2 constraints: 2b113eee)
 info.picocli:picocli:4.7.1 (1 constraints: 0e051536)
 io.dropwizard.metrics:metrics-core:4.1.33 (24 constraints: 6c7ccc07)
 io.undertow:undertow-core:2.2.19.Final (2 constraints: e91964fe)
 javax.annotation:javax.annotation-api:1.3.2 (7 constraints: 726bc2a7)
 javax.validation:validation-api:2.0.1.Final (13 constraints: e5c5c6d1)
-javax.ws.rs:javax.ws.rs-api:2.1.1 (15 constraints: 670493d6)
+javax.ws.rs:javax.ws.rs-api:2.1.1 (14 constraints: b4f4b54a)
 joda-time:joda-time:2.12.2 (3 constraints: bd297122)
 org.apache.commons:commons-lang3:3.12.0 (4 constraints: 463074c4)
 org.apache.httpcomponents.client5:httpclient5:5.2.1 (1 constraints: cc13966e)
-org.apache.httpcomponents.core5:httpcore5:5.2 (3 constraints: 40388deb)
+org.apache.httpcomponents.core5:httpcore5:5.2.1 (3 constraints: 9f383c39)
 org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
 org.checkerframework:checker-qual:3.27.0 (3 constraints: da242163)
 org.derive4j:derive4j-annotation:1.1.1 (1 constraints: 0505f435)

versions.props

@@ -8,7 +8,7 @@ com.palantir.conjure.java.api:* = 2.34.0
 com.palantir.conjure.java.runtime:* = 7.40.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.conjure:* = 4.36.0
-com.palantir.dialogue:* = 3.74.0
+com.palantir.dialogue:* = 3.75.0
 com.palantir.ri:resource-identifier = 2.5.0
 com.palantir.safe-logging:* = 3.2.0
 com.palantir.syntactic-paths:syntactic-paths = 0.9.0