Skip to content

Migrate to Jackson 3.1.5 #3872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staktrace wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to Jackson 3.1.5 #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ googleAuth = "1.39.1"
googleHttp = "2.0.0"
guava = "33.5.0-jre"
hoplite = "2.7.5"
jackson = "2.21.2"
jackson = "3.1.5"
jooq = "3.19.29"
junit = "5.14.2"
kotest = "6.0.7"
Expand Down Expand Up @@ -121,12 +121,11 @@ hopliteYaml = { module = "com.sksamuel.hoplite:hoplite-yaml", version.ref = "hop
hsqldb = { module = "org.hsqldb:hsqldb", version = "2.7.4" }
jCommander = { module = "com.beust:jcommander", version = "1.82" }
jacksonAnnotations = { module = "com.fasterxml.jackson.core:jackson-annotations" }
jacksonBom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" }
jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core" }
jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind" }
jacksonDataformatYaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" }
jacksonJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }
jacksonKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" }
jacksonBom = { module = "tools.jackson:jackson-bom", version.ref = "jackson" }
jacksonCore = { module = "tools.jackson.core:jackson-core" }
jacksonDatabind = { module = "tools.jackson.core:jackson-databind" }
jacksonDataformatYaml = { module = "tools.jackson.dataformat:jackson-dataformat-yaml" }
jacksonKotlin = { module = "tools.jackson.module:jackson-module-kotlin" }
jakartaInject = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" }
javaxAnnotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" }
javaxInject = { module = "javax.inject:javax.inject", version = "1" }
Expand Down
33 changes: 17 additions & 16 deletions misk-config/api/misk-config.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ public final class misk/config/MiskConfig {
public static final field INSTANCE Lmisk/config/MiskConfig;
public static final fun filesInDir (Ljava/lang/String;Ljava/io/FilenameFilter;)Ljava/util/List;
public static synthetic fun filesInDir$default (Ljava/lang/String;Ljava/io/FilenameFilter;ILjava/lang/Object;)Ljava/util/List;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;Z)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZLcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lmisk/resources/ResourceLoader;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ILjava/lang/Object;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZILjava/lang/Object;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lcom/fasterxml/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZLcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;ILjava/lang/Object;)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;Z)Lmisk/config/Config;
public static final fun load (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZLtools/jackson/databind/deser/ValueDeserializerModifier;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lmisk/resources/ResourceLoader;ILjava/lang/Object;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ILjava/lang/Object;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZILjava/lang/Object;)Lmisk/config/Config;
public static synthetic fun load$default (Ljava/lang/Class;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Ltools/jackson/databind/JsonNode;Lmisk/resources/ResourceLoader;ZLtools/jackson/databind/deser/ValueDeserializerModifier;ILjava/lang/Object;)Lmisk/config/Config;
public final fun loadConfigYamlMap (Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lmisk/resources/ResourceLoader;)Ljava/util/Map;
public static synthetic fun loadConfigYamlMap$default (Lmisk/config/MiskConfig;Ljava/lang/String;Lwisp/deployment/Deployment;Ljava/util/List;Lmisk/resources/ResourceLoader;ILjava/lang/Object;)Ljava/util/Map;
public final fun toRedactedYaml (Lmisk/config/Config;Lmisk/resources/ResourceLoader;)Ljava/lang/String;
}

public final class misk/config/MiskConfig$DeserializerModifierModule : com/fasterxml/jackson/databind/module/SimpleModule {
public fun <init> (Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;)V
public final fun getDeserializerModifier ()Lcom/fasterxml/jackson/databind/deser/BeanDeserializerModifier;
public fun setupModule (Lcom/fasterxml/jackson/databind/Module$SetupContext;)V
public final class misk/config/MiskConfig$DeserializerModifierModule : tools/jackson/databind/module/SimpleModule {
public fun <init> (Ltools/jackson/databind/deser/ValueDeserializerModifier;)V
public final fun getDeserializerModifier ()Ltools/jackson/databind/deser/ValueDeserializerModifier;
public fun setupModule (Ltools/jackson/databind/JacksonModule$SetupContext;)V
}

public final class misk/config/MiskConfig$RealSecret : misk/config/Secret {
Expand All @@ -47,16 +47,17 @@ public final class misk/config/MiskConfig$RealSecret : misk/config/Secret {
public fun toString ()Ljava/lang/String;
}

public final class misk/config/MiskConfig$RedactSecretJacksonModule : com/fasterxml/jackson/databind/module/SimpleModule {
public final class misk/config/MiskConfig$RedactSecretJacksonModule : tools/jackson/databind/module/SimpleModule {
public fun <init> ()V
public fun setupModule (Lcom/fasterxml/jackson/databind/Module$SetupContext;)V
public fun setupModule (Ltools/jackson/databind/JacksonModule$SetupContext;)V
}

public final class misk/config/MiskConfig$SecretJacksonModule : com/fasterxml/jackson/databind/module/SimpleModule {
public fun <init> (Lmisk/resources/ResourceLoader;Lcom/fasterxml/jackson/databind/ObjectMapper;)V
public final fun getMapper ()Lcom/fasterxml/jackson/databind/ObjectMapper;
public final class misk/config/MiskConfig$SecretJacksonModule : tools/jackson/databind/module/SimpleModule {
public fun <init> (Lmisk/resources/ResourceLoader;Lkotlin/jvm/functions/Function0;)V
public fun <init> (Lmisk/resources/ResourceLoader;Ltools/jackson/databind/ObjectMapper;)V
public final fun getMapper ()Ltools/jackson/databind/ObjectMapper;
public final fun getResourceLoader ()Lmisk/resources/ResourceLoader;
public fun setupModule (Lcom/fasterxml/jackson/databind/Module$SetupContext;)V
public fun setupModule (Ltools/jackson/databind/JacksonModule$SetupContext;)V
}

public abstract interface annotation class misk/config/Redact : java/lang/annotation/Annotation {
Expand Down
1 change: 0 additions & 1 deletion misk-config/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dependencies {
implementation(libs.guava)
implementation(libs.jacksonCore)
implementation(libs.jacksonDataformatYaml)
implementation(libs.jacksonJsr310)
implementation(libs.jacksonKotlin)
implementation(libs.loggingApi)
implementation(libs.okio)
Expand Down
Loading