From 653d726aa86b5f28205d3f5ed0868b45ce3a754d Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Thu, 14 Dec 2023 12:31:18 -0800 Subject: [PATCH] Excavator: Update conjure plugins and dependencies (#2149) --- build.gradle | 4 ++++ versions.lock | 10 +++++----- versions.props | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 7cc75487e..861ea7a02 100644 --- a/build.gradle +++ b/build.gradle @@ -67,6 +67,10 @@ allprojects { details.useTarget group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.7.1' details.because "The error_prone_annotations dependency must be low to avoid forcing consumers to use newer releases" } + if (details.requested.group.startsWith('com.fasterxml.jackson') && details.requested.version == '2.16.0') { + details.useTarget group: details.requested.group, name: details.requested.name, version: '2.15.3' + details.because 'https://github.com/FasterXML/jackson-databind/pull/4230' + } } } } diff --git a/versions.lock b/versions.lock index 54c38ad46..b3514db27 100644 --- a/versions.lock +++ b/versions.lock @@ -22,9 +22,9 @@ com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0) com.palantir.common:streams:2.2.0 (1 constraints: 0605fb35) com.palantir.conjure:conjure-api-objects:4.36.0 (3 constraints: 9f27d521) com.palantir.conjure:conjure-generator-common:4.36.0 (2 constraints: 05146783) -com.palantir.conjure.java.api:errors:2.40.0 (6 constraints: c571f797) -com.palantir.conjure.java.api:service-config:2.40.0 (6 constraints: 1a6630c9) -com.palantir.conjure.java.api:ssl-config:2.40.0 (5 constraints: 9c4f5522) +com.palantir.conjure.java.api:errors:2.41.0 (6 constraints: c7712f9a) +com.palantir.conjure.java.api:service-config:2.41.0 (6 constraints: 1b6648ca) +com.palantir.conjure.java.api:ssl-config:2.41.0 (5 constraints: 9e4fcd23) com.palantir.conjure.java.runtime:client-config:8.0.0 (6 constraints: 6a6a9114) com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.0.0 (1 constraints: 4e1c3088) com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.0.0 (4 constraints: 4946bad2) @@ -105,7 +105,7 @@ com.helger:profiler:1.1.1 (1 constraints: e21053b8) com.netflix.feign:feign-core:8.18.0 (3 constraints: de3f76e0) com.netflix.feign:feign-jackson:8.18.0 (1 constraints: c718909e) com.palantir.conjure:conjure-core:4.36.0 (1 constraints: 3f05553b) -com.palantir.conjure.java.api:test-utils:2.40.0 (1 constraints: 38053b3b) +com.palantir.conjure.java.api:test-utils:2.41.0 (1 constraints: 39053e3b) com.palantir.conjure.java.runtime:conjure-java-annotations:8.0.0 (1 constraints: 8e18b485) com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:8.0.0 (1 constraints: 0a051336) com.palantir.conjure.java.runtime:conjure-java-jersey-server:8.0.0 (1 constraints: 0a051336) @@ -185,7 +185,7 @@ 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.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb) -org.mockito:mockito-core:5.8.0 (3 constraints: f52482fc) +org.mockito:mockito-core:5.8.0 (3 constraints: f624affc) org.mockito:mockito-junit-jupiter:5.8.0 (1 constraints: 0f051c36) org.objenesis:objenesis:3.3 (1 constraints: b20a14bd) org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249) diff --git a/versions.props b/versions.props index ffd756922..23c6c09c3 100644 --- a/versions.props +++ b/versions.props @@ -7,7 +7,7 @@ com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 32.1.3-jre com.google.testing.compile:compile-testing = 0.19 com.palantir.common:streams = 2.2.0 -com.palantir.conjure.java.api:* = 2.40.0 +com.palantir.conjure.java.api:* = 2.41.0 com.palantir.conjure.java.runtime:* = 8.0.0 com.palantir.conjure.verification:* = 0.19.0 com.palantir.conjure:* = 4.36.0