From 6fac0d113d9787a4cbf15fb2b490eb541f9ca96b Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Wed, 3 May 2023 00:25:38 +0200 Subject: [PATCH 01/11] upgrade jackson version to 2.15.0 --- gradle/dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index b2836aff16d2b..bef7e2a82d2b9 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -103,7 +103,7 @@ versions += [ gradle: "8.5", grgit: "4.1.1", httpclient: "4.5.14", - jackson: "2.13.5", + jackson: "2.15.0", jacksonDatabind: "2.13.5", jacoco: "0.8.10", javassist: "3.29.2-GA", @@ -186,7 +186,7 @@ libs += [ commonsValidator: "commons-validator:commons-validator:$versions.commonsValidator", easymock: "org.easymock:easymock:$easymockVersion", jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson", - jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind", + jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson", jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson", jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson", jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson", From 982aa099f9ef4f9c6282428c48f744da7dc899b2 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Wed, 3 May 2023 00:28:25 +0200 Subject: [PATCH 02/11] remove deprecated call of JsonNodeFactory.withExactBigDecimals --- .../org/apache/kafka/connect/json/JsonConverter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 105a805b49c3f..46c6ceff4f30f 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 @@ -59,7 +59,7 @@ /** * Implementation of {@link Converter} and {@link HeaderConverter} that uses JSON to store schemas and objects. By - * default this converter will serialize Connect keys, values, and headers with schemas, although this can be disabled with + * default, this converter will serialize Connect keys, values, and headers with schemas, although this can be disabled with * the {@link JsonConverterConfig#SCHEMAS_ENABLE_CONFIG schemas.enable} configuration option. *

* This implementation currently does nothing with the topic names or header keys. @@ -127,7 +127,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned { throw new DataException("Structs should be encoded as JSON objects, but found " + value.getNodeType()); // We only have ISchema here but need Schema, so we need to materialize the actual schema. Using ISchema - // avoids having to materialize the schema for non-Struct types but it cannot be avoided for Structs since + // avoids having to materialize the schema for non-Struct types, but it cannot be avoided for Structs since // they require a schema to be provided at construction. However, the schema is only a SchemaBuilder during // translation of schemas to JSON; during the more common translation of data to JSON, the call to schema.schema() // just returns the schema Object and has no overhead. @@ -143,7 +143,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned { // 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() { @@ -338,7 +338,7 @@ public SchemaAndValue toConnectData(String topic, byte[] value) { " If you are trying to deserialize plain JSON data, set schemas.enable=false in your converter configuration."); // The deserialized data should either be an envelope object containing the schema and the payload or the schema - // was stripped during serialization and we need to fill in an all-encompassing schema. + // was stripped during serialization, and we need to fill in an all-encompassing schema. if (!config.schemasEnabled()) { ObjectNode envelope = JSON_NODE_FACTORY.objectNode(); envelope.set(JsonSchema.ENVELOPE_SCHEMA_FIELD_NAME, null); @@ -569,7 +569,7 @@ private JsonNode convertToJsonWithoutEnvelope(Schema schema, Object value) { */ private JsonNode convertToJson(Schema schema, Object value) { if (value == null) { - if (schema == null) // Any schema is valid and we don't have a default, so treat this as an optional schema + if (schema == null) // Any schema is valid, and we don't have a default, so treat this as an optional schema return null; if (schema.defaultValue() != null && config.replaceNullWithDefault()) return convertToJson(schema, schema.defaultValue()); From ebc9f4e982233337886fe79b07318e44b7cb50b0 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Wed, 3 May 2023 00:29:37 +0200 Subject: [PATCH 03/11] remove deprected call and fix typos in comments documentation --- .../kafka/connect/json/JsonDeserializer.java | 2 +- .../kafka/connect/json/JsonSerializer.java | 2 +- .../kafka/connect/json/JsonConverterTest.java | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) 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 90f81f1523791..66b9a27263040 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 @@ -38,7 +38,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 f6e9341e23162..c0c69441c9acf 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 @@ -49,6 +49,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; @@ -65,7 +66,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(); @@ -207,7 +208,7 @@ public void nullToConnect() { */ @Test public void emptyBytesToConnect() { - // This characterizes the messages with empty data when Json schemas is disabled + // This characterizes the messages with empty data when Json schemas are disabled Map props = Collections.singletonMap("schemas.enable", false); converter.configure(props, true); SchemaAndValue converted = converter.toConnectData(TOPIC, "".getBytes()); @@ -219,7 +220,7 @@ public void emptyBytesToConnect() { */ @Test public void schemalessWithEmptyFieldValueToConnect() { - // This characterizes the messages with empty data when Json schemas is disabled + // This characterizes the messages with empty data when Json schemas are disabled Map props = Collections.singletonMap("schemas.enable", false); converter.configure(props, true); String input = "{ \"a\": \"\", \"b\": null}"; @@ -501,7 +502,7 @@ public void testCacheSchemaToConnectConversion() { converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": true }, \"payload\": true }".getBytes()); assertEquals(2, converter.sizeOfToConnectSchemaCache()); - // Even equivalent, but different JSON encoding of schema, should get different cache entry + // Even equivalent, but different JSON encoding of schema should get different cache entry converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": false }, \"payload\": true }".getBytes()); assertEquals(3, converter.sizeOfToConnectSchemaCache()); } @@ -787,7 +788,7 @@ public void nullSchemaAndMapToJson() { @Test public void nullSchemaAndMapNonStringKeysToJson() { - // This still needs to do conversion of data, null schema means "anything goes". Make sure we mix and match + // This still needs to do conversion of data; null schema means "anything goes". Make sure we mix and match // types to verify conversion still works. Map input = new HashMap<>(); input.put("string", 12); @@ -854,7 +855,7 @@ public void noSchemaToJson() { public void testCacheSchemaToJsonConversion() { assertEquals(0, converter.sizeOfFromConnectSchemaCache()); - // Repeated conversion of the same schema, even if the schema object is different should return the same Java + // Repeated conversion of the same schema, even if the schema object is different, should return the same Java // object converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true); assertEquals(1, converter.sizeOfFromConnectSchemaCache()); @@ -862,14 +863,14 @@ public void testCacheSchemaToJsonConversion() { converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true); assertEquals(1, converter.sizeOfFromConnectSchemaCache()); - // Validate that a similar, but different schema correctly returns a different schema. + // Validate that similar, but different schema correctly returns a different schema. converter.fromConnectData(TOPIC, SchemaBuilder.bool().optional().build(), true); assertEquals(2, converter.sizeOfFromConnectSchemaCache()); } @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() ? From 2ac684fd931e1743d39d760da9b2fbc5b832c469 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Sun, 16 Jul 2023 11:08:23 +0200 Subject: [PATCH 04/11] raise version of jackson to latest stable one 1.15.2 --- gradle/dependencies.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index bef7e2a82d2b9..3701bac857902 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -103,8 +103,7 @@ versions += [ gradle: "8.5", grgit: "4.1.1", httpclient: "4.5.14", - jackson: "2.15.0", - jacksonDatabind: "2.13.5", + jackson: "2.15.2", jacoco: "0.8.10", javassist: "3.29.2-GA", jetty: "9.4.53.v20231009", From 9410a6a83b055689e8b4d5217f2f813e05d994fb Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Sun, 16 Jul 2023 12:52:19 +0200 Subject: [PATCH 05/11] update the license file --- LICENSE-binary | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index f669a86fed094..e880d002a2016 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,16 +216,16 @@ commons-lang3-3.8.1 commons-logging-1.2 commons-validator-1.7 error_prone_annotations-2.10.0 -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.15.2 +jackson-core-2.15.2 +jackson-databind-2.15.2 +jackson-dataformat-csv-2.15.2 +jackson-datatype-jdk8-2.15.2 +jackson-jaxrs-base-2.15.2 +jackson-jaxrs-json-provider-2.15.2 +jackson-module-jaxb-annotations-2.15.2 +jackson-module-scala_2.13-2.15.2 +jackson-module-scala_2.12-2.15.2 jakarta.validation-api-2.0.2 javassist-3.29.2-GA jetty-client-9.4.53.v20231009 From 562e007df5a88377f2a9fc8d0afabfe647abb4a0 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Fri, 13 Oct 2023 23:10:58 +0200 Subject: [PATCH 06/11] update version of jackson databind to 2.15.3 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 3701bac857902..c38864db4467b 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -103,7 +103,7 @@ versions += [ gradle: "8.5", grgit: "4.1.1", httpclient: "4.5.14", - jackson: "2.15.2", + jackson: "2.15.3", jacoco: "0.8.10", javassist: "3.29.2-GA", jetty: "9.4.53.v20231009", From aaeed4ff1fcf3c286a9990d3f7605fdc1507d5dc Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Fri, 13 Oct 2023 23:25:43 +0200 Subject: [PATCH 07/11] update licence file --- LICENSE-binary | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index e880d002a2016..f3da0b3643a29 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,16 +216,16 @@ commons-lang3-3.8.1 commons-logging-1.2 commons-validator-1.7 error_prone_annotations-2.10.0 -jackson-annotations-2.15.2 -jackson-core-2.15.2 -jackson-databind-2.15.2 -jackson-dataformat-csv-2.15.2 -jackson-datatype-jdk8-2.15.2 -jackson-jaxrs-base-2.15.2 -jackson-jaxrs-json-provider-2.15.2 -jackson-module-jaxb-annotations-2.15.2 -jackson-module-scala_2.13-2.15.2 -jackson-module-scala_2.12-2.15.2 +jackson-annotations-2.15.3 +jackson-core-2.15.3 +jackson-databind-2.15.3 +jackson-dataformat-csv-2.15.3 +jackson-datatype-jdk8-2.15.3 +jackson-jaxrs-base-2.15.3 +jackson-jaxrs-json-provider-2.15.3 +jackson-module-jaxb-annotations-2.15.3 +jackson-module-scala_2.13-2.15.3 +jackson-module-scala_2.12-2.15.3 jakarta.validation-api-2.0.2 javassist-3.29.2-GA jetty-client-9.4.53.v20231009 From cad22f64e41adf268b12cc46dea1a1a26d50d095 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Thu, 7 Dec 2023 00:49:44 +0100 Subject: [PATCH 08/11] restore fixes related to javadoc --- .../java/org/apache/kafka/connect/json/JsonConverter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 46c6ceff4f30f..f9a00ce925772 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 @@ -59,7 +59,7 @@ /** * Implementation of {@link Converter} and {@link HeaderConverter} that uses JSON to store schemas and objects. By - * default, this converter will serialize Connect keys, values, and headers with schemas, although this can be disabled with + * default this converter will serialize Connect keys, values, and headers with schemas, although this can be disabled with * the {@link JsonConverterConfig#SCHEMAS_ENABLE_CONFIG schemas.enable} configuration option. *

* This implementation currently does nothing with the topic names or header keys. @@ -127,7 +127,7 @@ public class JsonConverter implements Converter, HeaderConverter, Versioned { throw new DataException("Structs should be encoded as JSON objects, but found " + value.getNodeType()); // We only have ISchema here but need Schema, so we need to materialize the actual schema. Using ISchema - // avoids having to materialize the schema for non-Struct types, but it cannot be avoided for Structs since + // avoids having to materialize the schema for non-Struct types but it cannot be avoided for Structs since // they require a schema to be provided at construction. However, the schema is only a SchemaBuilder during // translation of schemas to JSON; during the more common translation of data to JSON, the call to schema.schema() // just returns the schema Object and has no overhead. @@ -338,7 +338,7 @@ public SchemaAndValue toConnectData(String topic, byte[] value) { " If you are trying to deserialize plain JSON data, set schemas.enable=false in your converter configuration."); // The deserialized data should either be an envelope object containing the schema and the payload or the schema - // was stripped during serialization, and we need to fill in an all-encompassing schema. + // was stripped during serialization and we need to fill in an all-encompassing schema. if (!config.schemasEnabled()) { ObjectNode envelope = JSON_NODE_FACTORY.objectNode(); envelope.set(JsonSchema.ENVELOPE_SCHEMA_FIELD_NAME, null); @@ -569,7 +569,7 @@ private JsonNode convertToJsonWithoutEnvelope(Schema schema, Object value) { */ private JsonNode convertToJson(Schema schema, Object value) { if (value == null) { - if (schema == null) // Any schema is valid, and we don't have a default, so treat this as an optional schema + if (schema == null) // Any schema is valid and we don't have a default, so treat this as an optional schema return null; if (schema.defaultValue() != null && config.replaceNullWithDefault()) return convertToJson(schema, schema.defaultValue()); From e5df1662c3cb55bc0f55365cf43e137e9c920ffa Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Thu, 7 Dec 2023 00:56:32 +0100 Subject: [PATCH 09/11] keep a clean pull request related to jackson upgrade --- .../apache/kafka/connect/json/JsonConverterTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 c0c69441c9acf..158a41e8caed5 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 @@ -208,7 +208,7 @@ public void nullToConnect() { */ @Test public void emptyBytesToConnect() { - // This characterizes the messages with empty data when Json schemas are disabled + // This characterizes the messages with empty data when Json schemas is disabled Map props = Collections.singletonMap("schemas.enable", false); converter.configure(props, true); SchemaAndValue converted = converter.toConnectData(TOPIC, "".getBytes()); @@ -220,7 +220,7 @@ public void emptyBytesToConnect() { */ @Test public void schemalessWithEmptyFieldValueToConnect() { - // This characterizes the messages with empty data when Json schemas are disabled + // This characterizes the messages with empty data when Json schemas is disabled Map props = Collections.singletonMap("schemas.enable", false); converter.configure(props, true); String input = "{ \"a\": \"\", \"b\": null}"; @@ -502,7 +502,7 @@ public void testCacheSchemaToConnectConversion() { converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": true }, \"payload\": true }".getBytes()); assertEquals(2, converter.sizeOfToConnectSchemaCache()); - // Even equivalent, but different JSON encoding of schema should get different cache entry + // Even equivalent, but different JSON encoding of schema, should get different cache entry converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": false }, \"payload\": true }".getBytes()); assertEquals(3, converter.sizeOfToConnectSchemaCache()); } @@ -788,7 +788,7 @@ public void nullSchemaAndMapToJson() { @Test public void nullSchemaAndMapNonStringKeysToJson() { - // This still needs to do conversion of data; null schema means "anything goes". Make sure we mix and match + // This still needs to do conversion of data null schema means "anything goes". Make sure we mix and match // types to verify conversion still works. Map input = new HashMap<>(); input.put("string", 12); @@ -855,7 +855,7 @@ public void noSchemaToJson() { public void testCacheSchemaToJsonConversion() { assertEquals(0, converter.sizeOfFromConnectSchemaCache()); - // Repeated conversion of the same schema, even if the schema object is different, should return the same Java + // Repeated conversion of the same schema, even if the schema object is different should return the same Java // object converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true); assertEquals(1, converter.sizeOfFromConnectSchemaCache()); @@ -863,7 +863,7 @@ public void testCacheSchemaToJsonConversion() { converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true); assertEquals(1, converter.sizeOfFromConnectSchemaCache()); - // Validate that similar, but different schema correctly returns a different schema. + // Validate that a similar, but different schema correctly returns a different schema. converter.fromConnectData(TOPIC, SchemaBuilder.bool().optional().build(), true); assertEquals(2, converter.sizeOfFromConnectSchemaCache()); } From 3c7b4de5d6f3b0772d92c91afdaceba3c5ca4900 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Thu, 7 Dec 2023 00:57:20 +0100 Subject: [PATCH 10/11] restore fixed typos --- .../java/org/apache/kafka/connect/json/JsonConverterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 158a41e8caed5..e6a356e761347 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 @@ -788,7 +788,7 @@ public void nullSchemaAndMapToJson() { @Test public void nullSchemaAndMapNonStringKeysToJson() { - // This still needs to do conversion of data null schema means "anything goes". Make sure we mix and match + // This still needs to do conversion of data, null schema means "anything goes". Make sure we mix and match // types to verify conversion still works. Map input = new HashMap<>(); input.put("string", 12); From 5247cda0c6cfed235059147411b89333cac18e34 Mon Sep 17 00:00:00 2001 From: Said BOUDJELDA Date: Fri, 8 Dec 2023 18:30:45 +0100 Subject: [PATCH 11/11] upgrade jackson to version 2.16.0 --- LICENSE-binary | 20 ++++++++++---------- gradle/dependencies.gradle | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index f3da0b3643a29..db82b0b7b6b8c 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,16 +216,16 @@ commons-lang3-3.8.1 commons-logging-1.2 commons-validator-1.7 error_prone_annotations-2.10.0 -jackson-annotations-2.15.3 -jackson-core-2.15.3 -jackson-databind-2.15.3 -jackson-dataformat-csv-2.15.3 -jackson-datatype-jdk8-2.15.3 -jackson-jaxrs-base-2.15.3 -jackson-jaxrs-json-provider-2.15.3 -jackson-module-jaxb-annotations-2.15.3 -jackson-module-scala_2.13-2.15.3 -jackson-module-scala_2.12-2.15.3 +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.53.v20231009 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index c38864db4467b..054181266a9e0 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -103,7 +103,7 @@ versions += [ gradle: "8.5", grgit: "4.1.1", httpclient: "4.5.14", - jackson: "2.15.3", + jackson: "2.16.0", jacoco: "0.8.10", javassist: "3.29.2-GA", jetty: "9.4.53.v20231009",