From 6bc69848e272e31472384f479390d1023e69ce87 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 1 Aug 2023 00:07:27 +0000 Subject: [PATCH] Excavator: Update conjure plugins and dependencies --- versions.lock | 27 +++++++++++++++------------ versions.props | 4 ++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/versions.lock b/versions.lock index f6a265c22..939353558 100644 --- a/versions.lock +++ b/versions.lock @@ -1,7 +1,7 @@ # Run ./gradlew --write-locks to regenerate this file -com.fasterxml.jackson.core:jackson-annotations:2.15.2 (6 constraints: d46a0135) +com.fasterxml.jackson.core:jackson-annotations:2.15.2 (6 constraints: d86a6335) com.fasterxml.jackson.core:jackson-core:2.15.2 (11 constraints: aee8697a) -com.fasterxml.jackson.core:jackson-databind:2.15.2 (15 constraints: b6250991) +com.fasterxml.jackson.core:jackson-databind:2.15.2 (15 constraints: df25d89e) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 (1 constraints: 7e1c99a4) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 (1 constraints: 7e1c99a4) com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2 (1 constraints: 3c05403b) @@ -12,18 +12,20 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (1 constraints: 7e com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (1 constraints: 7e1c99a4) com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636) com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 980fcc86) -com.google.errorprone:error_prone_annotations:2.7.1 (2 constraints: f5201957) +com.google.errorprone:error_prone_annotations:2.18.0 (5 constraints: 3b4fb37e) com.google.guava:guava:21.0 (3 constraints: ef28dd83) -com.palantir.conjure.java:conjure-lib:5.67.0 (1 constraints: 44056a3b) -com.palantir.conjure.java.api:errors:2.19.0 (1 constraints: 2410a5a9) +com.palantir.conjure.java:conjure-lib:7.14.0 (1 constraints: 3e05593b) +com.palantir.conjure.java.api:errors:2.35.0 (1 constraints: 2210a1a9) com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.16.0 (1 constraints: 3f05593b) -com.palantir.ri:resource-identifier:1.3.0 (1 constraints: ec0f6e99) -com.palantir.safe-logging:preconditions:1.16.0 (4 constraints: 644ae273) -com.palantir.safe-logging:safe-logging:1.16.0 (2 constraints: f920db6c) -com.palantir.tokens:auth-tokens:3.9.0 (1 constraints: f40f8a99) +com.palantir.ri:resource-identifier:2.6.0 (1 constraints: f00f7c99) +com.palantir.safe-logging:logger:3.4.0 (1 constraints: d60d8437) +com.palantir.safe-logging:logger-slf4j:3.4.0 (1 constraints: 020e5f42) +com.palantir.safe-logging:logger-spi:3.4.0 (2 constraints: 131e037b) +com.palantir.safe-logging:preconditions:3.5.0 (4 constraints: d949b2c6) +com.palantir.safe-logging:safe-logging:3.5.0 (5 constraints: 794dbb6a) +com.palantir.tokens:auth-tokens:3.18.0 (1 constraints: 2410a8a9) commons-io:commons-io:2.6 (1 constraints: ac04232c) -javax.annotation:javax.annotation-api:1.3.2 (2 constraints: f814bfb6) -javax.ws.rs:javax.ws.rs-api:2.1.1 (1 constraints: f10f7399) +javax.annotation:javax.annotation-api:1.3.2 (1 constraints: 0805fb35) joda-time:joda-time:2.10.8 (2 constraints: 651b4e70) junit:junit:4.13 (4 constraints: 362657b7) one.util:streamex:0.7.2 (1 constraints: 0b050236) @@ -33,10 +35,11 @@ org.awaitility:awaitility:4.0.2 (1 constraints: 08050136) org.hamcrest:hamcrest:2.1 (3 constraints: 851b6e77) org.hamcrest:hamcrest-core:2.1 (2 constraints: 720ac8bf) org.immutables:value:2.8.8 (1 constraints: 14051536) +org.jetbrains:annotations:24.0.1 (2 constraints: fc20bc6d) org.junit.jupiter:junit-jupiter-api:5.5.0 (4 constraints: 723497b4) org.junit.platform:junit-platform-commons:1.5.0 (2 constraints: d320004a) org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) -org.slf4j:slf4j-api:1.7.36 (6 constraints: 4e45fdd3) +org.slf4j:slf4j-api:1.7.36 (7 constraints: 9a55ecab) org.yaml:snakeyaml:2.0 (1 constraints: 3a178910) [Test dependencies] diff --git a/versions.props b/versions.props index d9ad66cce..c09a98a4c 100644 --- a/versions.props +++ b/versions.props @@ -12,8 +12,8 @@ org.mockito:* = 3.9.0 org.slf4j:* = 1.7.36 one.util:streamex = 0.7.2 org.assertj:assertj-core = 3.14.0 -com.palantir.conjure:* = 4.16.1 -com.palantir.conjure.java:* = 5.67.0 +com.palantir.conjure:* = 4.38.0 +com.palantir.conjure.java:* = 7.14.0 com.fasterxml.jackson.dataformat:* = 2.15.2 one.util:streamex = 0.7.2 com.github.tomakehurst:wiremock = 2.24.0