Skip to content

Commit 05014ba

Browse files
authored
KAFKA-15208: Upgrade Jackson dependencies to version 2.16.0 (#13662)
Reviewers: Mickael Maison <[email protected]>, Divij Vaidya <[email protected]>
1 parent 5e37ec8 commit 05014ba

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

LICENSE-binary

+10-10
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@ commons-lang3-3.8.1
216216
commons-logging-1.2
217217
commons-validator-1.7
218218
error_prone_annotations-2.10.0
219-
jackson-annotations-2.13.5
220-
jackson-core-2.13.5
221-
jackson-databind-2.13.5
222-
jackson-dataformat-csv-2.13.5
223-
jackson-datatype-jdk8-2.13.5
224-
jackson-jaxrs-base-2.13.5
225-
jackson-jaxrs-json-provider-2.13.5
226-
jackson-module-jaxb-annotations-2.13.5
227-
jackson-module-scala_2.13-2.13.5
228-
jackson-module-scala_2.12-2.13.5
219+
jackson-annotations-2.16.0
220+
jackson-core-2.16.0
221+
jackson-databind-2.16.0
222+
jackson-dataformat-csv-2.16.0
223+
jackson-datatype-jdk8-2.16.0
224+
jackson-jaxrs-base-2.16.0
225+
jackson-jaxrs-json-provider-2.16.0
226+
jackson-module-jaxb-annotations-2.16.0
227+
jackson-module-scala_2.13-2.16.0
228+
jackson-module-scala_2.12-2.16.0
229229
jakarta.validation-api-2.0.2
230230
javassist-3.29.2-GA
231231
jetty-client-9.4.53.v20231009

connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned {
143143
// names specified in the field
144144
private static final HashMap<String, LogicalTypeConverter> LOGICAL_CONVERTERS = new HashMap<>();
145145

146-
private static final JsonNodeFactory JSON_NODE_FACTORY = JsonNodeFactory.withExactBigDecimals(true);
146+
private static final JsonNodeFactory JSON_NODE_FACTORY = new JsonNodeFactory(true);
147147

148148
static {
149149
LOGICAL_CONVERTERS.put(Decimal.LOGICAL_NAME, new LogicalTypeConverter() {

connect/json/src/main/java/org/apache/kafka/connect/json/JsonDeserializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class JsonDeserializer implements Deserializer<JsonNode> {
3838
* Default constructor needed by Kafka
3939
*/
4040
public JsonDeserializer() {
41-
this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true));
41+
this(Collections.emptySet(), new JsonNodeFactory(true));
4242
}
4343

4444
/**

connect/json/src/main/java/org/apache/kafka/connect/json/JsonSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class JsonSerializer implements Serializer<JsonNode> {
3737
* Default constructor needed by Kafka
3838
*/
3939
public JsonSerializer() {
40-
this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true));
40+
this(Collections.emptySet(), new JsonNodeFactory(true));
4141
}
4242

4343
/**

connect/json/src/test/java/org/apache/kafka/connect/json/JsonConverterTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import java.util.HashMap;
5050
import java.util.HashSet;
5151
import java.util.Map;
52+
import java.util.Objects;
5253
import java.util.Set;
5354
import java.util.TimeZone;
5455

@@ -65,7 +66,7 @@ public class JsonConverterTest {
6566

6667
private final ObjectMapper objectMapper = new ObjectMapper()
6768
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
68-
.setNodeFactory(JsonNodeFactory.withExactBigDecimals(true));
69+
.setNodeFactory(new JsonNodeFactory(true));
6970

7071
private final JsonConverter converter = new JsonConverter();
7172

@@ -869,7 +870,7 @@ public void testCacheSchemaToJsonConversion() {
869870

870871
@Test
871872
public void testJsonSchemaCacheSizeFromConfigFile() throws URISyntaxException, IOException {
872-
URL url = getClass().getResource("/connect-test.properties");
873+
URL url = Objects.requireNonNull(getClass().getResource("/connect-test.properties"));
873874
File propFile = new File(url.toURI());
874875
String workerPropsFile = propFile.getAbsolutePath();
875876
Map<String, String> workerProps = !workerPropsFile.isEmpty() ?

gradle/dependencies.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ versions += [
103103
gradle: "8.5",
104104
grgit: "4.1.1",
105105
httpclient: "4.5.14",
106-
jackson: "2.13.5",
107-
jacksonDatabind: "2.13.5",
106+
jackson: "2.16.0",
108107
jacoco: "0.8.10",
109108
javassist: "3.29.2-GA",
110109
jetty: "9.4.53.v20231009",
@@ -186,7 +185,7 @@ libs += [
186185
commonsValidator: "commons-validator:commons-validator:$versions.commonsValidator",
187186
easymock: "org.easymock:easymock:$easymockVersion",
188187
jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
189-
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind",
188+
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
190189
jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson",
191190
jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson",
192191
jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson",

0 commit comments

Comments
 (0)