diff --git a/build.gradle b/build.gradle index 3b7cb7810..1a2a10b28 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.17.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.6.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.56.0' - classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.7.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.71.0' + classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.8.0' } } diff --git a/extras/jackson-support/build.gradle b/extras/jackson-support/build.gradle index 5dbfb10c3..4e9c07d84 100644 --- a/extras/jackson-support/build.gradle +++ b/extras/jackson-support/build.gradle @@ -3,7 +3,6 @@ dependencies { api "com.fasterxml.jackson.core:jackson-databind" api "com.fasterxml.jackson.datatype:jackson-datatype-guava" - api "com.fasterxml.jackson.module:jackson-module-afterburner" api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor" diff --git a/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java b/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java index 70301fc22..965caae71 100644 --- a/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java +++ b/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.module.afterburner.AfterburnerModule; public final class ObjectMappers { @@ -101,7 +100,6 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) { return mapper.registerModule(new GuavaModule()) .registerModule(new ShimJdk7Module()) .registerModule(new Jdk8Module().configureAbsentsAsNulls(true)) - .registerModule(new AfterburnerModule()) .registerModule(new JavaTimeModule()) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS) diff --git a/versions.lock b/versions.lock index 833b53851..b1d9146eb 100644 --- a/versions.lock +++ b/versions.lock @@ -1,55 +1,37 @@ # Run ./gradlew --write-locks to regenerate this file com.fasterxml.jackson:jackson-bom:2.12.3 (8 constraints: 18aa4413) com.fasterxml.jackson.core:jackson-annotations:2.12.3 (4 constraints: b3452532) -com.fasterxml.jackson.core:jackson-core:2.12.3 (9 constraints: 5db9e56c) -com.fasterxml.jackson.core:jackson-databind:2.12.3 (9 constraints: 0fac1629) +com.fasterxml.jackson.core:jackson-core:2.12.3 (8 constraints: dda1dcdf) +com.fasterxml.jackson.core:jackson-databind:2.12.3 (8 constraints: 8f9408fd) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: f1137d82) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (2 constraints: f1137d82) com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: f1137d82) com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (2 constraints: f1137d82) -com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (2 constraints: f1137d82) -com.github.ben-manes.caffeine:caffeine:2.8.8 (2 constraints: f4240dda) -com.github.kevinstern:software-and-algorithms:1.0 (2 constraints: 16246655) -com.google.auto:auto-common:1.2 (2 constraints: 8b227dcb) -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 (12 constraints: 97b50090) -com.google.errorprone:error_prone_annotation:2.10.0 (3 constraints: 553624ef) -com.google.errorprone:error_prone_annotations:2.10.0 (12 constraints: 42c1ef35) -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 (3 constraints: db291249) -com.google.guava:guava:31.0.1-jre (6 constraints: ed6db8cc) -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (3 constraints: d6525735) -com.google.j2objc:j2objc-annotations:1.3 (3 constraints: c728bf7c) -com.google.protobuf:protobuf-java:3.4.0 (2 constraints: f022e811) -com.palantir.baseline:baseline-error-prone:4.56.0 (1 constraints: 41055d3b) +com.google.code.findbugs:jsr305:3.0.2 (9 constraints: d17f96cd) +com.google.errorprone:error_prone_annotations:2.7.1 (8 constraints: f37acfb9) +com.google.guava:failureaccess:1.0.1 (2 constraints: e417667f) +com.google.guava:guava:31.0.1-jre (2 constraints: af25f547) +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 3633ed46) +com.google.j2objc:j2objc-annotations:1.3 (2 constraints: 2c17362e) com.palantir.safe-logging:logger:1.21.0 (2 constraints: 37133456) com.palantir.safe-logging:logger-slf4j:1.21.0 (2 constraints: 301c76db) com.palantir.safe-logging:logger-spi:1.21.0 (3 constraints: 6e2cd9d4) -com.palantir.safe-logging:preconditions:1.21.0 (4 constraints: b7397f48) -com.palantir.safe-logging:safe-logging:1.21.0 (7 constraints: bb6823c3) +com.palantir.safe-logging:preconditions:1.21.0 (3 constraints: 8f27c33a) +com.palantir.safe-logging:safe-logging:1.21.0 (6 constraints: 935669fd) com.palantir.tokens:auth-tokens:3.11.0 (1 constraints: 3705383b) -io.github.java-diff-utils:java-diff-utils:4.0 (2 constraints: 1c240b56) -net.bytebuddy:byte-buddy:1.12.7 (2 constraints: 6f1d3353) -net.bytebuddy:byte-buddy-agent:1.12.7 (2 constraints: 6f1d3353) -org.assertj:assertj-core:3.22.0 (3 constraints: bf2bc004) -org.checkerframework:checker-qual:3.12.0 (4 constraints: 773a1325) -org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: 6736f3f2) -org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (2 constraints: b1299390) -org.immutables:value:2.8.8 (3 constraints: fb24f005) -org.mockito:mockito-core:4.3.1 (3 constraints: b724cede) -org.mockito:mockito-errorprone:4.1.0 (1 constraints: fb1102f9) -org.objenesis:objenesis:3.2 (2 constraints: 4d1c5eb4) -org.pcollections:pcollections:2.1.2 (2 constraints: ec226a11) -org.slf4j:slf4j-api:1.7.33 (8 constraints: 6a841851) +net.bytebuddy:byte-buddy:1.12.7 (1 constraints: 450b3fde) +net.bytebuddy:byte-buddy-agent:1.12.7 (1 constraints: 450b3fde) +org.assertj:assertj-core:3.22.0 (2 constraints: 941934de) +org.checkerframework:checker-qual:3.12.0 (2 constraints: 4c183eaa) +org.immutables:value:2.8.8 (2 constraints: f412af38) +org.mockito:mockito-core:4.3.1 (1 constraints: 0a050936) +org.objenesis:objenesis:3.2 (1 constraints: b10a13bd) +org.slf4j:slf4j-api:1.7.33 (7 constraints: 3872c0bd) [Test dependencies] com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (2 constraints: f1137d82) com.palantir.safe-logging:preconditions-assertj:1.21.0 (1 constraints: 3605303b) -org.apache.commons:commons-lang3:3.12.0 (2 constraints: 6317b455) +org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b) org.junit:junit-bom:5.8.2 (6 constraints: 52620bff) org.junit.jupiter:junit-jupiter:5.8.2 (2 constraints: 260e7a59) org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 8b385c34)