Skip to content

Commit 4d026b6

Browse files
bmscompsilvanli-confluent
authored andcommitted
KAFKA-15208: Upgrade Jackson dependencies to version 2.16.0 (apache#13662)
Reviewers: Mickael Maison <[email protected]>, Divij Vaidya <[email protected]>
1 parent 48bb1ac commit 4d026b6

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

LICENSE-binary

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,18 +208,18 @@ License Version 2.0:
208208
audience-annotations-0.13.0
209209
commons-cli-1.4
210210
commons-lang3-3.8.1
211-
jackson-annotations-2.13.5
212-
jackson-core-2.13.5
213-
jackson-databind-2.13.5
214-
jackson-dataformat-csv-2.13.5
215-
jackson-dataformat-yaml-2.13.5
216-
jackson-datatype-jdk8-2.13.5
217-
jackson-datatype-jsr310-2.13.5
218-
jackson-jaxrs-base-2.13.5
219-
jackson-jaxrs-json-provider-2.13.5
220-
jackson-module-jaxb-annotations-2.13.5
221-
jackson-module-scala_2.13-2.13.5
222-
jackson-module-scala_2.12-2.13.5
211+
jackson-annotations-2.16.0
212+
jackson-core-2.16.0
213+
jackson-databind-2.16.0
214+
jackson-dataformat-csv-2.16.0
215+
jackson-dataformat-yaml-2.16.0
216+
jackson-datatype-jdk8-2.16.0
217+
jackson-datatype-jsr310-2.16.0
218+
jackson-jaxrs-base-2.16.0
219+
jackson-jaxrs-json-provider-2.16.0
220+
jackson-module-jaxb-annotations-2.16.0
221+
jackson-module-scala_2.13-2.16.0
222+
jackson-module-scala_2.12-2.16.0
223223
jakarta.validation-api-2.0.2
224224
javassist-3.29.2-GA
225225
jetty-client-9.4.57.v20241219

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public class JsonConverter implements Converter, HeaderConverter {
141141
// names specified in the field
142142
private static final HashMap<String, LogicalTypeConverter> LOGICAL_CONVERTERS = new HashMap<>();
143143

144-
private static final JsonNodeFactory JSON_NODE_FACTORY = JsonNodeFactory.withExactBigDecimals(true);
144+
private static final JsonNodeFactory JSON_NODE_FACTORY = new JsonNodeFactory(true);
145145

146146
static {
147147
LOGICAL_CONVERTERS.put(Decimal.LOGICAL_NAME, new LogicalTypeConverter() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class JsonDeserializer implements Deserializer<JsonNode> {
3636
* Default constructor needed by Kafka
3737
*/
3838
public JsonDeserializer() {
39-
this(Collections.emptySet(), JsonNodeFactory.withExactBigDecimals(true));
39+
this(Collections.emptySet(), new JsonNodeFactory(true));
4040
}
4141

4242
/**

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.HashMap;
4949
import java.util.HashSet;
5050
import java.util.Map;
51+
import java.util.Objects;
5152
import java.util.Set;
5253
import java.util.TimeZone;
5354

@@ -64,7 +65,7 @@ public class JsonConverterTest {
6465

6566
private final ObjectMapper objectMapper = new ObjectMapper()
6667
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
67-
.setNodeFactory(JsonNodeFactory.withExactBigDecimals(true));
68+
.setNodeFactory(new JsonNodeFactory(true));
6869

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

@@ -860,7 +861,7 @@ public void testCacheSchemaToJsonConversion() {
860861

861862
@Test
862863
public void testJsonSchemaCacheSizeFromConfigFile() throws URISyntaxException, IOException {
863-
URL url = getClass().getResource("/connect-test.properties");
864+
URL url = Objects.requireNonNull(getClass().getResource("/connect-test.properties"));
864865
File propFile = new File(url.toURI());
865866
String workerPropsFile = propFile.getAbsolutePath();
866867
Map<String, String> workerProps = !workerPropsFile.isEmpty() ?

gradle/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ versions += [
6767
grgit: "4.1.1",
6868
httpclient: "4.5.14",
6969
easymock: "4.3",
70-
jackson: "2.13.5",
70+
jackson: "2.16.0",
7171
jacksonDatabind: "2.13.5",
7272
jacoco: "0.8.10",
7373
javassist: "3.29.2-GA",
@@ -147,7 +147,7 @@ libs += [
147147
commonsIo: "commons-io:commons-io:$versions.commonsIo",
148148
easymock: "org.easymock:easymock:$versions.easymock",
149149
jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
150-
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind",
150+
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
151151
jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson",
152152
jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson",
153153
jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson",

0 commit comments

Comments
 (0)