diff --git a/LICENSE-binary b/LICENSE-binary index 029efe6405086..d21e3169af764 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -208,16 +208,16 @@ License Version 2.0: audience-annotations-0.13.0 commons-cli-1.4 commons-lang3-3.8.1 -jackson-annotations-2.13.5 -jackson-core-2.13.5 -jackson-databind-2.13.5 -jackson-dataformat-csv-2.13.5 -jackson-datatype-jdk8-2.13.5 -jackson-jaxrs-base-2.13.5 -jackson-jaxrs-json-provider-2.13.5 -jackson-module-jaxb-annotations-2.13.5 -jackson-module-scala_2.13-2.13.5 -jackson-module-scala_2.12-2.13.5 +jackson-annotations-2.16.0 +jackson-core-2.16.0 +jackson-databind-2.16.0 +jackson-dataformat-csv-2.16.0 +jackson-datatype-jdk8-2.16.0 +jackson-jaxrs-base-2.16.0 +jackson-jaxrs-json-provider-2.16.0 +jackson-module-jaxb-annotations-2.16.0 +jackson-module-scala_2.13-2.16.0 +jackson-module-scala_2.12-2.16.0 jakarta.validation-api-2.0.2 javassist-3.29.2-GA jetty-client-9.4.57.v20241219 diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java index ae5a6989b2a1f..e7705ca458031 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java @@ -141,7 +141,7 @@ public class JsonConverter implements Converter, HeaderConverter { // names specified in the field private static final HashMap LOGICAL_CONVERTERS = new HashMap<>(); - private static final JsonNodeFactory JSON_NODE_FACTORY = JsonNodeFactory.withExactBigDecimals(true); + private static final JsonNodeFactory JSON_NODE_FACTORY = new JsonNodeFactory(true); static { LOGICAL_CONVERTERS.put(Decimal.LOGICAL_NAME, new LogicalTypeConverter() { diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java index 970091d47b35b..a6bd2461e5325 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java @@ -36,7 +36,7 @@ public class JsonDeserializer implements Deserializer { * Default constructor needed by Kafka */ public JsonDeserializer() { - this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true)); + this(Collections.emptySet(), new JsonNodeFactory(true)); } /** diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java index a2ef4970a4e7f..cd49d19661986 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java @@ -37,7 +37,7 @@ public class JsonSerializer implements Serializer { * Default constructor needed by Kafka */ public JsonSerializer() { - this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true)); + this(Collections.emptySet(), new JsonNodeFactory(true)); } /** diff --git a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java index d3d8999cc53f4..3e9216ff26320 100644 --- a/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java +++ b/connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java @@ -48,6 +48,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.TimeZone; @@ -64,7 +65,7 @@ public class JsonConverterTest { private final ObjectMapper objectMapper = new ObjectMapper() .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS) - .setNodeFactory(JsonNodeFactory.withExactBigDecimals(true)); + .setNodeFactory(new JsonNodeFactory(true)); private final JsonConverter converter = new JsonConverter(); @@ -860,7 +861,7 @@ public void testCacheSchemaToJsonConversion() { @Test public void testJsonSchemaCacheSizeFromConfigFile() throws URISyntaxException, IOException { - URL url = getClass().getResource("/connect-test.properties"); + URL url = Objects.requireNonNull(getClass().getResource("/connect-test.properties")); File propFile = new File(url.toURI()); String workerPropsFile = propFile.getAbsolutePath(); Map workerProps = !workerPropsFile.isEmpty() ? diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 88425f3275d7e..fbbbea200d89d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -69,8 +69,8 @@ versions += [ grgit: "4.1.1", httpclient: "4.5.14", easymock: "4.3", - jackson: "2.13.5", - jacksonDatabind: "2.13.5", + jackson: "2.16.0", + jacksonDatabind: "2.16.0", jacoco: "0.8.10", javassist: "3.29.2-GA", jetty: "9.4.57.v20241219",