Merge branch 'develop' into roomba/latest-baseline-oss

conjure-java-jackson-optimizations/src/main/java/com/palantir/conjure/java/jackson/optimizations/ObjectMapperOptimizations.java

@@ -35,6 +35,7 @@ public final class ObjectMapperOptimizations {
                     || readProperty(
                             "com.palantir.conjure.java.jackson.optimizations.disabled", shouldDisableByDefault());
 
+    @SuppressWarnings("AfterburnerJavaIncompatibility")
     public static List<? extends com.fasterxml.jackson.databind.Module> createModules() {
         return NO_OPTIMIZATIONS ? List.of() : List.<com.fasterxml.jackson.databind.Module>of(new AfterburnerModule());
     }

versions.lock

@@ -1,119 +1,119 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
-com.fasterxml.jackson:jackson-bom:2.12.5 (18 constraints: 1e7b35eb)
-com.fasterxml.jackson.core:jackson-annotations:2.12.5 (16 constraints: b020265f)
-com.fasterxml.jackson.core:jackson-core:2.12.5 (21 constraints: 3da6c455)
-com.fasterxml.jackson.core:jackson-databind:2.12.5 (26 constraints: 29ef63eb)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.5 (7 constraints: 276fed03)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.5 (3 constraints: 162474d6)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.5 (7 constraints: 70660b7b)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.5 (7 constraints: 70660b7b)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.5 (4 constraints: c332a520)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.5 (7 constraints: 70660b7b)
+com.fasterxml.jackson:jackson-bom:2.12.5 (24 constraints: f8e30443)
+com.fasterxml.jackson.core:jackson-annotations:2.12.5 (21 constraints: b57930a2)
+com.fasterxml.jackson.core:jackson-core:2.12.5 (26 constraints: 42ffce6a)
+com.fasterxml.jackson.core:jackson-databind:2.12.5 (31 constraints: 3d48bf4b)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.5 (13 constraints: 01d8793d)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.5 (9 constraints: f08cca7c)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.5 (13 constraints: 4acfcd4f)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.5 (13 constraints: 4acfcd4f)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.5 (10 constraints: 9d9baffb)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.5 (13 constraints: 4acfcd4f)
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.5 (3 constraints: 963dce4a)
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.12.5 (2 constraints: f513d782)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.12.5 (7 constraints: 70660b7b)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.12.5 (13 constraints: 4acfcd4f)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.5 (4 constraints: 8253e41e)
 com.fasterxml.jackson.module:jackson-module-scala_2.12:2.12.5 (2 constraints: f513d782)
-com.github.ben-manes.caffeine:caffeine:3.0.5 (9 constraints: 6d85d486)
-com.github.kevinstern:software-and-algorithms:1.0 (2 constraints: 16246655)
-com.google.auto:auto-common:1.2.1 (3 constraints: d532d3f0)
-com.google.auto.service:auto-service-annotations:1.0.1 (8 constraints: 8e868b7a)
-com.google.auto.value:auto-value-annotations:1.7.4 (3 constraints: 1c3595c5)
-com.google.code.findbugs:jFormatString:3.0.0 (2 constraints: e8220411)
-com.google.code.findbugs:jsr305:3.0.2 (36 constraints: 2636ba68)
-com.google.errorprone:error_prone_annotation:2.10.0 (3 constraints: 553624ef)
-com.google.errorprone:error_prone_annotations:2.11.0 (29 constraints: 58d36b21)
-com.google.errorprone:error_prone_check_api:2.10.0 (2 constraints: 4823fc4e)
-com.google.errorprone:error_prone_core:2.10.0 (2 constraints: 0a20b11c)
-com.google.errorprone:error_prone_type_annotations:2.10.0 (2 constraints: 4823fc4e)
-com.google.guava:failureaccess:1.0.1 (12 constraints: 37b7c20d)
+com.github.ben-manes.caffeine:caffeine:3.0.5 (14 constraints: e2dd0182)
+com.github.kevinstern:software-and-algorithms:1.0 (8 constraints: 66899870)
+com.google.auto:auto-common:1.2.1 (9 constraints: 6b9ac4ba)
+com.google.auto.service:auto-service-annotations:1.0.1 (14 constraints: 18ee3fb0)
+com.google.auto.value:auto-value-annotations:1.7.4 (9 constraints: e29cf747)
+com.google.code.findbugs:jFormatString:3.0.0 (8 constraints: 788a2a6d)
+com.google.code.findbugs:jsr305:3.0.2 (37 constraints: 754afa4f)
+com.google.errorprone:error_prone_annotation:2.10.0 (9 constraints: 059f6309)
+com.google.errorprone:error_prone_annotations:2.11.0 (30 constraints: dbe7adb3)
+com.google.errorprone:error_prone_check_api:2.10.0 (8 constraints: f88b7dee)
+com.google.errorprone:error_prone_core:2.10.0 (8 constraints: ba88e4e4)
+com.google.errorprone:error_prone_type_annotations:2.10.0 (8 constraints: f88b7dee)
+com.google.guava:failureaccess:1.0.1 (18 constraints: d01e2b0e)
 com.google.guava:guava:31.0.1-jre (29 constraints: ccf4edf5)
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (12 constraints: 325ba14b)
-com.google.j2objc:j2objc-annotations:1.3 (12 constraints: e7b284e6)
-com.google.protobuf:protobuf-java:3.4.0 (2 constraints: f022e811)
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (18 constraints: c114479b)
+com.google.j2objc:j2objc-annotations:1.3 (18 constraints: 58181845)
+com.google.protobuf:protobuf-java:3.4.0 (8 constraints: 988a7682)
 com.jcraft:jzlib:1.1.3 (1 constraints: 0705f635)
 com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335)
 com.netflix.feign:feign-core:8.18.0 (4 constraints: a02d2192)
 com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b)
 com.netflix.feign:feign-jaxrs:8.18.0 (1 constraints: 43056b3b)
-com.palantir.baseline:baseline-error-prone:4.68.0 (2 constraints: 7a177958)
-com.palantir.conjure.java:conjure-lib:6.16.0 (3 constraints: 5b251b4f)
-com.palantir.conjure.java.api:errors:2.23.0 (3 constraints: 28255248)
-com.palantir.conjure.java.api:service-config:2.23.0 (4 constraints: b738f1fb)
-com.palantir.conjure.java.api:ssl-config:2.23.0 (3 constraints: 17284c8b)
-com.palantir.dialogue:dialogue-apache-hc5-client:3.41.0 (2 constraints: 591569da)
-com.palantir.dialogue:dialogue-blocking-channels:3.41.0 (3 constraints: ee33fbe8)
-com.palantir.dialogue:dialogue-core:3.41.0 (3 constraints: 54294433)
-com.palantir.dialogue:dialogue-futures:3.41.0 (4 constraints: de435dc7)
-com.palantir.dialogue:dialogue-serde:3.41.0 (2 constraints: 591569da)
-com.palantir.dialogue:dialogue-target:3.41.0 (6 constraints: 125d18fd)
-com.palantir.refreshable:refreshable:2.1.0 (2 constraints: ef142cb6)
-com.palantir.ri:resource-identifier:2.3.0 (3 constraints: 9f2f2935)
-com.palantir.safe-logging:logger:1.21.0 (19 constraints: f729c91e)
-com.palantir.safe-logging:logger-slf4j:1.21.0 (11 constraints: 46ab5214)
-com.palantir.safe-logging:logger-spi:1.21.0 (12 constraints: 84bb33b7)
-com.palantir.safe-logging:preconditions:1.21.0 (23 constraints: 7671b41e)
-com.palantir.safe-logging:safe-logging:1.21.0 (24 constraints: aa7f23e4)
-com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (4 constraints: 7b426ea5)
-com.palantir.tokens:auth-tokens:3.11.0 (6 constraints: d563269c)
-com.palantir.tracing:tracing:6.7.0 (10 constraints: 0b9a596f)
-com.palantir.tracing:tracing-api:6.7.0 (7 constraints: 976fcef6)
+com.palantir.baseline:baseline-error-prone:4.68.0 (8 constraints: 84802c35)
+com.palantir.conjure.java:conjure-lib:6.21.0 (7 constraints: 336ee087)
+com.palantir.conjure.java.api:errors:2.23.0 (8 constraints: 1f7ee611)
+com.palantir.conjure.java.api:service-config:2.23.0 (8 constraints: 1f7ee611)
+com.palantir.conjure.java.api:ssl-config:2.23.0 (9 constraints: df90c3e2)
+com.palantir.dialogue:dialogue-apache-hc5-client:3.43.0 (2 constraints: 5d15d3da)
+com.palantir.dialogue:dialogue-blocking-channels:3.43.0 (3 constraints: f43339ea)
+com.palantir.dialogue:dialogue-core:3.43.0 (3 constraints: 5a299c34)
+com.palantir.dialogue:dialogue-futures:3.43.0 (4 constraints: e643b1c9)
+com.palantir.dialogue:dialogue-serde:3.43.0 (2 constraints: 5d15d3da)
+com.palantir.dialogue:dialogue-target:3.43.0 (6 constraints: 1e5d2103)
+com.palantir.refreshable:refreshable:2.1.0 (8 constraints: 7f7c6ee9)
+com.palantir.ri:resource-identifier:2.3.0 (7 constraints: 8977ae07)
+com.palantir.safe-logging:logger:1.21.0 (20 constraints: 3f3a789f)
+com.palantir.safe-logging:logger-slf4j:1.21.0 (17 constraints: 0b1404f6)
+com.palantir.safe-logging:logger-spi:1.21.0 (18 constraints: 4924403c)
+com.palantir.safe-logging:preconditions:1.21.0 (23 constraints: 7c71452d)
+com.palantir.safe-logging:safe-logging:1.21.0 (25 constraints: 7990c41e)
+com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (7 constraints: 6d77aff7)
+com.palantir.tokens:auth-tokens:3.11.0 (10 constraints: 7dac03c9)
+com.palantir.tracing:tracing:6.7.0 (12 constraints: cababbfd)
+com.palantir.tracing:tracing-api:6.7.0 (11 constraints: 55b488a7)
 com.palantir.tracing:tracing-jersey:6.7.0 (5 constraints: 4b405ed6)
 com.palantir.tracing:tracing-okhttp3:6.7.0 (5 constraints: 1040579b)
-com.palantir.tritium:tritium-api:0.38.0 (3 constraints: 592f4503)
-com.palantir.tritium:tritium-core:0.38.0 (2 constraints: 65204232)
-com.palantir.tritium:tritium-metrics:0.38.0 (6 constraints: 245de205)
-com.palantir.tritium:tritium-registry:0.38.0 (8 constraints: 967f77d2)
+com.palantir.tritium:tritium-api:0.38.0 (9 constraints: 3998829a)
+com.palantir.tritium:tritium-core:0.38.0 (8 constraints: 4589e02a)
+com.palantir.tritium:tritium-metrics:0.38.0 (8 constraints: 3f7e6627)
+com.palantir.tritium:tritium-registry:0.38.0 (10 constraints: b1a068a7)
 com.squareup.okhttp3:logging-interceptor:3.13.1 (1 constraints: 3a053f3b)
 com.squareup.okhttp3:okhttp:3.13.1 (10 constraints: 8194452c)
 com.squareup.okio:okio:1.17.2 (6 constraints: ec5780f5)
 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)
-commons-codec:commons-codec:1.15 (2 constraints: cd2235f5)
-io.dropwizard.metrics:metrics-core:3.2.6 (8 constraints: 7a813d51)
-io.github.java-diff-utils:java-diff-utils:4.0 (2 constraints: 1c240b56)
+commons-codec:commons-codec:1.15 (8 constraints: 61898120)
+io.dropwizard.metrics:metrics-core:3.2.6 (11 constraints: 7eb6f94e)
+io.github.java-diff-utils:java-diff-utils:4.0 (8 constraints: 7e89e97f)
 jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: ba28fcbd)
-jakarta.annotation:jakarta.annotation-api:1.3.5 (9 constraints: 478a9a06)
+jakarta.annotation:jakarta.annotation-api:1.3.5 (15 constraints: fbf164bc)
 jakarta.el:jakarta.el-api:3.0.3 (1 constraints: fe135465)
 jakarta.validation:jakarta.validation-api:2.0.2 (9 constraints: eb916d58)
-jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (17 constraints: c21e767b)
+jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (22 constraints: d27678ce)
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (2 constraints: 3c336a87)
-joda-time:joda-time:2.10.13 (3 constraints: 023418df)
-net.bytebuddy:byte-buddy:1.12.7 (5 constraints: 1f51e791)
-net.bytebuddy:byte-buddy-agent:1.12.7 (5 constraints: 1f51e791)
-org.apache.httpcomponents.client5:httpclient5:5.1.2 (2 constraints: bb238594)
-org.apache.httpcomponents.core5:httpcore5:5.1.3 (4 constraints: 4e49d9dc)
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.2 (2 constraints: 2b232c32)
-org.checkerframework:checker-qual:3.19.0 (13 constraints: fcc8e87e)
-org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: 6736f3f2)
-org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (2 constraints: b1299390)
+joda-time:joda-time:2.10.13 (9 constraints: ea9d4d63)
+net.bytebuddy:byte-buddy:1.12.7 (11 constraints: ffb93c02)
+net.bytebuddy:byte-buddy-agent:1.12.7 (11 constraints: ffb93c02)
+org.apache.httpcomponents.client5:httpclient5:5.1.3 (7 constraints: a5778217)
+org.apache.httpcomponents.core5:httpcore5:5.1.3 (9 constraints: 389dd773)
+org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 (8 constraints: e18a9a91)
+org.checkerframework:checker-qual:3.19.0 (19 constraints: f731f23f)
+org.checkerframework:dataflow-errorprone:3.15.0 (9 constraints: 3b9f9633)
+org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (8 constraints: bda5e091)
 org.glassfish:jakarta.el:3.0.3 (2 constraints: bf231f5c)
 org.glassfish.hk2:hk2-api:2.6.1 (1 constraints: 6e0c620c)
 org.glassfish.hk2:hk2-locator:2.6.1 (1 constraints: 4410e0ad)
 org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277)
-org.glassfish.hk2:osgi-resource-locator:1.0.3 (8 constraints: da7dbbdc)
+org.glassfish.hk2:osgi-resource-locator:1.0.3 (14 constraints: 70e57c2b)
 org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277)
-org.glassfish.hk2.external:jakarta.inject:2.6.1 (15 constraints: 78f03030)
+org.glassfish.hk2.external:jakarta.inject:2.6.1 (21 constraints: 3b58aa6d)
 org.glassfish.jersey.core:jersey-client:2.34 (7 constraints: b47d197f)
-org.glassfish.jersey.core:jersey-common:2.34 (15 constraints: 7d0c81e9)
+org.glassfish.jersey.core:jersey-common:2.34 (21 constraints: 1d7374f4)
 org.glassfish.jersey.core:jersey-server:2.34 (13 constraints: 88ef2f73)
 org.glassfish.jersey.ext:jersey-bean-validation:2.34 (2 constraints: 3d13ca46)
 org.glassfish.jersey.inject:jersey-hk2:2.34 (2 constraints: 3d13ca46)
-org.hdrhistogram:HdrHistogram:2.1.12 (2 constraints: 5b203831)
+org.hdrhistogram:HdrHistogram:2.1.12 (8 constraints: 1d893d10)
 org.hibernate.validator:hibernate-validator:6.2.0.Final (2 constraints: f327a520)
-org.immutables:value:2.9.0 (12 constraints: bdb22f2b)
+org.immutables:value:2.9.0 (18 constraints: 8c1a2ade)
 org.javassist:javassist:3.26.0-GA (2 constraints: d5210409)
 org.jboss.logging:jboss-logging:3.4.1.Final (10 constraints: a7acd33a)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
-org.mockito:mockito-core:4.3.1 (6 constraints: d2579c16)
-org.mockito:mockito-errorprone:4.3.1 (1 constraints: fc1105f9)
-org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (2 constraints: f91f0df8)
-org.objenesis:objenesis:3.2 (6 constraints: 7b5cf4e5)
-org.pcollections:pcollections:2.1.2 (2 constraints: ec226a11)
+org.mockito:mockito-core:4.3.1 (12 constraints: 80bfe9a3)
+org.mockito:mockito-errorprone:4.3.1 (7 constraints: aa7920d1)
+org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (8 constraints: 9587929d)
+org.objenesis:objenesis:3.2 (12 constraints: e3c1fbbc)
+org.pcollections:pcollections:2.1.2 (8 constraints: 888aa077)
 org.scala-lang:scala-library:2.12.13 (1 constraints: 3816742c)
-org.slf4j:slf4j-api:1.7.35 (40 constraints: bf72d278)
+org.slf4j:slf4j-api:1.7.36 (46 constraints: c5dbe105)
 
 [Test dependencies]
 ch.qos.logback:logback-access:1.2.3 (1 constraints: b41148e2)
@@ -154,7 +154,7 @@ io.dropwizard.metrics:metrics-logback:4.1.2 (1 constraints: 7f0edf4f)
 io.dropwizard.metrics:metrics-servlets:4.1.2 (1 constraints: 410d3a1f)
 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.14.Final (7 constraints: 836f9277)
+io.undertow:undertow-core:2.2.16.Final (7 constraints: 876f007c)
 jakarta.servlet:jakarta.servlet-api:4.0.4 (7 constraints: 68726d1b)
 javax.activation:javax.activation-api:1.2.0 (2 constraints: 6a18eec3)
 javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 830dcc28)
@@ -190,9 +190,9 @@ org.hamcrest:hamcrest:2.2 (3 constraints: 21246acb)
 org.hamcrest:hamcrest-all:1.3 (1 constraints: a8041d2c)
 org.hamcrest:hamcrest-core:2.2 (3 constraints: 2424949c)
 org.hamcrest:hamcrest-library:2.2 (2 constraints: b018e6b4)
-org.jboss.threads:jboss-threads:3.1.0.Final (3 constraints: 562c52bf)
-org.jboss.xnio:xnio-api:3.8.4.Final (8 constraints: 9b81f142)
-org.jboss.xnio:xnio-nio:3.8.4.Final (7 constraints: ef74e6dc)
+org.jboss.threads:jboss-threads:3.1.0.Final (3 constraints: 592c67bf)
+org.jboss.xnio:xnio-api:3.8.6.Final (8 constraints: a181ed45)
+org.jboss.xnio:xnio-nio:3.8.6.Final (7 constraints: f3743cdf)
 org.jmock:jmock:2.12.0 (1 constraints: 3705353b)
 org.jmock:jmock-testjar:2.12.0 (1 constraints: a507a272)
 org.ow2.asm:asm:9.2 (2 constraints: bc18a6b5)
@@ -201,5 +201,5 @@ org.slf4j:jcl-over-slf4j:1.7.29 (1 constraints: bb0e9d5e)
 org.slf4j:jul-to-slf4j:1.7.29 (1 constraints: bb0e9d5e)
 org.slf4j:log4j-over-slf4j:1.7.29 (1 constraints: bb0e9d5e)
 org.wildfly.client:wildfly-client-config:1.0.1.Final (2 constraints: 951e26b4)
-org.wildfly.common:wildfly-common:1.5.2.Final (4 constraints: cd411c1c)
+org.wildfly.common:wildfly-common:1.5.4.Final (3 constraints: 7d2e0add)
 org.yaml:snakeyaml:1.27 (2 constraints: 35279cd0)

versions.props

@@ -5,11 +5,11 @@ com.google.guava:guava = 31.0.1-jre
 com.jcraft:jzlib = 1.1.3
 com.netflix.concurrency-limits:* = 0.2.2
 com.netflix.feign:feign-*= 8.18.0
-com.palantir.conjure.java:conjure-java = 6.16.0
-com.palantir.conjure.java:conjure-lib = 6.16.0
+com.palantir.conjure.java:conjure-java = 6.21.0
+com.palantir.conjure.java:conjure-lib = 6.21.0
 com.palantir.conjure.java.api:* = 2.23.0
 com.palantir.conjure.verification:* = 0.19.0
-com.palantir.dialogue:* = 3.41.0
+com.palantir.dialogue:* = 3.43.0
 com.palantir.safe-logging:* = 1.21.0
 com.palantir.tracing:* = 6.7.0
 com.palantir.tritium:* = 0.38.0
@@ -24,9 +24,9 @@ org.hamcrest:hamcrest-* = 1.3
 org.immutables:value = 2.9.0
 org.jmock:jmock = 2.12.0
 org.mockito:* = 4.3.1
-org.slf4j:slf4j-api = 1.7.35
+org.slf4j:slf4j-api = 1.7.36
 io.leangen.geantyref:geantyref = 1.3.4
-io.undertow:undertow-core = 2.2.14.Final
+io.undertow:undertow-core = 2.2.16.Final
 com.palantir.refreshable:refreshable = 2.1.0
 org.hibernate.validator:* = 6.2.0.Final