This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new ae4dd6c67c9 MINOR: Update jackson to 2.20.1 and jackson-annotations to
2.20 (#20951)
ae4dd6c67c9 is described below
commit ae4dd6c67c9d2ec1fa78a7a1ac2af60a6da3665b
Author: Philippus Baalman <[email protected]>
AuthorDate: Wed Nov 26 02:36:51 2025 +0100
MINOR: Update jackson to 2.20.1 and jackson-annotations to 2.20 (#20951)
jackson-annotations has a different versioning starting from 2.20 - 2.20
instead of 2.20.x (no patch digit), so I separated it from the other
jackson dependencies.
Reviewers: Chia-Ping Tsai <[email protected]>
---
LICENSE-binary | 20 ++++++++++----------
.../main/scala/kafka/docker/KafkaDockerWrapper.scala | 2 +-
.../org/apache/kafka/message/MessageGenerator.java | 2 +-
gradle/dependencies.gradle | 5 +++--
.../org/apache/kafka/trogdor/common/JsonUtil.java | 2 +-
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index bb312b988f9..f991bd9ddc4 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -213,16 +213,16 @@ License Version 2.0:
- commons-logging-1.3.5
- commons-validator-1.10.0
- hash4j-0.22.0
-- jackson-annotations-2.19.2
-- jackson-core-2.19.2
-- jackson-databind-2.19.2
-- jackson-dataformat-csv-2.19.2
-- jackson-dataformat-yaml-2.19.2
-- jackson-datatype-jdk8-2.19.2
-- jackson-jakarta-rs-base-2.19.2
-- jackson-jakarta-rs-json-provider-2.19.2
-- jackson-module-blackbird-2.19.2
-- jackson-module-jakarta-xmlbind-annotations-2.19.2
+- jackson-annotations-2.20
+- jackson-core-2.20.1
+- jackson-databind-2.20.1
+- jackson-dataformat-csv-2.20.1
+- jackson-dataformat-yaml-2.20.1
+- jackson-datatype-jdk8-2.20.1
+- jackson-jakarta-rs-base-2.20.1
+- jackson-jakarta-rs-json-provider-2.20.1
+- jackson-module-blackbird-2.20.1
+- jackson-module-jakarta-xmlbind-annotations-2.20.1
- jakarta.inject-api-2.0.1
- jakarta.validation-api-3.0.2
- javassist-3.30.2-GA
diff --git a/core/src/main/scala/kafka/docker/KafkaDockerWrapper.scala
b/core/src/main/scala/kafka/docker/KafkaDockerWrapper.scala
index 7cbcae5e9bb..d81a0b34368 100644
--- a/core/src/main/scala/kafka/docker/KafkaDockerWrapper.scala
+++ b/core/src/main/scala/kafka/docker/KafkaDockerWrapper.scala
@@ -250,7 +250,7 @@ object KafkaDockerWrapper extends Logging {
val mapper = new ObjectMapper(new
YAMLFactory().disable(Feature.WRITE_DOC_START_MARKER))
.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT,
true)
- .setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
+ .setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY)
.findAndRegisterModules();
val yaml = try {
diff --git
a/generator/src/main/java/org/apache/kafka/message/MessageGenerator.java
b/generator/src/main/java/org/apache/kafka/message/MessageGenerator.java
index 864e989f4c7..e92a13288e1 100644
--- a/generator/src/main/java/org/apache/kafka/message/MessageGenerator.java
+++ b/generator/src/main/java/org/apache/kafka/message/MessageGenerator.java
@@ -180,7 +180,7 @@ public final class MessageGenerator {
JSON_SERDE.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
JSON_SERDE.configure(DeserializationFeature.FAIL_ON_TRAILING_TOKENS,
true);
JSON_SERDE.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
- JSON_SERDE.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+ JSON_SERDE.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY);
JSON_SERDE.registerModule(new Jdk8Module());
}
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 0373fdea6b7..53ee210c50c 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -63,7 +63,8 @@ versions += [
gradle: "9.2.1",
grgit: "5.3.3",
httpclient: "4.5.14",
- jackson: "2.19.2",
+ jackson: "2.20.1",
+ jacksonAnnotations: "2.20",
jacoco: "0.8.14",
javassist: "3.30.2-GA",
jetty: "12.0.22",
@@ -152,7 +153,7 @@ libs += [
classgraph: "io.github.classgraph:classgraph:$versions.classgraph",
commonsLang: "org.apache.commons:commons-lang3:$versions.commonsLang",
commonsValidator:
"commons-validator:commons-validator:$versions.commonsValidator",
- jacksonAnnotations:
"com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
+ jacksonAnnotations:
"com.fasterxml.jackson.core:jackson-annotations:$versions.jacksonAnnotations",
jacksonDatabind:
"com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
jacksonDataformatCsv:
"com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson",
jacksonDataformatYaml:
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$versions.jackson",
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/common/JsonUtil.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/common/JsonUtil.java
index b3915e466ca..bfb9b874d6e 100644
--- a/trogdor/src/main/java/org/apache/kafka/trogdor/common/JsonUtil.java
+++ b/trogdor/src/main/java/org/apache/kafka/trogdor/common/JsonUtil.java
@@ -39,7 +39,7 @@ public class JsonUtil {
JSON_SERDE.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
JSON_SERDE.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
JSON_SERDE.registerModule(new Jdk8Module());
- JSON_SERDE.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+ JSON_SERDE.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY);
}
public static String toJsonString(Object object) {
