Bump buildscripts (#2266)

build.gradle

@@ -9,11 +9,11 @@ buildscript {
  classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.17.0'
  classpath 'com.palantir.gradle.revapi:gradle-revapi:1.6.0'
  classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
- classpath 'com.palantir.baseline:gradle-baseline-java:4.70.0'
+ classpath 'com.palantir.baseline:gradle-baseline-java:4.71.0'
  classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.13.0'
  classpath 'com.palantir.metricschema:gradle-metric-schema:0.12.0'
  classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0'
- classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.7.0'
+ classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.8.0'
  }
 }
 

versions.lock

@@ -15,29 +15,18 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.12.5 (2 constraints: f
 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 (19 constraints: 7728774b)
-com.github.kevinstern:software-and-algorithms:1.0 (13 constraints: f3d1e803)
-com.google.auto:auto-common:1.2.1 (14 constraints: dde43047)
-com.google.auto.service:auto-service-annotations:1.0.1 (19 constraints: 8f386283)
-com.google.auto.value:auto-value-annotations:1.7.4 (14 constraints: 7ce7fdf4)
-com.google.code.findbugs:jFormatString:3.0.0 (13 constraints: e5d4f691)
-com.google.code.findbugs:jsr305:3.0.2 (37 constraints: 754afa4f)
-com.google.errorprone:error_prone_annotation:2.10.0 (14 constraints: 62ea5cba)
-com.google.errorprone:error_prone_annotations:2.11.0 (30 constraints: b7e83872)
-com.google.errorprone:error_prone_check_api:2.10.0 (13 constraints: 55d7693f)
-com.google.errorprone:error_prone_core:2.10.0 (13 constraints: 17d48745)
-com.google.errorprone:error_prone_type_annotations:2.10.0 (13 constraints: 55d7693f)
-com.google.guava:failureaccess:1.0.1 (18 constraints: d01e2b0e)
-com.google.guava:guava:31.0.1-jre (29 constraints: 7ff62dd0)
-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 (13 constraints: 19d57ec9)
+com.github.ben-manes.caffeine:caffeine:3.0.5 (17 constraints: 8e03c7b7)
+com.google.code.findbugs:jsr305:3.0.2 (34 constraints: af14c68d)
+com.google.errorprone:error_prone_annotations:2.11.0 (27 constraints: 62b23cc6)
+com.google.guava:failureaccess:1.0.1 (17 constraints: d90c51da)
+com.google.guava:guava:31.0.1-jre (25 constraints: 41ae6448)
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (17 constraints: 12f557f6)
+com.google.j2objc:j2objc-annotations:1.3 (17 constraints: bd06b899)
 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.70.0 (13 constraints: 26cc70bc)
 com.palantir.conjure.java:conjure-lib:6.30.0 (7 constraints: 336ee787)
 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)
@@ -53,8 +42,8 @@ com.palantir.ri:resource-identifier:2.3.0 (7 constraints: 8977ae07)
 com.palantir.safe-logging:logger:1.21.0 (20 constraints: 443a16a3)
 com.palantir.safe-logging:logger-slf4j:1.21.0 (17 constraints: 1014e5f7)
 com.palantir.safe-logging:logger-spi:1.21.0 (18 constraints: 4e24213e)
-com.palantir.safe-logging:preconditions:1.21.0 (23 constraints: 8171ce31)
-com.palantir.safe-logging:safe-logging:1.21.0 (25 constraints: 7e904d23)
+com.palantir.safe-logging:preconditions:1.21.0 (22 constraints: 585fa035)
+com.palantir.safe-logging:safe-logging:1.21.0 (24 constraints: 557e23b2)
 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.8.0 (12 constraints: d6baca09)
@@ -64,31 +53,26 @@ com.palantir.tracing:tracing-okhttp3:6.8.0 (5 constraints: 1540219d)
 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.palantir.tritium:tritium-registry:0.38.0 (9 constraints: 818e2f7a)
 com.squareup.okhttp3:logging-interceptor:3.13.1 (1 constraints: 3a053f3b)
-com.squareup.okhttp3:okhttp:3.13.1 (11 constraints: 5aa7e689)
-com.squareup.okio:okio:2.4.3 (7 constraints: 086a360f)
+com.squareup.okhttp3:okhttp:3.13.1 (10 constraints: 5d95254c)
+com.squareup.okio:okio:1.17.2 (6 constraints: 0a581705)
 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 (8 constraints: 61898120)
-io.dropwizard.metrics:metrics-core:3.2.6 (11 constraints: 7eb6f94e)
-io.github.java-diff-utils:java-diff-utils:4.0 (13 constraints: 1ad2ba2b)
+io.dropwizard.metrics:metrics-core:3.2.6 (10 constraints: 82a4fe74)
 jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: ba28fcbd)
 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 (22 constraints: d27678ce)
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (2 constraints: 3c336a87)
 joda-time:joda-time:2.10.13 (9 constraints: ea9d4d63)
-net.bytebuddy:byte-buddy:1.12.7 (16 constraints: 9605ab53)
-net.bytebuddy:byte-buddy-agent:1.12.7 (16 constraints: 9605ab53)
 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: 05332bfe)
-org.checkerframework:dataflow-errorprone:3.15.0 (14 constraints: b6ea5b1e)
-org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (13 constraints: 4b014b54)
+org.checkerframework:checker-qual:3.19.0 (18 constraints: d3205f8a)
 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)
@@ -103,20 +87,13 @@ 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 (8 constraints: 1d893d10)
 org.hibernate.validator:hibernate-validator:6.2.0.Final (2 constraints: f327a520)
-org.immutables:value:2.9.0 (18 constraints: 701a5be7)
+org.immutables:value:2.9.0 (17 constraints: 70085898)
 org.javassist:javassist:3.26.0-GA (2 constraints: d5210409)
 org.jboss.logging:jboss-logging:3.4.1.Final (10 constraints: a7acdd3a)
-org.jetbrains:annotations:19.0.0 (2 constraints: 0e21b363)
-org.jetbrains.kotlin:kotlin-stdlib:1.3.61 (2 constraints: b21cb415)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61 (3 constraints: f52b347f)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
-org.mockito:mockito-core:4.3.1 (17 constraints: 170a493a)
-org.mockito:mockito-errorprone:4.3.1 (12 constraints: 28c4a9e1)
 org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (8 constraints: 9587929d)
-org.objenesis:objenesis:3.2 (17 constraints: 930a7183)
-org.pcollections:pcollections:2.1.2 (13 constraints: ffd46cad)
 org.scala-lang:scala-library:2.12.13 (1 constraints: 3816742c)
-org.slf4j:slf4j-api:1.7.36 (46 constraints: d5db6149)
+org.slf4j:slf4j-api:1.7.36 (45 constraints: 9fc9fed6)
 
 [Test dependencies]
 ch.qos.logback:logback-access:1.2.3 (1 constraints: b41148e2)
@@ -162,13 +139,15 @@ 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)
 javax.xml.bind:jaxb-api:2.3.1 (1 constraints: 290e1140)
-junit:junit:4.13.2 (6 constraints: 0f7387a9)
+junit:junit:4.13.2 (5 constraints: e06066b7)
+net.bytebuddy:byte-buddy:1.12.7 (15 constraints: 57f3241d)
+net.bytebuddy:byte-buddy-agent:1.12.7 (15 constraints: 57f3241d)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
 net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 430d3a1f)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
-org.apache.commons:commons-lang3:3.12.0 (6 constraints: 755379d2)
+org.apache.commons:commons-lang3:3.12.0 (5 constraints: 4a4114cb)
 org.apache.commons:commons-text:1.8 (1 constraints: b4102e9b)
-org.assertj:assertj-core:3.22.0 (7 constraints: 306e62fd)
+org.assertj:assertj-core:3.22.0 (6 constraints: 045ce634)
 org.conscrypt:conscrypt-openjdk-uber:1.4.1 (1 constraints: 0805fd35)
 org.eclipse.jetty:jetty-continuation:9.4.24.v20191120 (2 constraints: 7021f842)
 org.eclipse.jetty:jetty-http:9.4.24.v20191120 (3 constraints: 03312e51)
@@ -189,16 +168,18 @@ org.glassfish.jersey.media:jersey-media-jaxb:2.34 (1 constraints: e01957ca)
 org.glassfish.jersey.media:jersey-media-json-jackson:2.34 (1 constraints: dd04fd30)
 org.glassfish.jersey.test-framework:jersey-test-framework-core:2.34 (1 constraints: 4b23d8ba)
 org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory:2.34 (1 constraints: cd0ef25f)
-org.hamcrest:hamcrest:2.2 (3 constraints: 21246acb)
+org.hamcrest:hamcrest:2.1 (2 constraints: 8512932d)
 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.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 (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)
+org.mockito:mockito-core:4.3.1 (15 constraints: 55ea7c61)
+org.objenesis:objenesis:3.2 (16 constraints: e8f8c884)
+org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)
 org.reactivestreams:reactive-streams:1.0.3 (1 constraints: 1f0c60f9)
 org.slf4j:jcl-over-slf4j:1.7.29 (1 constraints: bb0e9d5e)
 org.slf4j:jul-to-slf4j:1.7.29 (1 constraints: bb0e9d5e)

versions.props

@@ -5,8 +5,7 @@ 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.30.0
-com.palantir.conjure.java:conjure-lib = 6.30.0
+com.palantir.conjure.java:* = 6.30.0
 com.palantir.conjure.java.api:* = 2.23.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.dialogue:* = 3.48.0