diff --git a/conjure-java-jackson-optimizations/build.gradle b/conjure-java-jackson-optimizations/build.gradle index c1641e2e9..f7183190e 100644 --- a/conjure-java-jackson-optimizations/build.gradle +++ b/conjure-java-jackson-optimizations/build.gradle @@ -3,5 +3,5 @@ apply plugin: 'com.palantir.revapi' dependencies { api "com.fasterxml.jackson.core:jackson-databind" - implementation "com.fasterxml.jackson.module:jackson-module-afterburner" + implementation "com.fasterxml.jackson.module:jackson-module-blackbird" } diff --git a/conjure-java-jackson-optimizations/src/main/java/com/palantir/conjure/java/jackson/optimizations/ObjectMapperOptimizations.java b/conjure-java-jackson-optimizations/src/main/java/com/palantir/conjure/java/jackson/optimizations/ObjectMapperOptimizations.java index 21556e67e..ed2b1f9cc 100644 --- a/conjure-java-jackson-optimizations/src/main/java/com/palantir/conjure/java/jackson/optimizations/ObjectMapperOptimizations.java +++ b/conjure-java-jackson-optimizations/src/main/java/com/palantir/conjure/java/jackson/optimizations/ObjectMapperOptimizations.java @@ -16,7 +16,7 @@ package com.palantir.conjure.java.jackson.optimizations; -import com.fasterxml.jackson.module.afterburner.AfterburnerModule; +import com.fasterxml.jackson.module.blackbird.BlackbirdModule; import java.util.List; /** @@ -37,7 +37,7 @@ public final class ObjectMapperOptimizations { @SuppressWarnings("AfterburnerJavaIncompatibility") public static List createModules() { - return NO_OPTIMIZATIONS ? List.of() : List.of(new AfterburnerModule()); + return NO_OPTIMIZATIONS ? List.of() : List.of(new BlackbirdModule()); } private ObjectMapperOptimizations() {} @@ -47,7 +47,7 @@ private ObjectMapperOptimizations() {} * restricted by https://openjdk.java.net/jeps/396 and https://openjdk.java.net/jeps/403. */ private static boolean shouldDisableByDefault() { - return Runtime.version().feature() >= 16; + return false; } private static boolean readProperty(String property, boolean defaultValue) { diff --git a/versions.lock b/versions.lock index c00bca5e2..5a46b25a3 100644 --- a/versions.lock +++ b/versions.lock @@ -1,8 +1,8 @@ # Run ./gradlew --write-locks to regenerate this file com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13) com.fasterxml.jackson.core:jackson-annotations:2.14.2 (9 constraints: 3ab6ba5c) -com.fasterxml.jackson.core:jackson-core:2.14.2 (13 constraints: f7254e86) -com.fasterxml.jackson.core:jackson-databind:2.14.2 (20 constraints: c38ce552) +com.fasterxml.jackson.core:jackson-core:2.14.2 (13 constraints: f52446fa) +com.fasterxml.jackson.core:jackson-databind:2.14.2 (20 constraints: c18bcc8f) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2 (2 constraints: 2d20b805) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.2 (1 constraints: 3905393b) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.14.2 (1 constraints: 3905393b) @@ -11,7 +11,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-joda:2.14.2 (1 constraints: 3905 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2 (1 constraints: 3905393b) com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.14.2 (1 constraints: f51af942) com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.14.2 (1 constraints: 3905393b) -com.fasterxml.jackson.module:jackson-module-afterburner:2.14.2 (1 constraints: 3905393b) +com.fasterxml.jackson.module:jackson-module-blackbird:2.14.2 (1 constraints: 3905393b) com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.14.2 (2 constraints: e3308eb3) com.fasterxml.jackson.module:jackson-module-scala_2.12:2.14.2 (1 constraints: 3905393b) com.github.ben-manes.caffeine:caffeine:3.1.4 (3 constraints: e22362a2)